--- old/src/cpu/sparc/vm/nativeInst_sparc.cpp	2015-11-10 12:10:01.291510125 +0100
+++ new/src/cpu/sparc/vm/nativeInst_sparc.cpp	2015-11-10 12:10:01.159505709 +0100
@@ -60,7 +60,7 @@
   masm.patchable_sethi(x, destreg);
   int len = buffer - masm.pc();
   for (int i = 0; i < len; i++) {
-    assert(instaddr[i] == buffer[i], "instructions must match");
+    guarantee(instaddr[i] == buffer[i], "instructions must match");
   }
 }
 
--- old/src/cpu/x86/vm/relocInfo_x86.cpp	2015-11-10 12:10:01.551518823 +0100
+++ new/src/cpu/x86/vm/relocInfo_x86.cpp	2015-11-10 12:10:01.411514139 +0100
@@ -67,14 +67,14 @@
     address disp = Assembler::locate_operand(ip, which);
     address next_ip = Assembler::locate_next_instruction(ip);
     if (verify_only) {
-      assert(*(int32_t*) disp == (x - next_ip), "instructions must match");
+      guarantee(*(int32_t*) disp == (x - next_ip), "instructions must match");
     } else {
       *(int32_t*) disp = x - next_ip;
     }
   }
 #else
   if (verify_only) {
-    assert(*pd_address_in_code() == (x + o), "instructions must match");
+    guarantee(*pd_address_in_code() == (x + o), "instructions must match");
   } else {
     *pd_address_in_code() = x + o;
   }