diff graal/GraalCompiler/src/com/sun/c1x/graph/IR.java @ 2835:c1c8a0291771

merge
author Lukas Stadler <lukas.stadler@jku.at>
date Tue, 31 May 2011 13:37:45 +0200
parents bfce42cd9c07 1cd59ca9ac86
children adc4b3ec0a8c 75e0d39833a0
line wrap: on
line diff
--- a/graal/GraalCompiler/src/com/sun/c1x/graph/IR.java	Tue May 31 13:34:52 2011 +0200
+++ b/graal/GraalCompiler/src/com/sun/c1x/graph/IR.java	Tue May 31 13:37:45 2011 +0200
@@ -96,7 +96,6 @@
         Map<Block, LIRBlock> map = new HashMap<Block, LIRBlock>();
         for (Block b : blocks) {
             LIRBlock block = new LIRBlock(b.blockID());
-            block.setExceptionEntry(b.isExceptionEntry());
             map.put(b, block);
             block.setInstructions(b.getInstructions());
             block.setLinearScanNumber(b.blockID());
@@ -108,11 +107,7 @@
 
         for (Block b : blocks) {
             for (Block succ : b.getSuccessors()) {
-                if (succ.isExceptionEntry()) {
-                    map.get(b).getExceptionHandlerSuccessors().add(map.get(succ));
-                } else {
-                    map.get(b).blockSuccessors().add(map.get(succ));
-                }
+                map.get(b).blockSuccessors().add(map.get(succ));
             }
 
             for (Block pred : b.getPredecessors()) {
@@ -120,16 +115,10 @@
             }
         }
 
-
-     // TODO(tw): Schedule nodes within a block.
-
-
         CriticalEdgeFinder finder = new CriticalEdgeFinder(lirBlocks, compilation.graph);
         finder.splitCriticalEdges();
 
-
         orderedBlocks = lirBlocks;
-
         valueToBlock = new HashMap<Node, LIRBlock>();
         for (LIRBlock b : orderedBlocks) {
             for (Node i : b.getInstructions()) {