diff graal/GraalCompiler/src/com/sun/c1x/ir/ComputeLinearScanOrder.java @ 2652:6d19b4f476db

Removed more OSR handling stuff.
author Thomas Wuerthinger <thomas@wuerthinger.net>
date Wed, 11 May 2011 14:51:33 +0200
parents 4a36a0bd6d18
children 7c8ad40c1f88
line wrap: on
line diff
--- a/graal/GraalCompiler/src/com/sun/c1x/ir/ComputeLinearScanOrder.java	Wed May 11 14:45:05 2011 +0200
+++ b/graal/GraalCompiler/src/com/sun/c1x/ir/ComputeLinearScanOrder.java	Wed May 11 14:51:33 2011 +0200
@@ -510,22 +510,7 @@
 
         assert startBlock.end() instanceof Base : "start block must end with Base-instruction";
         BlockBegin stdEntry = ((Base) startBlock.end()).standardEntry();
-        BlockBegin osrEntry = ((Base) startBlock.end()).osrEntry();
 
-        BlockBegin suxOfOsrEntry = null;
-        if (osrEntry != null) {
-            // special handling for osr entry:
-            // ignore the edge between the osr entry and its successor for processing
-            // the osr entry block is added manually below
-            assert osrEntry.numberOfSux() == 1 : "osr entry must have exactly one successor";
-            assert osrEntry.suxAt(0).numberOfPreds() >= 2 : "sucessor of osr entry must have two predecessors (otherwise it is not present in normal control flow)";
-
-            suxOfOsrEntry = osrEntry.suxAt(0);
-            decForwardBranches(suxOfOsrEntry);
-
-            computeDominator(osrEntry, startBlock);
-            iterativeDominators = true;
-        }
         computeDominator(stdEntry, startBlock);
 
         // start processing with standard entry block
@@ -539,13 +524,6 @@
 
         do {
             BlockBegin cur = workList.remove(workList.size() - 1);
-
-            if (cur == suxOfOsrEntry) {
-                // the osr entry block is ignored in normal processing : it is never added to the
-                // work list. Instead : it is added as late as possible manually here.
-                appendBlock(osrEntry);
-                computeDominator(cur, osrEntry);
-            }
             appendBlock(cur);
 
             int i;