[vmkit-commits] [vmkit] r89763 - /vmkit/trunk/lib/JnJVM/VMCore/Jnjvm.cpp

[Nicolas Geoffray]

Author: geoffray
Date: Tue Nov 24 08:12:04 2009
New Revision: 89763

URL: http://llvm.org/viewvc/llvm-project?rev=89763&view=rev
Log:
Only look at Java methods when deleting them from the list.


Modified:
    vmkit/trunk/lib/JnJVM/VMCore/Jnjvm.cpp

Modified: vmkit/trunk/lib/JnJVM/VMCore/Jnjvm.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/Jnjvm.cpp?rev=89763&r1=89762&r2=89763&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/Jnjvm.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/Jnjvm.cpp Tue Nov 24 08:12:04 2009
@@ -1399,11 +1399,16 @@
   std::map<void*, mvm::MethodInfo*>::iterator temp;
   for (std::map<void*, mvm::MethodInfo*>::iterator i = Map.Functions.begin(), 
        e = Map.Functions.end(); i != e;) {
-    JavaMethod* meth = (JavaMethod*)i->second->getMetaInfo();
-    if (meth->classDef->classLoader == loader) {
-      temp = i;
-      ++i;
-      Map.Functions.erase(temp);
+    mvm::MethodInfo* MI = i->second;
+    if (MI->MethodType == 1) {
+      JavaMethod* meth = (JavaMethod*)i->second->getMetaInfo();
+      if (meth->classDef->classLoader == loader) {
+        temp = i;
+        ++i;
+        Map.Functions.erase(temp);
+      } else {
+        ++i;
+      }
     } else {
       ++i;
     }