# HG changeset patch
# User trims
# Date 1295604431 28800
# Node ID d535bf4c12355a2897e918da9f8910c0aceec4fb
# Parent  98bf1c6bb73a3c0c9000d084c0eb4fb89c26186d# Parent  85330eaa15ee854d76453a1068b9d82a293ca7ea
Merge

diff -r 98bf1c6bb73a -r d535bf4c1235 src/cpu/sparc/vm/c1_Runtime1_sparc.cpp
--- a/src/cpu/sparc/vm/c1_Runtime1_sparc.cpp	Thu Jan 20 18:24:04 2011 -0800
+++ b/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);