[vmkit-commits] [vmkit] r56211 - /vmkit/branches/isolate/lib/JnJVM/Isolate/IsolateCommonClass.cpp

[Nicolas Geoffray]

Author: geoffray
Date: Mon Sep 15 08:25:24 2008
New Revision: 56211

URL: http://llvm.org/viewvc/llvm-project?rev=56211&view=rev
Log:
The baseClass of a primitive array is set at boot time.
Also return the primitive class of void.


Modified:
    vmkit/branches/isolate/lib/JnJVM/Isolate/IsolateCommonClass.cpp

Modified: vmkit/branches/isolate/lib/JnJVM/Isolate/IsolateCommonClass.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/isolate/lib/JnJVM/Isolate/IsolateCommonClass.cpp?rev=56211&r1=56210&r2=56211&view=diff

==============================================================================
--- vmkit/branches/isolate/lib/JnJVM/Isolate/IsolateCommonClass.cpp (original)
+++ vmkit/branches/isolate/lib/JnJVM/Isolate/IsolateCommonClass.cpp Mon Sep 15 08:25:24 2008
@@ -12,6 +12,7 @@
 #include "JavaAllocator.h"
 #include "JavaClass.h"
 #include "JavaThread.h"
+#include "JavaUpcalls.h"
 #include "Jnjvm.h"
 #include "JnjvmModule.h"
 
@@ -220,9 +221,11 @@
   Jnjvm* vm = JavaThread::get()->isolate;
   if (numId > VOID_ID && numId < ARRAY_ID) {
     UserClassArray* arrayCl = vm->arrayClasses[numId];
-    UserClassPrimitive* cl = (UserClassPrimitive*)arrayCl->baseClass();
+    UserClassPrimitive* cl = (UserClassPrimitive*)arrayCl->_baseClass;
     assert(cl && "Primitive array class does not have a primitive.");
     return cl;
+  } else if (numId == VOID_ID) {
+    return vm->upcalls->OfVoid;
   }
   return 0;
 }