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

diff -r a9b8b43b115f -r 3275a6560cf7 src/share/vm/c1/c1_LIRGenerator.cpp
--- a/src/share/vm/c1/c1_LIRGenerator.cpp	Tue Jun 14 14:41:33 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);