commit 9d14da5072bc1980eb1d3176786049372a7103f1
author Elliott Hughes <enh@google.com> Thu Apr 21 16:37:16 2011 -0700
committer Elliott Hughes <enh@google.com> Thu Apr 21 16:37:16 2011 -0700
tree d4375173a0427f1b3ece7b50016d54e6502ab3d6
parent 735b947c953f0e3a86090bb72c90ec423b7b201e

Fix -Xjniopts:forcecopy, which I broke.

"create"/"destroy" is the natural pair, and prevents us accidentally
recursing when we actually meant to call ::free instead.

Change-Id: Ice65034f3a48b6d6f96c3b0adb0c0ffbd2f41463

vm/CheckJni.cpp

diff --git a/vm/CheckJni.cpp b/vm/CheckJni.cpp
index 1f0887e..287c035 100644
--- a/vm/CheckJni.cpp
+++ b/vm/CheckJni.cpp
@@ -886,7 +886,7 @@
     /*
      * Free up the guard buffer, scrub it, and return the original pointer.
      */
-    static void* free(void* dataBuf) {
+    static void* destroy(void* dataBuf) {
         u1* fullBuf = ((u1*) dataBuf) - kGuardLen / 2;
         const GuardedCopy* pExtra = GuardedCopy::fromData(dataBuf);
         void* originalPtr = (void*) pExtra->originalPtr;
@@ -1017,8 +1017,6 @@
 static void* releaseGuardedPACopy(JNIEnv* env, jarray jarr, void* dataBuf, int mode) {
     ScopedJniThreadState ts(env);
     ArrayObject* arrObj = (ArrayObject*) dvmDecodeIndirectRef(env, jarr);
-    bool release, copyBack;
-    u1* result = NULL;
 
     if (!GuardedCopy::check(dataBuf, true)) {
         LOGE("JNI: failed guarded copy check in releaseGuardedPACopy");
@@ -1026,31 +1024,14 @@
         return NULL;
     }
 
-    switch (mode) {
-    case 0:
-        release = copyBack = true;
-        break;
-    case JNI_ABORT:
-        release = true;
-        copyBack = false;
-        break;
-    case JNI_COMMIT:
-        release = false;
-        copyBack = true;
-        break;
-    default:
-        LOGE("JNI: bad release mode %d", mode);
-        dvmAbort();
-        return NULL;
-    }
-
-    if (copyBack) {
+    if (mode != JNI_ABORT) {
         size_t len = GuardedCopy::fromData(dataBuf)->originalLen;
         memcpy(arrObj->contents, dataBuf, len);
     }
 
-    if (release) {
-        result = (u1*) GuardedCopy::free(dataBuf);
+    u1* result = NULL;
+    if (mode != JNI_COMMIT) {
+        result = (u1*) GuardedCopy::destroy(dataBuf);
     } else {
         result = (u1*) (void*) GuardedCopy::fromData(dataBuf)->originalPtr;
     }
@@ -1573,7 +1554,7 @@
             abortMaybe();
             return;
         }
-        chars = (const jchar*) GuardedCopy::free((jchar*)chars);
+        chars = (const jchar*) GuardedCopy::destroy((jchar*)chars);
     }
     baseEnv(env)->ReleaseStringChars(env, string, chars);
 }
@@ -1615,7 +1596,7 @@
             abortMaybe();
             return;
         }
-        utf = (const char*) GuardedCopy::free((char*)utf);
+        utf = (const char*) GuardedCopy::destroy((char*)utf);
     }
     baseEnv(env)->ReleaseStringUTFChars(env, string, utf);
 }
@@ -1817,8 +1798,7 @@
 static const jchar* Check_GetStringCritical(JNIEnv* env, jstring string, jboolean* isCopy) {
     ScopedCheck sc(env, kFlag_CritGet, __FUNCTION__);
     sc.checkString(string);
-    const jchar* result;
-    result = baseEnv(env)->GetStringCritical(env, string, isCopy);
+    const jchar* result = baseEnv(env)->GetStringCritical(env, string, isCopy);
     if (((JNIEnvExt*)env)->forceDataCopy && result != NULL) {
         ScopedJniThreadState ts(env);
         StringObject* strObj = (StringObject*) dvmDecodeIndirectRef(env, string);
@@ -1841,7 +1821,7 @@
             abortMaybe();
             return;
         }
-        carray = (const jchar*) GuardedCopy::free((jchar*)carray);
+        carray = (const jchar*) GuardedCopy::destroy((jchar*)carray);
     }
     baseEnv(env)->ReleaseStringCritical(env, string, carray);
 }