Merge "Revert "Protect JIT Code cache modifications with version check""

1 files changed, 18 insertions, 32 deletions

diff --git a/vm/compiler/Frontend.cpp b/vm/compiler/Frontend.cpp
index 916915d01..47c1898a0 100644
--- a/vm/compiler/Frontend.cpp
+++ b/vm/compiler/Frontend.cpp
@@ -1579,23 +1579,16 @@ static bool compileLoop(CompilationUnit *cUnit, unsigned int startOffset,
         dvmCompilerCodegenDump(cUnit);
     }
 
-    dvmLockMutex(&gDvmJit.compilerLock);
-    if (info->cacheVersion == gDvmJit.cacheVersion) {
-        /*
-         * If this trace uses class objects as constants,
-         * dvmJitInstallClassObjectPointers will switch the thread state
-         * to running and look up the class pointers using the descriptor/loader
-         * tuple stored in the callsite info structure. We need to make this window
-         * as short as possible since it is blocking GC.
-         */
-        if (cUnit->hasClassLiterals && info->codeAddress) {
-           dvmJitInstallClassObjectPointers(cUnit, (char *) info->codeAddress);
-        }
-    } else {
-        ALOGD("JIT CC reset. New version: %d / trace version: %d",
-              gDvmJit.cacheVersion, info->cacheVersion);
+    /*
+     * If this trace uses class objects as constants,
+     * dvmJitInstallClassObjectPointers will switch the thread state
+     * to running and look up the class pointers using the descriptor/loader
+     * tuple stored in the callsite info structure. We need to make this window
+     * as short as possible since it is blocking GC.
+     */
+    if (cUnit->hasClassLiterals && info->codeAddress) {
+        dvmJitInstallClassObjectPointers(cUnit, (char *) info->codeAddress);
     }
-    dvmUnlockMutex(&gDvmJit.compilerLock);
 
     /*
      * Since callsiteinfo is allocated from the arena, delay the reset until
@@ -2158,23 +2151,16 @@ bool dvmCompileTrace(JitTraceDescription *desc, int numMaxInsts,
                                optHints);
     }
 
-    dvmLockMutex(&gDvmJit.compilerLock);
-    if (info->cacheVersion == gDvmJit.cacheVersion) {
-        /*
-         * If this trace uses class objects as constants,
-         * dvmJitInstallClassObjectPointers will switch the thread state
-         * to running and look up the class pointers using the descriptor/loader
-         * tuple stored in the callsite info structure. We need to make this window
-         * as short as possible since it is blocking GC.
-         */
-        if (cUnit.hasClassLiterals && info->codeAddress) {
-            dvmJitInstallClassObjectPointers(&cUnit, (char *) info->codeAddress);
-        }
-    } else {
-        ALOGD("JIT CC reset. New version: %d / trace version: %d",
-              gDvmJit.cacheVersion, info->cacheVersion);
+    /*
+     * If this trace uses class objects as constants,
+     * dvmJitInstallClassObjectPointers will switch the thread state
+     * to running and look up the class pointers using the descriptor/loader
+     * tuple stored in the callsite info structure. We need to make this window
+     * as short as possible since it is blocking GC.
+     */
+    if (cUnit.hasClassLiterals && info->codeAddress) {
+        dvmJitInstallClassObjectPointers(&cUnit, (char *) info->codeAddress);
     }
-    dvmUnlockMutex(&gDvmJit.compilerLock);
 
     /*
      * Since callsiteinfo is allocated from the arena, delay the reset until