Mercurial > hg > truffle
comparison graal/GraalCompiler/src/com/sun/c1x/value/FrameState.java @ 2769:dd6419f4bfe2
Fixed several issues with incorrect predecessor count/order. One known issue around exception dispatch remaining in fop.
author | Thomas Wuerthinger <thomas@wuerthinger.net> |
---|---|
date | Mon, 23 May 2011 21:21:47 +0200 |
parents | 43ffa0e47a46 |
children | 3e3338a1abb9 |
comparison
equal
deleted
inserted
replaced
2768:43ffa0e47a46 | 2769:dd6419f4bfe2 |
---|---|
362 } | 362 } |
363 phi = phi.addInput((x == y) ? phi : y); | 363 phi = phi.addInput((x == y) ? phi : y); |
364 } else { | 364 } else { |
365 phi = phi.addInput((x == y) ? phi : y); | 365 phi = phi.addInput((x == y) ? phi : y); |
366 } | 366 } |
367 /*if (originalPhi != phi) { | 367 if (originalPhi != phi) { |
368 for (int j = 0; j < other.localsSize() + other.stackSize(); ++j) { | 368 for (int j = 0; j < other.localsSize() + other.stackSize(); ++j) { |
369 if (other.valueAt(j) == originalPhi) { | 369 if (other.valueAt(j) == originalPhi) { |
370 other.setValueAt(j, phi); | 370 other.setValueAt(j, phi); |
371 } | 371 } |
372 } | 372 } |
373 }*/ | 373 } |
374 | 374 |
375 //assert phi.valueCount() == block.predecessors().size() + (blockAppended ? 0 : 1) : "valueCount=" + phi.valueCount() + " predSize= " + block.predecessors().size(); | 375 assert phi.valueCount() == block.predecessors().size() + (blockAppended ? 0 : 1) : "valueCount=" + phi.valueCount() + " predSize= " + block.predecessors().size(); |
376 } | 376 } |
377 } | 377 } |
378 } | 378 } |
379 } | 379 } |
380 | 380 |