1.1 --- a/src/share/vm/c1/c1_LIRAssembler.cpp Fri May 23 14:46:59 2014 -0700
1.2 +++ b/src/share/vm/c1/c1_LIRAssembler.cpp Wed May 21 11:25:25 2014 +0200
1.3 @@ -58,7 +58,7 @@
1.4 _masm->nop();
1.5 }
1.6 patch->install(_masm, patch_code, obj, info);
1.7 - append_patching_stub(patch);
1.8 + append_code_stub(patch);
1.9
1.10 #ifdef ASSERT
1.11 Bytecodes::Code code = info->scope()->method()->java_code_at_bci(info->stack()->bci());
1.12 @@ -131,11 +131,6 @@
1.13 }
1.14
1.15
1.16 -void LIR_Assembler::append_patching_stub(PatchingStub* stub) {
1.17 - _slow_case_stubs->append(stub);
1.18 -}
1.19 -
1.20 -
1.21 void LIR_Assembler::check_codespace() {
1.22 CodeSection* cs = _masm->code_section();
1.23 if (cs->remaining() < (int)(NOT_LP64(1*K)LP64_ONLY(2*K))) {
1.24 @@ -144,7 +139,7 @@
1.25 }
1.26
1.27
1.28 -void LIR_Assembler::emit_code_stub(CodeStub* stub) {
1.29 +void LIR_Assembler::append_code_stub(CodeStub* stub) {
1.30 _slow_case_stubs->append(stub);
1.31 }
1.32
1.33 @@ -435,7 +430,7 @@
1.34
1.35 void LIR_Assembler::add_debug_info_for_null_check(int pc_offset, CodeEmitInfo* cinfo) {
1.36 ImplicitNullCheckStub* stub = new ImplicitNullCheckStub(pc_offset, cinfo);
1.37 - emit_code_stub(stub);
1.38 + append_code_stub(stub);
1.39 }
1.40
1.41 void LIR_Assembler::add_debug_info_for_div0_here(CodeEmitInfo* info) {
1.42 @@ -444,7 +439,7 @@
1.43
1.44 void LIR_Assembler::add_debug_info_for_div0(int pc_offset, CodeEmitInfo* cinfo) {
1.45 DivByZeroStub* stub = new DivByZeroStub(pc_offset, cinfo);
1.46 - emit_code_stub(stub);
1.47 + append_code_stub(stub);
1.48 }
1.49
1.50 void LIR_Assembler::emit_rtcall(LIR_OpRTCall* op) {
