comparison src/cpu/x86/vm/c1_LIRAssembler_x86.cpp @ 12175:3bfb204913de

Merge
author adlertz
date Thu, 05 Sep 2013 10:39:10 +0200
parents f98f5d48f511
children 7944aba7ba41 2795dff62b6c
comparison
equal deleted inserted replaced
12157:35b99e7e0af2 12175:3bfb204913de
360 } 360 }
361 361
362 362
363 void LIR_Assembler::jobject2reg_with_patching(Register reg, CodeEmitInfo* info) { 363 void LIR_Assembler::jobject2reg_with_patching(Register reg, CodeEmitInfo* info) {
364 jobject o = NULL; 364 jobject o = NULL;
365 PatchingStub* patch = new PatchingStub(_masm, PatchingStub::load_mirror_id); 365 PatchingStub* patch = new PatchingStub(_masm, patching_id(info));
366 __ movoop(reg, o); 366 __ movoop(reg, o);
367 patching_epilog(patch, lir_patch_normal, reg, info); 367 patching_epilog(patch, lir_patch_normal, reg, info);
368 } 368 }
369 369
370 void LIR_Assembler::klass2reg_with_patching(Register reg, CodeEmitInfo* info) { 370 void LIR_Assembler::klass2reg_with_patching(Register reg, CodeEmitInfo* info) {