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

[Nicolas Geoffray]

Author: geoffray
Date: Tue Jun 17 09:35:30 2008
New Revision: 52409

URL: http://llvm.org/viewvc/llvm-project?rev=52409&view=rev
Log:
Remove code where LockObj was supposed to be GC-allocated.


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

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

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JavaInitialise.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JavaInitialise.cpp Tue Jun 17 09:35:30 2008
@@ -44,7 +44,6 @@
   INIT(CommonClass);
   INIT(Class);
   INIT(ClassArray);
-  INIT(LockObj);
   INIT(JavaThread);
   INIT(Jnjvm);
   INIT(ClassMap);

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

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JavaObject.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JavaObject.cpp Tue Jun 17 09:35:30 2008
@@ -68,10 +68,6 @@
   }
 }
 
-void LockObj::print(mvm::PrintBuffer* buf) const {
-  buf->write("Lock<>");
-}
-
 LockObj* LockObj::allocate() {
   LockObj* res = new LockObj();
   res->lock = mvm::Lock::allocRecursive();

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

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JavaObject.h (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JavaObject.h Tue Jun 17 09:35:30 2008
@@ -58,7 +58,7 @@
 
 /// LockObj - This class represents a Java monitor.
 ///
-class LockObj : public mvm::Object {
+class LockObj {
 
   friend class JavaObject;
 
@@ -109,9 +109,6 @@
   }
 
 public:
-  static VirtualTable* VT;
-  virtual void print(mvm::PrintBuffer* buf) const;
-  virtual void TRACER;
   ~LockObj();
   LockObj();
 };

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

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/VirtualTables.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/VirtualTables.cpp Tue Jun 17 09:35:30 2008
@@ -40,7 +40,6 @@
   INIT(CommonClass);
   INIT(Class);
   INIT(ClassArray);
-  INIT(LockObj);
   INIT(JavaObject);
   INIT(JavaThread);
   INIT(Jnjvm);
@@ -56,7 +55,6 @@
 
 void ArrayObject::TRACER {
   classOf->MARK_AND_TRACE;
-  if (lockObj()) lockObj()->MARK_AND_TRACE;
   for (sint32 i = 0; i < size; i++) {
     if (elements[i]) elements[i]->MARK_AND_TRACE;
   }
@@ -64,8 +62,6 @@
 
 #define ARRAYTRACER(name)         \
   void name::TRACER {             \
-    if (lockObj())                \
-      lockObj()->MARK_AND_TRACE;  \
   }
   
 
@@ -106,9 +102,6 @@
   CommonClass::PARENT_TRACER;
 }
 
-void LockObj::TRACER {
-}
-
 void JavaObject::TRACER {
   classOf->MARK_AND_TRACE;
 }