Mercurial > hg > truffle

diff src/share/vm/c1/c1_LIRGenerator.cpp @ 14265:3e2b76368121

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author morris
date Fri, 17 Jan 2014 10:43:43 -0800
parents 8cdf3f43f63e
children d8041d695d19 3c3953fb3f2a ce9fd31ffd14
line wrap: on
line diff
--- a/src/share/vm/c1/c1_LIRGenerator.cpp	Fri Jan 17 09:40:04 2014 +0100
+++ b/src/share/vm/c1/c1_LIRGenerator.cpp	Fri Jan 17 10:43:43 2014 -0800
@@ -3288,7 +3288,10 @@
   ciSignature* signature_at_call = NULL;
   x->method()->get_method_at_bci(bci, ignored_will_link, &signature_at_call);
 
-  ciKlass* exact = profile_type(md, 0, md->byte_offset_of_slot(data, ret->type_offset()),
+  // The offset within the MDO of the entry to update may be too large
+  // to be used in load/store instructions on some platforms. So have
+  // profile_type() compute the address of the profile in a register.
+  ciKlass* exact = profile_type(md, md->byte_offset_of_slot(data, ret->type_offset()), 0,
                                 ret->type(), x->ret(), mdp,
                                 !x->needs_null_check(),
                                 signature_at_call->return_type()->as_klass(),