# HG changeset patch
# User trims
# Date 1295604431 28800
# Node ID c2f2ee35ff819ef929dee523262e98902871a4e9
# Parent  e1a57e4e820b6ee2f16894f08ef3968371063fee# Parent  553d29e6d40c5a9cf7f51595fe0145cf2a145b93
Merge

diff -r e1a57e4e820b -r c2f2ee35ff81 hotspot/src/cpu/sparc/vm/c1_Runtime1_sparc.cpp
--- 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);