Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
authornever
Tue, 14 Jun 2011 15:20:55 -0700
changeset 9981 b5ab3b5e78b3
parent 9980 a330de5dea17 (current diff)
parent 9979 16e323afbe3b (diff)
child 9982 edcf2d7e7b84
Merge
--- a/hotspot/src/share/vm/c1/c1_LIRGenerator.cpp	Tue Jun 14 14:41:33 2011 -0700
+++ b/hotspot/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);
jdk-sandbox