Merge
authortrims
Fri, 21 Jan 2011 02:07:11 -0800
changeset 7928 c2f2ee35ff81
parent 7926 e1a57e4e820b (current diff)
parent 7927 553d29e6d40c (diff)
child 7929 5eecea832c83
child 8059 8da781076dc5
child 8061 07585870d15f
Merge
--- a/hotspot/src/cpu/sparc/vm/c1_Runtime1_sparc.cpp	Thu Jan 20 18:24:04 2011 -0800
+++ b/hotspot/src/cpu/sparc/vm/c1_Runtime1_sparc.cpp	Fri Jan 21 02:07:11 2011 -0800
@@ -343,9 +343,10 @@
   // returned.
 
   restore_live_registers(sasm);
-  __ restore();
-  __ br(Assembler::always, false, Assembler::pt, deopt_blob->unpack_with_reexecution(), relocInfo::runtime_call_type);
-  __ delayed()->nop();
+
+  AddressLiteral dest(deopt_blob->unpack_with_reexecution());
+  __ jump_to(dest, O0);
+  __ delayed()->restore();
 
   __ bind(no_deopt);
   restore_live_registers(sasm);