You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by va...@apache.org on 2007/04/09 14:28:59 UTC
svn commit: r526729 - in /harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer: FlowGraph.cpp FlowGraph.h simplifier.cpp

Author: varlax
Date: Mon Apr  9 05:28:58 2007
New Revision: 526729

URL: http://svn.apache.org/viewvc?view=rev&rev=526729
Log:
Applied HARMONY-2376 [drlvm][jit] patch for Simplifier

Modified:
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/FlowGraph.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/FlowGraph.h
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/simplifier.cpp

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/FlowGraph.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/FlowGraph.cpp?view=diff&rev=526729&r1=526728&r2=526729
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/FlowGraph.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/FlowGraph.cpp Mon Apr  9 05:28:58 2007
@@ -76,8 +76,9 @@
 }
 
 void         
-FlowGraph::foldSwitch(ControlFlowGraph& fg, Node* block, SwitchInst* sw, uint32 index)
+FlowGraph::foldSwitch(ControlFlowGraph& fg, SwitchInst* sw, uint32 index)
 {
+    Node* block = sw->getNode();
     assert(sw == block->getLastInst());
     LabelInst* target;
     if(index < sw->getNumTargets())

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/FlowGraph.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/FlowGraph.h?view=diff&rev=526729&r1=526728&r2=526729
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/FlowGraph.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/FlowGraph.h Mon Apr  9 05:28:58 2007
@@ -59,7 +59,7 @@
     // from block.
     static void  foldBranch(ControlFlowGraph& fg, BranchInst* br, bool isTaken);
 
-    static void  foldSwitch(ControlFlowGraph& fg, Node* block, SwitchInst* sw, uint32 target);
+    static void  foldSwitch(ControlFlowGraph& fg, SwitchInst* sw, uint32 target);
 
     // Eliminates the check at the end of block and the associated exception
     // edge.  If (alwaysThrows), then eliminates the non-exception edge instead;

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/simplifier.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/simplifier.cpp?view=diff&rev=526729&r1=526728&r2=526729
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/simplifier.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/simplifier.cpp Mon Apr  9 05:28:58 2007
@@ -3840,7 +3840,7 @@
 
 void  
 SimplifierWithInstFactory::foldSwitch(SwitchInst* switchInst, uint32 index) {
-    FlowGraph::foldSwitch(flowGraph, currentCfgNode,switchInst,index);
+    FlowGraph::foldSwitch(flowGraph, switchInst,index);
 }