# HG changeset patch
# User twisti
# Date 1308079505 25200
# Node ID c8f2186acf6dc1c7049806972114230fa8b2af79
# Parent  5cf771a790370bc99679f0b174bf7476006d7951
7053520: JSR292: crash in invokedynamic with C1 using tiered and compressed oops
Reviewed-by: iveresov, never

diff -r 5cf771a79037 -r c8f2186acf6d src/share/vm/c1/c1_LIRGenerator.cpp
--- a/src/share/vm/c1/c1_LIRGenerator.cpp	Wed Jun 08 17:04:06 2011 -0700
+++ b/src/share/vm/c1/c1_LIRGenerator.cpp	Tue Jun 14 12:25:05 2011 -0700
@@ -2799,7 +2799,7 @@
 
       // Load CallSite object from constant pool cache.
       __ oop2reg(cpcache->constant_encoding(), tmp);
-      __ load(new LIR_Address(tmp, call_site_offset, T_OBJECT), tmp);
+      __ move_wide(new LIR_Address(tmp, call_site_offset, T_OBJECT), tmp);
 
       // Load target MethodHandle from CallSite object.
       __ load(new LIR_Address(tmp, java_lang_invoke_CallSite::target_offset_in_bytes(), T_OBJECT), receiver);