[vmkit-commits] [vmkit] r70207 - /vmkit/trunk/lib/JnJVM/VMCore/JavaUpcalls.cpp

[Nicolas Geoffray]

Author: geoffray
Date: Mon Apr 27 08:33:22 2009
New Revision: 70207

URL: http://llvm.org/viewvc/llvm-project?rev=70207&view=rev
Log:
Set the tracer before someone else tries to.


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

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

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JavaUpcalls.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JavaUpcalls.cpp Mon Apr 27 08:33:22 2009
@@ -823,10 +823,12 @@
   newReference =
     loader->loadName(loader->asciizConstructUTF8("java/lang/ref/Reference"),
                      false, false);
-    
+  
+  newReference->getVirtualVT()->setNativeTracer(
+      (uintptr_t)nativeJavaObjectReferenceTracer,
+      "nativeJavaObjectReferenceTracer");
+  
   assert(!newReference->isResolved() && "Reference class already resolved");
-  JavaVirtualTable* ptr = newReference->getVirtualVT();
-  ptr->tracer = (uintptr_t)JavaObjectReference::staticTracer;
   
   EnqueueReference = 
     UPCALL_METHOD(loader, "java/lang/ref/Reference",  "enqueue", "()Z",
@@ -868,9 +870,6 @@
       (void*)(intptr_t)nativeInitPhantomReferenceQ,
       "nativeInitPhantomReferenceQ");
   
-  newReference->getVirtualVT()->setNativeTracer(
-      (uintptr_t)nativeJavaObjectReferenceTracer,
-      "nativeJavaObjectReferenceTracer");
 
 //===----------------------------------------------------------------------===//
 //