[vmkit-commits] [vmkit] r147375 - in /vmkit/trunk/lib/j3/ClassLib: GNUClasspath/ClasspathVMClass.inc OpenJDK/OpenJDK.inc Reflect.inc

[Will Dietz]

Author: wdietz2
Date: Fri Dec 30 08:15:59 2011
New Revision: 147375

URL: http://llvm.org/viewvc/llvm-project?rev=147375&view=rev
Log:
Un-share annotation reflection support, OpenJDK works differently.

Modified:
    vmkit/trunk/lib/j3/ClassLib/GNUClasspath/ClasspathVMClass.inc
    vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc
    vmkit/trunk/lib/j3/ClassLib/Reflect.inc

Modified: vmkit/trunk/lib/j3/ClassLib/GNUClasspath/ClasspathVMClass.inc
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/ClassLib/GNUClasspath/ClasspathVMClass.inc?rev=147375&r1=147374&r2=147375&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/ClassLib/GNUClasspath/ClasspathVMClass.inc (original)
+++ vmkit/trunk/lib/j3/ClassLib/GNUClasspath/ClasspathVMClass.inc Fri Dec 30 08:15:59 2011
@@ -442,7 +442,9 @@
 
   BEGIN_NATIVE_EXCEPTION(0)
 
-  res = JavaObjectClass::getDeclaredAnnotations((JavaObjectClass*)Cl);
+  Jnjvm* vm = JavaThread::get()->getJVM();
+  UserClassArray* array = vm->upcalls->constructorArrayAnnotation;
+  res = (ArrayObject*)array->doNew(0, vm);
 
   END_NATIVE_EXCEPTION
 

Modified: vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc?rev=147375&r1=147374&r2=147375&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc (original)
+++ vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc Fri Dec 30 08:15:59 2011
@@ -1709,14 +1709,13 @@
 /* Annotations support (JDK 1.5) */
 JNIEXPORT jbyteArray JNICALL
 JVM_GetClassAnnotations(JNIEnv *env, jclass cls) {
-  ArrayObject* ret = 0;
+  JavaObject* ret = 0;
   llvm_gcroot(ret, 0);
 
   BEGIN_JNI_EXCEPTION
 
-  ret = JavaObjectClass::getDeclaredAnnotations(*(JavaObjectClass**)cls);
-
-  RETURN_REF_FROM_JNI(ret, jbyteArray);
+  NYI();
+  RETURN_FROM_JNI(0);
 
   END_JNI_EXCEPTION
 

Modified: vmkit/trunk/lib/j3/ClassLib/Reflect.inc
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/ClassLib/Reflect.inc?rev=147375&r1=147374&r2=147375&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/ClassLib/Reflect.inc (original)
+++ vmkit/trunk/lib/j3/ClassLib/Reflect.inc Fri Dec 30 08:15:59 2011
@@ -224,18 +224,6 @@
   return res;
 }
 
-ArrayObject* JavaObjectClass::getDeclaredAnnotations(JavaObjectClass* Cl) {
-  // TODO: Implement me (for now just returning empty array)
-  ArrayObject* res = 0;
-  llvm_gcroot(res, 0);
-
-  Jnjvm* vm = JavaThread::get()->getJVM();
-  UserClassArray* array = vm->upcalls->constructorArrayAnnotation;
-  res = (ArrayObject*)array->doNew(0, vm);
-
-  return res;
-}
-
 int32_t JavaObjectClass::getModifiers(JavaObjectClass* Cl) {
   llvm_gcroot(Cl, 0);
   int32_t res;