[vmkit-commits] [vmkit] r58618 - /vmkit/branches/release_024/lib/JnJVM/VMCore/VirtualTables.cpp

[Nicolas Geoffray]

Author: geoffray
Date: Mon Nov  3 10:41:08 2008
New Revision: 58618

URL: http://llvm.org/viewvc/llvm-project?rev=58618&view=rev
Log:
Import r58617 from mainline.


Modified:
    vmkit/branches/release_024/lib/JnJVM/VMCore/VirtualTables.cpp

Modified: vmkit/branches/release_024/lib/JnJVM/VMCore/VirtualTables.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/release_024/lib/JnJVM/VMCore/VirtualTables.cpp?rev=58618&r1=58617&r2=58618&view=diff

==============================================================================
--- vmkit/branches/release_024/lib/JnJVM/VMCore/VirtualTables.cpp (original)
+++ vmkit/branches/release_024/lib/JnJVM/VMCore/VirtualTables.cpp Mon Nov  3 10:41:08 2008
@@ -52,7 +52,7 @@
 #undef INIT
 
 void ArrayObject::TRACER {
-  classOf->classLoader->MARK_AND_TRACE;
+  if (classOf) classOf->classLoader->MARK_AND_TRACE;
   for (sint32 i = 0; i < size; i++) {
     if (elements[i]) elements[i]->MARK_AND_TRACE;
   }
@@ -93,7 +93,7 @@
 }
 
 void JavaObject::TRACER {
-  classOf->classLoader->MARK_AND_TRACE;
+  if (classOf) classOf->classLoader->MARK_AND_TRACE;
   LockObj* l = lockObj();
   if (l) l->MARK_AND_TRACE;
 }
@@ -103,7 +103,7 @@
 #else
 extern "C" void JavaObjectTracer(JavaObject* obj) {
 #endif
-  obj->classOf->classLoader->MARK_AND_TRACE;
+  if (obj->classOf) obj->classOf->classLoader->MARK_AND_TRACE;
   LockObj* l = obj->lockObj();
   if (l) l->MARK_AND_TRACE;
 }