Mercurial > hg > truffle
comparison graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/gen/LIRGenerator.java @ 2976:57c2e3409be7
Fixed merge issues.
author | Thomas Wuerthinger <thomas@wuerthinger.net> |
---|---|
date | Wed, 15 Jun 2011 17:53:53 +0200 |
parents | d69b4d2eb499 |
children | f49685081630 |
comparison
equal
deleted
inserted
replaced
2975:cbece91420af | 2976:57c2e3409be7 |
---|---|
464 @Override | 464 @Override |
465 public void visitIf(If x) { | 465 public void visitIf(If x) { |
466 emitCompare(x.compare()); | 466 emitCompare(x.compare()); |
467 emitBranch(x.compare(), getLIRBlock(x.trueSuccessor()), getLIRBlock(x.falseSuccessor())); | 467 emitBranch(x.compare(), getLIRBlock(x.trueSuccessor()), getLIRBlock(x.falseSuccessor())); |
468 assert x.defaultSuccessor() == x.falseSuccessor() : "wrong destination above"; | 468 assert x.defaultSuccessor() == x.falseSuccessor() : "wrong destination above"; |
469 lir.jump(getLIRBlock(x.defaultSuccessor())); | 469 LIRBlock block = getLIRBlock(x.defaultSuccessor()); |
470 assert block != null : x; | |
471 lir.jump(block); | |
470 } | 472 } |
471 | 473 |
472 public void emitBranch(Compare compare, LIRBlock trueSuccessor, LIRBlock falseSucc) { | 474 public void emitBranch(Compare compare, LIRBlock trueSuccessor, LIRBlock falseSucc) { |
473 Condition cond = compare.condition(); | 475 Condition cond = compare.condition(); |
474 if (compare.x().kind.isFloat() || compare.x().kind.isDouble()) { | 476 if (compare.x().kind.isFloat() || compare.x().kind.isDouble()) { |