harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ge...@apache.org
Subject svn commit: r463926 - in /incubator/harmony/enhanced/drlvm/trunk/vm/jitrino/src: optimizer/Inst.cpp optimizer/Opcode.cpp optimizer/hashvaluenumberer.cpp optimizer/memoryopt.cpp translator/java/JavaFlowGraphBuilder.cpp
Date Sat, 14 Oct 2006 13:00:01 GMT
Author: geirm
Date: Sat Oct 14 06:00:00 2006
New Revision: 463926

URL: http://svn.apache.org/viewvc?view=rev&rev=463926
Log:
HARMONY-1796

The second use of a class that failed to be initialized does not throw NoClassDefFoundError
as expected in opt mode.

testcase passes as do smoke, c-unit, ~kernel on Ubuntu 6


Modified:
    incubator/harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/Inst.cpp
    incubator/harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/Opcode.cpp
    incubator/harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/hashvaluenumberer.cpp
    incubator/harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/memoryopt.cpp
    incubator/harmony/enhanced/drlvm/trunk/vm/jitrino/src/translator/java/JavaFlowGraphBuilder.cpp

Modified: incubator/harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/Inst.cpp
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/Inst.cpp?view=diff&rev=463926&r1=463925&r2=463926
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/Inst.cpp (original)
+++ incubator/harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/Inst.cpp Sat Oct 14 06:00:00
2006
@@ -2552,7 +2552,7 @@
 }
 
 Inst* InstFactory::makeInitType(Type* type) {
-    return makeTypeInst(Op_InitType, Modifier(), 
+    return makeTypeInst(Op_InitType, Modifier(Exception_Sometimes), 
                         Type::Void, OpndManager::getNullOpnd(), type);
 }
 

Modified: incubator/harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/Opcode.cpp
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/Opcode.cpp?view=diff&rev=463926&r1=463925&r2=463926
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/Opcode.cpp (original)
+++ incubator/harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/Opcode.cpp Sat Oct 14
06:00:00 2006
@@ -176,9 +176,9 @@
     { Op_MonitorExitFence,      true,  MB::StoreOrSync,   MK::None,                     
            "monexitfence",  "monexitfence  %0",             }, // (opnd must be non-null)
     { Op_TauStaticCast,         false, MB::Movable,       MK::None,                     
            "staticcast",    "staticcast %0,%d ((%1)) -) %l",       }, // Compile-time assertion.
 Asserts that cast is legal.
     { Op_TauCast,               false, MB::Check,         MK::Exception,                
            "cast  ",        "cast      %0,%d ((%1)) -) %l",        }, // CastException (suceeds
if argument is null, returns casted object)
-    { Op_TauAsType,                false, MB::Movable,       MK::None,                  
               "astype",        "astype    %0,%d -) %l",        }, // returns casted object
if argument is an instance of, null otherwise
+    { Op_TauAsType,             false, MB::Movable,       MK::None,                     
            "astype",        "astype    %0,%d -) %l",        }, // returns casted object if
argument is an instance of, null otherwise
     { Op_TauInstanceOf,         false, MB::Movable,       MK::None,                     
            "instanceof",    "instanceof %0,%d ((%1)) -) %l",       }, // returns true if
argument is an instance of type T, tau opnd isNonNull
-    { Op_InitType,              true,  MB::CSEable,       MK::None,                     
            "inittype",      "inittype  %d",                 }, // REVIEW: can this throw
an exception?
+    { Op_InitType,              true,  MB::CSEable,       MK::Exception,                
            "inittype",      "inittype  %d",                 }, // can throw a linking exception
during class initialization
     { Op_Label,                 true,  MB::None,          MK::None,                     
            "label ",        "%l:",                          }, // special label instructions
for branch labels, finally, catch
     { Op_MethodEntry,           true,  MB::None,          MK::None,                     
            "methodentry",   "--- MethodEntry(%d): (%s)",                 }, // method entry
label
     { Op_MethodEnd,             true,  MB::None,          MK::None,                     
            "methodend",     "+++ MethodEnd(%d) (%s)",       }, // end of a method

Modified: incubator/harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/hashvaluenumberer.cpp
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/hashvaluenumberer.cpp?view=diff&rev=463926&r1=463925&r2=463926
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/hashvaluenumberer.cpp
(original)
+++ incubator/harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/hashvaluenumberer.cpp
Sat Oct 14 06:00:00 2006
@@ -131,9 +131,9 @@
         // then hash
         return dispatch(inst);
     }
-    Inst* caseAdd(Inst* inst)               { return hashIfNoOverflow(inst); }
-    Inst* caseSub(Inst* inst)               { return hashIfNoOverflow(inst); }  
-    Inst* caseMul(Inst* inst)               { return hashIfNoOverflow(inst); }
+    Inst* caseAdd(Inst* inst)               { return hashIfNoException(inst); }
+    Inst* caseSub(Inst* inst)               { return hashIfNoException(inst); }  
+    Inst* caseMul(Inst* inst)               { return hashIfNoException(inst); }
     Inst* caseTauDiv(Inst* inst)            { return hashInst(inst, getKey(inst->getOperation(),
                                                                            inst->getSrc(0)->getId(),
                                                                            inst->getSrc(1)->getId()));
}
@@ -156,7 +156,7 @@
     Inst* caseSelect(Inst* inst)            { return hashInst(inst); }
     
     // conversion
