# HG changeset patch
# User never
# Date 1308090055 25200
# Node ID e2ce15aa3daffa537b44235cc648923ff2bbbf8b
# Parent  f8c9417e357173e003a16d5639bdf42fbefa100f# Parent  c8f2186acf6dc1c7049806972114230fa8b2af79
Merge

diff -r f8c9417e3571 -r e2ce15aa3daf 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 15:20:55 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);