commit c5bfa8f49d8548d7c685a99b411311ef56bedffa
author Elliott Hughes <enh@google.com> Tue Aug 30 14:32:49 2011 -0700
committer Elliott Hughes <enh@google.com> Tue Aug 30 14:42:22 2011 -0700
tree 3f58bb3dce3bcaa03a6d3da27d0a2f85d1da1b0b
parent 90a3369d3b6238f1a4c9b19ca68978dab1c39bc4

Add back the work-arounds for broken apps that assume JNI uses direct references.

Note that we'll need to add support for this to jni_compiler too.

Change-Id: I7e31ab4314ba913cde4629544addd0aad9a89b3b

src/indirect_reference_table.cc

diff --git a/src/indirect_reference_table.cc b/src/indirect_reference_table.cc
index 6e5446f..083a499 100644
--- a/src/indirect_reference_table.cc
+++ b/src/indirect_reference_table.cc
@@ -228,11 +228,10 @@
   DCHECK_GE(segmentState.parts.numHoles, prevState.parts.numHoles);
 
   int idx = ExtractIndex(iref);
-  bool workAroundAppJniBugs = false;
 
-  if (GetIndirectRefKind(iref) == kSirtOrInvalid /*&& gDvmJni.workAroundAppJniBugs*/) { // TODO
+  JavaVMExt* vm = Runtime::Current()->GetJavaVM();
+  if (GetIndirectRefKind(iref) == kSirtOrInvalid || vm->work_around_app_jni_bugs) {
     idx = LinearScan(iref, bottomIndex, topIndex, table_);
-    workAroundAppJniBugs = true;
     if (idx == -1) {
       LOG(WARNING) << "trying to work around app JNI bugs, but didn't find " << iref << " in table!";
       return false;
@@ -253,7 +252,7 @@
   if (idx == topIndex-1) {
     // Top-most entry.  Scan up and consume holes.
 
-    if (workAroundAppJniBugs == false && !CheckEntry("remove", iref, idx)) {
+    if (!vm->work_around_app_jni_bugs && !CheckEntry("remove", iref, idx)) {
       return false;
     }
 
@@ -284,7 +283,7 @@
       LOG(INFO) << "--- WEIRD: removing null entry " << idx;
       return false;
     }
-    if (workAroundAppJniBugs == false && !CheckEntry("remove", iref, idx)) {
+    if (!vm->work_around_app_jni_bugs && !CheckEntry("remove", iref, idx)) {
       return false;
     }