-    Inst* caseConv(Inst* inst)              { return hashIfNoOverflow(inst); }
+    Inst* caseConv(Inst* inst)              { return hashIfNoException(inst); }
     
     // shifts
     Inst* caseShladd(Inst* inst)            { return hashInst(inst); }
@@ -792,7 +792,7 @@
         }
         return inst;
     }
-    Inst* caseInitType(TypeInst* inst) { return hashInst(inst); }
+    Inst* caseInitType(TypeInst* inst) { return hashIfNoException(inst); }
 
     // labels
 
@@ -1189,13 +1189,66 @@
             return 0;
     }
 
-    // arithmetic operations should only be added if no exception can occur
-    Inst* hashIfNoOverflow(Inst* inst) {
-        if ((inst->getOverflowModifier() == Overflow_None) ||
-            (inst->getExceptionModifier() == Exception_Never))
+    bool thereIsAPath(Node* start, Node* finish, Node* commonAncestor)
+    {
+        assert(domTree.dominates(commonAncestor,start));
+        assert(domTree.dominates(commonAncestor,finish));
+
+        const Edges &outedges = start->getOutEdges();
+        typedef Edges::const_iterator EdgeIter;
+        EdgeIter eLast = outedges.end();
+        for (EdgeIter eIter = outedges.begin(); eIter != eLast; eIter++) {
+            Edge* outEdge = *eIter;
+            Node* succBlock = outEdge->getTargetNode();
+
+            if( domTree.dominates(succBlock,start) )
+                continue; // outEdge is a backedge. Skip it.
+
+            if (finish == succBlock) {
+                return true;
+            } else if ( domTree.dominates(commonAncestor,succBlock) &&
+                        thereIsAPath(succBlock,finish,commonAncestor) )
+            {
+                return true;
+            }
+        }        
+        return false;
+    }
+
+    Inst* hashIfNoException(Inst* inst) {
+        Modifier mod = inst->getModifier();
+        if ((mod.hasOverflowModifier() && mod.getOverflowModifier() != Overflow_None)
  ||
+            (mod.hasExceptionModifier() && mod.getExceptionModifier() != Exception_Never))
+        {
+            Inst* optInst = lookupInst(inst);
+            if (!optInst) {
+                setHashToInst(inst, getKey(inst));
+                return inst;
+            } else {
+                Node* block = inst->getNode();
+                Node* optBlock = optInst->getNode();
+                // we must ensure that optInst was successfully executed
+                // if there is a way [block]->[dispatch]->...->[optBlock]
+                // we should not consider optInst as successfully executed
+                // so inst can not be eliminated, but it should be added
+                // into hash table instead of optInst
+                Node* dispatch = optBlock->getEdgeTarget(Edge::Kind_Dispatch);
+                if ( dispatch && domTree.dominates(optBlock,dispatch) &&
+                     thereIsAPath(dispatch,block,optBlock))
+                {
+                    // do not optimize, just add to hash.
+                    setHashToInst(inst, getKey(inst));
+                    return inst;
+                } else {
+                    // everything is OK. Can optimize.
+                    return optInst;
+                }
+            }
+
+        } else {
+            // process inst as usual
             return hashInst(inst);
-        else 
-            return lookupInst(inst);
+        }
     }
 
     Inst* lookupInst(Inst* inst) {
@@ -1264,7 +1317,7 @@
     IRManager&          irManager;
     Inst*               tauUnsafe;
     Opnd*               tauPoint;
-    DominatorTree      &domTree;
+    DominatorTree       &domTree;
     MemoryOpt           *memOpt;
     bool                cse_final;
     ControlFlowGraph    &fg;

Modified: incubator/harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/memoryopt.cpp
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/memoryopt.cpp?view=diff&rev=463926&r1=463925&r2=463926
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/memoryopt.cpp (original)
+++ incubator/harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/memoryopt.cpp Sat Oct
14 06:00:00 2006
@@ -52,7 +52,11 @@
     computeDominators(irm);
     DominatorTree* dominatorTree = irm.getDominatorTree();
     assert(dominatorTree && dominatorTree->isValid());
+
+    computeLoops(irm);
     LoopTree* loopTree = irm.getLoopTree();
+    assert(loopTree && loopTree->isValid());
+
     ControlFlowGraph& flowGraph = irm.getFlowGraph();
     MemoryManager& memoryManager = irm.getNestedMemoryManager();
 

Modified: incubator/harmony/enhanced/drlvm/trunk/vm/jitrino/src/translator/java/JavaFlowGraphBuilder.cpp
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/jitrino/src/translator/java/JavaFlowGraphBuilder.cpp?view=diff&rev=463926&r1=463925&r2=463926
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/vm/jitrino/src/translator/java/JavaFlowGraphBuilder.cpp
(original)
+++ incubator/harmony/enhanced/drlvm/trunk/vm/jitrino/src/translator/java/JavaFlowGraphBuilder.cpp
Sat Oct 14 06:00:00 2006
@@ -181,8 +181,8 @@
     //
     // add an edge to handler entry node
     //
-    if (lastExceptionalInstSeen != NULL &&  !block->findTargetEdge(dispatch))
-        fg->addEdge(block,dispatch);
+    if (lastExceptionalInstSeen != NULL)
+        addEdge(block,dispatch);
     return block;
 }
 



Mime
View raw message