You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by mf...@apache.org on 2007/12/05 17:31:57 UTC

svn commit: r601398 - /harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/devirtualizer.cpp

Author: mfursov
Date: Wed Dec  5 08:31:57 2007
New Revision: 601398

URL: http://svn.apache.org/viewvc?rev=601398&view=rev
Log:
Fix for HARMONY-4785 [drlvm][jit][opt] EHWA scenario fails when run in server_static mode.


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

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/devirtualizer.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/devirtualizer.cpp?rev=601398&r1=601397&r2=601398&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/devirtualizer.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/devirtualizer.cpp Wed Dec  5 08:31:57 2007
@@ -453,11 +453,13 @@
             if (type->isNullObject()) { //NullObject type is not ObjectType instance, but Type instance
                 return;
             }
+            if (type->isUnresolvedType()) {
+                return;
+            }
             ObjectType* baseType = type->asObjectType();
             assert(baseType!=NULL);
             
-            assert(!baseType->isUnresolvedType());
-
+            
             ObjectType* devirtType = NULL;
             if (! ((_devirtInterfaceCalls && isIntfCall) || (_devirtVirtualCalls && !isIntfCall) ||
                    (baseType->isAbstract() && _devirtAbstractCalls))) {