commit 88c5c355fc3d881f905564911d746b2313d5fc89
author Elliott Hughes <enh@google.com> Thu Mar 15 18:49:48 2012 -0700
committer Elliott Hughes <enh@google.com> Thu Mar 15 21:14:57 2012 -0700
tree d5b11b85131064cb6200465e674060933f48ebd7
parent 141b0c75986949da0adbf9c07ad92bc675f1bfed

Make CheckJNI and JNI workarounds mutually exclusive...

...in the opposite direction; needing workarounds turns off CheckJNI.
This isn't necessarily a good idea, but I like the cleanup parts of
this change.

Change-Id: I708235ea3e5cc35ef90b01dd810e097e3ff9dd26

src/jni_internal.cc

diff --git a/src/jni_internal.cc b/src/jni_internal.cc
index eb33a5c..64d8203 100644
--- a/src/jni_internal.cc
+++ b/src/jni_internal.cc
@@ -2354,7 +2354,7 @@
   }
 };
 
-const JNINativeInterface gNativeInterface = {
+const JNINativeInterface gJniNativeInterface = {
   NULL,  // reserved0.
   NULL,  // reserved1.
   NULL,  // reserved2.
@@ -2598,9 +2598,9 @@
       check_jni(false),
       critical(false),
       monitors("monitors", kMonitorsInitial, kMonitorsMax) {
-  functions = unchecked_functions = &gNativeInterface;
+  functions = unchecked_functions = &gJniNativeInterface;
   if (vm->check_jni) {
-    EnableCheckJni();
+    SetCheckJniEnabled(true);
   }
   // The JniEnv local reference values must be at a consistent offset or else cross-compilation
   // errors will ensue.
@@ -2611,9 +2611,9 @@
 JNIEnvExt::~JNIEnvExt() {
 }
 
-void JNIEnvExt::EnableCheckJni() {
-  check_jni = true;
-  functions = GetCheckJniNativeInterface();
+void JNIEnvExt::SetCheckJniEnabled(bool enabled) {
+  check_jni = enabled;
+  functions = enabled ? GetCheckJniNativeInterface() : &gJniNativeInterface;
 }
 
 void JNIEnvExt::DumpReferenceTables() {
@@ -2719,7 +2719,7 @@
   }
 };
 
-const JNIInvokeInterface gInvokeInterface = {
+const JNIInvokeInterface gJniInvokeInterface = {
   NULL,  // reserved0
   NULL,  // reserved1
   NULL,  // reserved2
@@ -2745,9 +2745,9 @@
       weak_globals(kWeakGlobalsInitial, kWeakGlobalsMax, kWeakGlobal),
       libraries_lock("JNI shared libraries map lock"),
       libraries(new Libraries) {
-  functions = unchecked_functions = &gInvokeInterface;
+  functions = unchecked_functions = &gJniInvokeInterface;
   if (options->check_jni_) {
-    EnableCheckJni();
+    SetCheckJniEnabled(true);
   }
 }
 
@@ -2755,9 +2755,9 @@
   delete libraries;
 }
 
-void JavaVMExt::EnableCheckJni() {
-  check_jni = true;
-  functions = GetCheckJniInvokeInterface();
+void JavaVMExt::SetCheckJniEnabled(bool enabled) {
+  check_jni = enabled;
+  functions = enabled ? GetCheckJniInvokeInterface() : &gJniInvokeInterface;
 }
 
 void JavaVMExt::DumpReferenceTables() {