Mercurial > hg > truffle

diff src/cpu/zero/vm/assembler_zero.cpp @ 12355:cefad50507d8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with hs25-b53
author Gilles Duboscq <duboscq@ssw.jku.at>
date Fri, 11 Oct 2013 10:38:03 +0200
parents e16282db4946
children de6a9e811145
line wrap: on
line diff
--- a/src/cpu/zero/vm/assembler_zero.cpp	Thu Oct 10 18:26:22 2013 +0200
+++ b/src/cpu/zero/vm/assembler_zero.cpp	Fri Oct 11 10:38:03 2013 +0200
@@ -50,6 +50,7 @@
 #ifdef ASSERT
 bool AbstractAssembler::pd_check_instruction_mark() {
   ShouldNotCallThis();
+  return false;
 }
 #endif
 
@@ -73,6 +74,7 @@
 RegisterOrConstant MacroAssembler::delayed_value_impl(
   intptr_t* delayed_value_addr, Register tmpl, int offset) {
   ShouldNotCallThis();
+  return RegisterOrConstant();
 }
 
 void MacroAssembler::store_oop(jobject obj) {