[vmkit-commits] [vmkit] r143837 - /vmkit/trunk/lib/J3/ClassLib/OpenJDK/OpenJDK.inc

[Will Dietz]

Author: wdietz2
Date: Sat Nov  5 16:54:37 2011
New Revision: 143837

URL: http://llvm.org/viewvc/llvm-project?rev=143837&view=rev
Log:
Fix missed gcroot, fix missing return value in exception case.

Modified:
    vmkit/trunk/lib/J3/ClassLib/OpenJDK/OpenJDK.inc

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=143837&r1=143836&r2=143837&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/ClassLib/OpenJDK/OpenJDK.inc (original)
+++ vmkit/trunk/lib/J3/ClassLib/OpenJDK/OpenJDK.inc Sat Nov  5 16:54:37 2011
@@ -925,15 +925,16 @@
 JNIEXPORT jclass JNICALL
 JVM_FindLoadedClass(JNIEnv *env, jobject _loader, jstring name) {
   JavaObject * loader = 0;
+  JavaString * str = 0;
   llvm_gcroot(loader, 0);
+  llvm_gcroot(str, 0);
   BEGIN_JNI_EXCEPTION
 
   Jnjvm* vm = JavaThread::get()->getJVM();
   JnjvmClassLoader* JCL = NULL;
 
-  JavaString * str = *(JavaString**)name;
-
   loader = *(JavaObject**)_loader;
+  str = *(JavaString**)name;
 
   CommonClass * Cl = 0;
 
@@ -945,6 +946,7 @@
 
   END_JNI_EXCEPTION
 
+  return 0;
 }
 
 /* Define a class */