[vmkit-commits] [vmkit] r170949 - in /vmkit/trunk/lib/j3/VMCore: JavaThread.h Jni.cpp

[Nicolas Geoffray]

Author: geoffray
Date: Fri Dec 21 17:01:21 2012
New Revision: 170949

URL: http://llvm.org/viewvc/llvm-project?rev=170949&view=rev
Log:
throwFromJni does not need to end known frame and enter uncooperative code. The following RETURN_FROM_JNI will do it.


Modified:
    vmkit/trunk/lib/j3/VMCore/JavaThread.h
    vmkit/trunk/lib/j3/VMCore/Jni.cpp

Modified: vmkit/trunk/lib/j3/VMCore/JavaThread.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/VMCore/JavaThread.h?rev=170949&r1=170948&r2=170949&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/VMCore/JavaThread.h (original)
+++ vmkit/trunk/lib/j3/VMCore/JavaThread.h Fri Dec 21 17:01:21 2012
@@ -156,8 +156,7 @@
   /// throwFromJNI - Throw an exception after executing JNI code.
   ///
   void throwFromJNI(word_t SP) {
-    endKnownFrame();
-    enterUncooperativeCode(SP);
+    // Nothing to do. The RETURN_FROM_JNI will take care of it.
   }
   
   /// throwFromNative - Throw an exception after executing Native code.

Modified: vmkit/trunk/lib/j3/VMCore/Jni.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/VMCore/Jni.cpp?rev=170949&r1=170948&r2=170949&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/VMCore/Jni.cpp (original)
+++ vmkit/trunk/lib/j3/VMCore/Jni.cpp Fri Dec 21 17:01:21 2012
@@ -459,7 +459,7 @@
 
   END_JNI_EXCEPTION
 
-  return JNI_FALSE;
+  RETURN_FROM_JNI(0);
 }