changeset 2520:e2ce15aa3daf

Merge
author never
date Tue, 14 Jun 2011 15:20:55 -0700
parents f8c9417e3571 c8f2186acf6d
children cfcf2ba8f3eb
files
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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);