[vmkit-commits] [vmkit] r121252 - in /vmkit/branches/multi-vm/lib/J3: Compiler/JavaAOTCompiler.cpp VMCore/JavaClass.cpp VMCore/JnjvmClassLoader.cpp VMCore/JnjvmClassLoader.h

[Gael Thomas]

Author: gthomas
Date: Wed Dec  8 07:26:21 2010
New Revision: 121252

URL: http://llvm.org/viewvc/llvm-project?rev=121252&view=rev
Log:
remove last calls to getIsolate

Modified:
    vmkit/branches/multi-vm/lib/J3/Compiler/JavaAOTCompiler.cpp
    vmkit/branches/multi-vm/lib/J3/VMCore/JavaClass.cpp
    vmkit/branches/multi-vm/lib/J3/VMCore/JnjvmClassLoader.cpp
    vmkit/branches/multi-vm/lib/J3/VMCore/JnjvmClassLoader.h

Modified: vmkit/branches/multi-vm/lib/J3/Compiler/JavaAOTCompiler.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/multi-vm/lib/J3/Compiler/JavaAOTCompiler.cpp?rev=121252&r1=121251&r2=121252&view=diff
==============================================================================
--- vmkit/branches/multi-vm/lib/J3/Compiler/JavaAOTCompiler.cpp (original)
+++ vmkit/branches/multi-vm/lib/J3/Compiler/JavaAOTCompiler.cpp Wed Dec  8 07:26:21 2010
@@ -2182,7 +2182,7 @@
 
   for (; I != E; ++I) {
     JavaObject* obj = (JavaObject*)(*I);
-    if (!VMClassLoader::isVMClassLoader(cl->classLoader->getIsolate(), obj) && JavaObject::instanceOf(obj, cl)) {
+    if (!VMClassLoader::isVMClassLoader(cl->classLoader->vm, obj) && JavaObject::instanceOf(obj, cl)) {
       if (currentClass != NULL) {
         if (JavaObject::getClass(obj) != currentClass) {
           return 0;

Modified: vmkit/branches/multi-vm/lib/J3/VMCore/JavaClass.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/multi-vm/lib/J3/VMCore/JavaClass.cpp?rev=121252&r1=121251&r2=121252&view=diff
==============================================================================
--- vmkit/branches/multi-vm/lib/J3/VMCore/JavaClass.cpp (original)
+++ vmkit/branches/multi-vm/lib/J3/VMCore/JavaClass.cpp Wed Dec  8 07:26:21 2010
@@ -1348,7 +1348,7 @@
 }
 
 JavaVirtualTable::JavaVirtualTable(Class* C) {
-	vm = C->classLoader->getIsolate();
+	vm = C->classLoader->vm;
 
   if (C->super) {
 
@@ -1445,7 +1445,7 @@
 }
   
 JavaVirtualTable::JavaVirtualTable(ClassArray* C) {
-	vm = C->classLoader->getIsolate();
+	vm = C->classLoader->vm;
   
   if (C->baseClass()->isClass())
     C->baseClass()->asClass()->resolveClass();
@@ -1664,7 +1664,7 @@
 
 JavaVirtualTable::JavaVirtualTable(ClassPrimitive* C) {
   // Only used for subtype checking
-	vm = C->classLoader->getIsolate();
+	vm = C->classLoader->vm;
   cl = C;
   depth = 0;
   display[0] = this;

Modified: vmkit/branches/multi-vm/lib/J3/VMCore/JnjvmClassLoader.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/multi-vm/lib/J3/VMCore/JnjvmClassLoader.cpp?rev=121252&r1=121251&r2=121252&view=diff
==============================================================================
--- vmkit/branches/multi-vm/lib/J3/VMCore/JnjvmClassLoader.cpp (original)
+++ vmkit/branches/multi-vm/lib/J3/VMCore/JnjvmClassLoader.cpp Wed Dec  8 07:26:21 2010
@@ -982,7 +982,7 @@
 extern "C" void vmjcAddPreCompiledClass(JnjvmClassLoader* JCL,
                                         CommonClass* cl) {
   cl->classLoader = JCL;
-	cl->virtualVT->vm = JCL->getIsolate();
+	cl->virtualVT->vm = JCL->vm;
   
   JCL->hashUTF8->insert(cl->name);
 

Modified: vmkit/branches/multi-vm/lib/J3/VMCore/JnjvmClassLoader.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/multi-vm/lib/J3/VMCore/JnjvmClassLoader.h?rev=121252&r1=121251&r2=121252&view=diff
==============================================================================
--- vmkit/branches/multi-vm/lib/J3/VMCore/JnjvmClassLoader.h (original)
+++ vmkit/branches/multi-vm/lib/J3/VMCore/JnjvmClassLoader.h Wed Dec  8 07:26:21 2010
@@ -122,10 +122,6 @@
   ///
   mvm::BumpPtrAllocator& allocator;
  
-  /// getIsolate - Returns the isolate that created this class loader.
-  ///
-  Jnjvm* getIsolate() const { return isolate; }
-
   /// getClasses - Returns the classes this class loader has loaded.
   ///
   ClassMap* getClasses() const { return classes; }