archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 15:24:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

7131028: Switch statement takes wrong path

Browse source 
Pass correct type to branch in LIRGenerator::do_SwitchRanges()

Reviewed-by: kvn, never
This commit is contained in:
Igor Veresov 2012-01-20 15:02:12 -08:00
parent 5b3f2efc2e
commit 55c9a74046
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
hotspot/src/share/vm/c1/c1_LIR.hpp
View file

@ -1354,9 +1354,10 @@ class LIR_OpBranch: public LIR_Op {
CodeStub* _stub; // if this is a branch to a stub, this is the stub CodeStub* _stub; // if this is a branch to a stub, this is the stub
public: public:
LIR_OpBranch(LIR_Condition cond, Label* lbl) LIR_OpBranch(LIR_Condition cond, BasicType type, Label* lbl)
: LIR_Op(lir_branch, LIR_OprFact::illegalOpr, (CodeEmitInfo*) NULL) : LIR_Op(lir_branch, LIR_OprFact::illegalOpr, (CodeEmitInfo*) NULL)
, _cond(cond) , _cond(cond)
, _type(type)
, _label(lbl) , _label(lbl)
, _block(NULL) , _block(NULL)
, _ublock(NULL) , _ublock(NULL)
@ -2053,7 +2054,7 @@ class LIR_List: public CompilationResourceObj {
void jump(CodeStub* stub) { void jump(CodeStub* stub) {
append(new LIR_OpBranch(lir_cond_always, T_ILLEGAL, stub)); append(new LIR_OpBranch(lir_cond_always, T_ILLEGAL, stub));
} }
void branch(LIR_Condition cond, Label* lbl) { append(new LIR_OpBranch(cond, lbl)); } void branch(LIR_Condition cond, BasicType type, Label* lbl) { append(new LIR_OpBranch(cond, type, lbl)); }
void branch(LIR_Condition cond, BasicType type, BlockBegin* block) { void branch(LIR_Condition cond, BasicType type, BlockBegin* block) {
assert(type != T_FLOAT && type != T_DOUBLE, "no fp comparisons"); assert(type != T_FLOAT && type != T_DOUBLE, "no fp comparisons");
append(new LIR_OpBranch(cond, type, block)); append(new LIR_OpBranch(cond, type, block));

2
hotspot/src/share/vm/c1/c1_LIRGenerator.cpp
View file

@ -2350,7 +2350,7 @@ void LIRGenerator::do_SwitchRanges(SwitchRangeArray* x, LIR_Opr value, BlockBegi
} else { } else {
LabelObj* L = new LabelObj(); LabelObj* L = new LabelObj();
__ cmp(lir_cond_less, value, low_key); __ cmp(lir_cond_less, value, low_key);
__ branch(lir_cond_less, L->label()); __ branch(lir_cond_less, T_INT, L->label());
__ cmp(lir_cond_lessEqual, value, high_key); __ cmp(lir_cond_lessEqual, value, high_key);
__ branch(lir_cond_lessEqual, T_INT, dest); __ branch(lir_cond_lessEqual, T_INT, dest);
__ branch_destination(L->label()); __ branch_destination(L->label());