[vmkit-commits] [vmkit] r85246 - /vmkit/trunk/lib/JnJVM/VMCore/JnjvmClassLoader.h

[Nicolas Geoffray]

Author: geoffray
Date: Tue Oct 27 11:38:04 2009
New Revision: 85246

URL: http://llvm.org/viewvc/llvm-project?rev=85246&view=rev
Log:
VMClassLoader must inherit JavaObject because the GC may use the extra bits
located in the thin lock word.


Modified:
    vmkit/trunk/lib/JnJVM/VMCore/JnjvmClassLoader.h

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

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JnjvmClassLoader.h (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JnjvmClassLoader.h Tue Oct 27 11:38:04 2009
@@ -21,6 +21,7 @@
 #include "mvm/Allocator.h"
 #include "mvm/Object.h"
 
+#include "JavaObject.h"
 #include "JnjvmConfig.h"
 
 namespace jnjvm {
@@ -422,7 +423,7 @@
 /// have a JnjvmClassLoader non-GC object. Also the finalizer of this class
 /// will delete the internal class loader and we do not have to implement
 /// hacks in the java.lang.Classloader finalizer.
-class VMClassLoader : public gc {
+class VMClassLoader : public JavaObject {
 private:
   
   /// JCL - The internal class loader.
@@ -439,9 +440,11 @@
   }
 
   /// VT - The VirtualTable for this GC-class.
+  ///
   static VirtualTable VT;
 
-  /// TRACER - Trace the internal class loader.
+  /// staticTracer - Trace the internal class loader.
+  ///
   static void staticTracer(VMClassLoader* obj) {
     if (obj->JCL) obj->JCL->tracer();
   }