Mercurial > hg > truffle
comparison src/share/vm/c1/c1_LIRAssembler.cpp @ 12355:cefad50507d8
Merge with hs25-b53
author | Gilles Duboscq <duboscq@ssw.jku.at> |
---|---|
date | Fri, 11 Oct 2013 10:38:03 +0200 |
parents | e522a00b91aa f98f5d48f511 |
children | c9daba2a2bac |
comparison
equal
deleted
inserted
replaced
12058:ccb4f2af2319 | 12355:cefad50507d8 |
---|---|
91 case Bytecodes::_ldc_w: | 91 case Bytecodes::_ldc_w: |
92 break; | 92 break; |
93 default: | 93 default: |
94 ShouldNotReachHere(); | 94 ShouldNotReachHere(); |
95 } | 95 } |
96 } else if (patch->id() == PatchingStub::load_appendix_id) { | |
97 Bytecodes::Code bc_raw = info->scope()->method()->raw_code_at_bci(info->stack()->bci()); | |
98 assert(Bytecodes::has_optional_appendix(bc_raw), "unexpected appendix resolution"); | |
96 } else { | 99 } else { |
97 ShouldNotReachHere(); | 100 ShouldNotReachHere(); |
98 } | 101 } |
99 #endif | 102 #endif |
100 } | 103 } |
101 | 104 |
105 PatchingStub::PatchID LIR_Assembler::patching_id(CodeEmitInfo* info) { | |
106 IRScope* scope = info->scope(); | |
107 Bytecodes::Code bc_raw = scope->method()->raw_code_at_bci(info->stack()->bci()); | |
108 if (Bytecodes::has_optional_appendix(bc_raw)) { | |
109 return PatchingStub::load_appendix_id; | |
110 } | |
111 return PatchingStub::load_mirror_id; | |
112 } | |
102 | 113 |
103 //--------------------------------------------------------------- | 114 //--------------------------------------------------------------- |
104 | 115 |
105 | 116 |
106 LIR_Assembler::LIR_Assembler(Compilation* c): | 117 LIR_Assembler::LIR_Assembler(Compilation* c): |