archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-20 19:14:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

7079317: Incorrect branch's destination block in PrintoOptoAssembly output

Browse source 
Save/restore label and block in scratch_emit_size()

Reviewed-by: never
This commit is contained in:
Vladimir Kozlov 2011-08-16 11:53:57 -07:00
parent 134c40b4db
commit 080f790edc
11 changed files with 84 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

11
hotspot/src/share/vm/opto/compile.cpp
View file

@ -519,15 +519,18 @@ uint Compile::scratch_emit_size(const Node* n) {
// Do the emission.
Label fakeL; // Fake label for branch instructions.
bool is_branch = n->is_Branch() && n->as_Mach()->ideal_Opcode() != Op_Jump;
Label* saveL = NULL;
uint save_bnum = 0;
bool is_branch = n->is_MachBranch();
if (is_branch) {
MacroAssembler masm(&buf);
masm.bind(fakeL);
n->as_Mach()->label_set(&fakeL, 0);
n->as_MachBranch()->save_label(&saveL, &save_bnum);
n->as_MachBranch()->label_set(&fakeL, 0);
}
n->emit(buf, this->regalloc());
if (is_branch) // Clear the reference to fake label.
n->as_Mach()->label_set(NULL, 0);
if (is_branch) // Restore label.
n->as_MachBranch()->label_set(saveL, save_bnum);
// End scratch_emit_size section.
set_in_scratch_emit_size(false);