[llvm-commits] [vmkit] r52405 - in /vmkit/trunk/lib/JnJVM/VMCore: JavaObject.cpp VirtualTables.cpp

[Nicolas Geoffray]

Author: geoffray
Date: Tue Jun 17 09:24:45 2008
New Revision: 52405

URL: http://llvm.org/viewvc/llvm-project?rev=52405&view=rev
Log:
LockObj are not GC-allocated anymore. This leads to memory leaks, but
will help to implement LockObj hash tables.


Modified:
    vmkit/trunk/lib/JnJVM/VMCore/JavaObject.cpp
    vmkit/trunk/lib/JnJVM/VMCore/VirtualTables.cpp

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

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JavaObject.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JavaObject.cpp Tue Jun 17 09:24:45 2008
@@ -73,11 +73,7 @@
 }
 
 LockObj* LockObj::allocate() {
-#ifdef USE_GC_BOEHM
   LockObj* res = new LockObj();
-#else
-  LockObj* res = vm_new(JavaThread::get()->isolate, LockObj)();
-#endif
   res->lock = mvm::Lock::allocRecursive();
   res->varcond = 0;
   return res;

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

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/VirtualTables.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/VirtualTables.cpp Tue Jun 17 09:24:45 2008
@@ -111,7 +111,6 @@
 
 void JavaObject::TRACER {
   classOf->MARK_AND_TRACE;
-  if (lockObj()) lockObj()->MARK_AND_TRACE;
 }
 
 #ifdef MULTIPLE_GC
@@ -120,7 +119,6 @@
 extern "C" void JavaObjectTracer(JavaObject* obj) {
 #endif
   obj->classOf->MARK_AND_TRACE;
-  if (obj->lockObj()) obj->lockObj()->MARK_AND_TRACE;
 }