Mercurial > hg > truffle

diff src/cpu/x86/vm/c1_LIRAssembler_x86.cpp @ 12160:f98f5d48f511

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
7199175: JSR 292: C1 needs patching when invokedynamic/invokehandle call site is not linked Summary: Do patching rather bailing out for unlinked call with appendix Reviewed-by: twisti, kvn
author roland
date Wed, 21 Aug 2013 13:34:45 +0200
parents b800986664f4
children 7944aba7ba41 2795dff62b6c
line wrap: on
line diff
--- a/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp	Fri Aug 23 18:04:35 2013 -0700
+++ b/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp	Wed Aug 21 13:34:45 2013 +0200
@@ -362,7 +362,7 @@
 
 void LIR_Assembler::jobject2reg_with_patching(Register reg, CodeEmitInfo* info) {
   jobject o = NULL;
-  PatchingStub* patch = new PatchingStub(_masm, PatchingStub::load_mirror_id);
+  PatchingStub* patch = new PatchingStub(_masm, patching_id(info));
   __ movoop(reg, o);
   patching_epilog(patch, lir_patch_normal, reg, info);
 }