You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by ch...@apache.org on 2009/02/25 18:18:39 UTC

svn commit: r747865 - /harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/dabce.cpp

Author: chunrong
Date: Wed Feb 25 17:18:39 2009
New Revision: 747865

URL: http://svn.apache.org/viewvc?rev=747865&view=rev
Log:
Apply patch for HARMONY-6044, assertion failure fixing in abce phase of drlvm jit

Modified:
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/dabce.cpp

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/dabce.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/dabce.cpp?rev=747865&r1=747864&r2=747865&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/dabce.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/dabce.cpp Wed Feb 25 17:18:39 2009
@@ -780,7 +780,7 @@
             arrayAccess->index == inst->getSrc(1) && arrayAccess->array == NULL) {
             assert(ldBaseInst == NULL);
             ldBaseInst = inst->getSrc(0)->asSsaOpnd()->getInst();
-            assert(ldBaseInst->getOpcode() == Op_LdArrayBaseAddr);
+            assert((ldBaseInst->getOpcode() == Op_LdArrayBaseAddr)||(ldBaseInst->getOpcode() == Op_LdVar));
             arrayAccess->array = ldBaseInst->getSrc(0)->asSsaOpnd();
             break;
         }