[vmkit-commits] [vmkit] r117246 - in /vmkit/branches/precise/lib/Mvm: CommonThread/Sigsegv.cpp Runtime/MethodInfo.cpp

[Nicolas Geoffray]

Author: geoffray
Date: Sun Oct 24 15:04:23 2010
New Revision: 117246

URL: http://llvm.org/viewvc/llvm-project?rev=117246&view=rev
Log:
Fix mindo in removeMethodInfos.


Modified:
    vmkit/branches/precise/lib/Mvm/CommonThread/Sigsegv.cpp
    vmkit/branches/precise/lib/Mvm/Runtime/MethodInfo.cpp

Modified: vmkit/branches/precise/lib/Mvm/CommonThread/Sigsegv.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/precise/lib/Mvm/CommonThread/Sigsegv.cpp?rev=117246&r1=117245&r2=117246&view=diff
==============================================================================
--- vmkit/branches/precise/lib/Mvm/CommonThread/Sigsegv.cpp (original)
+++ vmkit/branches/precise/lib/Mvm/CommonThread/Sigsegv.cpp Sun Oct 24 15:04:23 2010
@@ -54,8 +54,8 @@
                     "the bottom of the stack is always available when entering"
                     "\nthe VM.\n");
   } else {
-    fprintf(stderr, "I received a SIGSEGV: either the VM code or an external\n"
-                    "native method is bogus. Aborting...\n");
+    fprintf(stderr, "Thread %p received a SIGSEGV: either the VM code or an external\n"
+                    "native method is bogus. Aborting...\n", th);
   }
   th->printBacktrace();
   abort();

Modified: vmkit/branches/precise/lib/Mvm/Runtime/MethodInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/precise/lib/Mvm/Runtime/MethodInfo.cpp?rev=117246&r1=117245&r2=117246&view=diff
==============================================================================
--- vmkit/branches/precise/lib/Mvm/Runtime/MethodInfo.cpp (original)
+++ vmkit/branches/precise/lib/Mvm/Runtime/MethodInfo.cpp Sun Oct 24 15:04:23 2010
@@ -134,9 +134,9 @@
   for (std::map<void*, mvm::MethodInfo*>::iterator i = Functions.begin(),
        e = Functions.end(); i != e;) {
     mvm::MethodInfo* MI = i->second;
+    temp = i;
+    i++;
     if (MI->Owner == owner) {
-      temp = i;
-      i++;
       Functions.erase(temp);
     }
   }