--- a/hotspot/src/cpu/sparc/vm/nativeInst_sparc.cpp	Mon Nov 09 11:50:15 2015 -0500
+++ b/hotspot/src/cpu/sparc/vm/nativeInst_sparc.cpp	Tue Oct 27 12:25:08 2015 +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");
   }
 }