harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From var...@apache.org
Subject svn commit: r507980 - in /harmony/enhanced/drlvm/trunk: src/test/regression/excludes/exclude.windows.x86 vm/jitrino/src/codegenerator/ia32/Ia32GCMap.cpp vm/jitrino/src/optimizer/helper_inliner.cpp
Date Thu, 15 Feb 2007 16:13:53 GMT
Author: varlax
Date: Thu Feb 15 08:13:52 2007
New Revision: 507980

URL: http://svn.apache.org/viewvc?view=rev&rev=507980
Log:
Applied latest fix to HARMONY-3126

Modified:
    harmony/enhanced/drlvm/trunk/src/test/regression/excludes/exclude.windows.x86
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32GCMap.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/helper_inliner.cpp

Modified: harmony/enhanced/drlvm/trunk/src/test/regression/excludes/exclude.windows.x86
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/src/test/regression/excludes/exclude.windows.x86?view=diff&rev=507980&r1=507979&r2=507980
==============================================================================
--- harmony/enhanced/drlvm/trunk/src/test/regression/excludes/exclude.windows.x86 (original)
+++ harmony/enhanced/drlvm/trunk/src/test/regression/excludes/exclude.windows.x86 Thu Feb
15 08:13:52 2007
@@ -1 +0,0 @@
-H3121

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32GCMap.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32GCMap.cpp?view=diff&rev=507980&r1=507979&r2=507980
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32GCMap.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32GCMap.cpp Thu Feb 15
08:13:52 2007
@@ -106,19 +106,6 @@
             continue;
         }
         Type* opndType = opnd->getType();
-#ifdef _DEBUG         
-        //check that unmanaged opnd live range does not cross enumeration points
-        if (opndType->isUnmanagedPtr() && opndType->asPtrType()->getPointedToType()->isInt1())
{
-            CallInst * callInst=(CallInst*)inst;
-            Opnd * targetOpnd=callInst->getOpnd(callInst->getTargetOpndIndex());
-            assert(targetOpnd->isPlacedIn(OpndKind_Imm));
-            Opnd::RuntimeInfo * ri=targetOpnd->getRuntimeInfo();
-            if (!ri) {
-                assert (ri->getKind() != Opnd::RuntimeInfo::Kind_MethodVtableSlotOffset);
-                assert (ri->getKind() != Opnd::RuntimeInfo::Kind_MethodDirectAddr);
-            }
-        }
-#endif
         if (!opndType->isManagedPtr() && !opndType->isObject()) {
             continue;
         }

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/helper_inliner.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/helper_inliner.cpp?view=diff&rev=507980&r1=507979&r2=507980
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/helper_inliner.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/helper_inliner.cpp Thu Feb 15 08:13:52
2007
@@ -55,11 +55,9 @@
 
 class HelperInlinerAction: public Action {
 public:
-    HelperInlinerAction() : inlinePragma(NULL){}
+    HelperInlinerAction() {}
     void init();
     HelperInlinerFlags& getFlags() {return flags;}
-    
-    NamedType* inlinePragma;
 protected:
     HelperInlinerFlags flags;
 };
@@ -120,7 +118,7 @@
 public:
     HelperInliner(HelperInlinerSession* _sessionAction, MemoryManager& tmpMM, CompilationContext*
_cc, Inst* _inst)  
         : flags(((HelperInlinerAction*)_sessionAction->getAction())->getFlags()), localMM(tmpMM),

-        cc(_cc), inst(_inst), session(_sessionAction), method(NULL)
+        cc(_cc), inst(_inst), session(_sessionAction), method(NULL), inlinePragma(NULL)
     {
         irm = cc->getHIRManager();
         instFactory = &irm->getInstFactory();
@@ -144,6 +142,7 @@
     Inst* inst;
     HelperInlinerSession* session;
     MethodDesc*  method;
+    NamedType* inlinePragma;
 
 //these fields used by almost every subclass -> cache them
     IRManager* irm;
@@ -165,11 +164,10 @@
         }\
         method = ensureClassIsResolvedAndInitialized(flags.flagPrefix##_className, flags.flagPrefix##_methodName,
flags.flagPrefix##_signature);\
         if (!method) return;\
-        HelperInlinerAction* action = (HelperInlinerAction*)session->getAction();\
-        if (!action->inlinePragma) { \
-            action->inlinePragma = cc->getVMCompilationInterface()->resolveClassUsingBootstrapClassloader(PRAGMA_INLINE);\
+        if (!inlinePragma) { \
+            inlinePragma = cc->getVMCompilationInterface()->resolveClassUsingBootstrapClassloader(PRAGMA_INLINE);\
         } \
-        if (!action->inlinePragma) return;\
+        if (!inlinePragma) return;\
         \
         doInline();\
     }\
@@ -288,7 +286,6 @@
 
 
 void HelperInliner::inlineVMHelper(MethodCallInst* origCall) {
-    NamedType* inlinePragma = ((HelperInlinerAction*)session->getAction())->inlinePragma;
     assert(inlinePragma!=0);
 
     InlineVector  methodsToInline(localMM);



Mime
View raw message