6 files changed, 53 insertions, 9 deletions
diff --git a/test/116-nodex2oat/nodex2oat.cc b/test/116-nodex2oat/nodex2oat.cc
index 564d58d251..131af312be 100644
--- a/test/116-nodex2oat/nodex2oat.cc
+++ b/test/116-nodex2oat/nodex2oat.cc
@@ -28,8 +28,7 @@ class NoDex2OatTest {
     ScopedObjectAccess soa(Thread::Current());
     mirror::Class* klass = soa.Decode<mirror::Class*>(cls);
     const DexFile& dex_file = klass->GetDexFile();
-    const OatFile::OatDexFile* oat_dex_file =
-        Runtime::Current()->GetClassLinker()->FindOpenedOatDexFileForDexFile(dex_file);
+    const OatFile::OatDexFile* oat_dex_file = dex_file.GetOatDexFile();
     return oat_dex_file != nullptr;
   }
 };
diff --git a/test/117-nopatchoat/nopatchoat.cc b/test/117-nopatchoat/nopatchoat.cc
index da276f2b52..7eac412681 100644
--- a/test/117-nopatchoat/nopatchoat.cc
+++ b/test/117-nopatchoat/nopatchoat.cc
@@ -28,11 +28,7 @@ class NoPatchoatTest {
     ScopedObjectAccess soa(Thread::Current());
     mirror::Class* klass = soa.Decode<mirror::Class*>(cls);
     const DexFile& dex_file = klass->GetDexFile();
-
-    const OatFile::OatDexFile* oat_dex_file =
-        Runtime::Current()->GetClassLinker()->FindOpenedOatDexFileForDexFile(dex_file);
-
-    return oat_dex_file;
+    return dex_file.GetOatDexFile();
   }
 
   static bool hasExecutableOat(jclass cls) {
diff --git a/test/118-noimage-dex2oat/noimage-dex2oat.cc b/test/118-noimage-dex2oat/noimage-dex2oat.cc
index c49a13e8f4..aacf00f300 100644
--- a/test/118-noimage-dex2oat/noimage-dex2oat.cc
+++ b/test/118-noimage-dex2oat/noimage-dex2oat.cc
@@ -28,8 +28,7 @@ class NoDex2OatTest {
     ScopedObjectAccess soa(Thread::Current());
     mirror::Class* klass = soa.Decode<mirror::Class*>(cls);
     const DexFile& dex_file = klass->GetDexFile();
-    const OatFile::OatDexFile* oat_dex_file =
-        Runtime::Current()->GetClassLinker()->FindOpenedOatDexFileForDexFile(dex_file);
+    const OatFile::OatDexFile* oat_dex_file = dex_file.GetOatDexFile();
     return oat_dex_file != nullptr;
   }
 };
diff --git a/test/471-deopt-environment/expected.txt b/test/471-deopt-environment/expected.txt
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/test/471-deopt-environment/expected.txt
diff --git a/test/471-deopt-environment/info.txt b/test/471-deopt-environment/info.txt
new file mode 100644
index 0000000000..bcb95754a4
--- /dev/null
+++ b/test/471-deopt-environment/info.txt
@@ -0,0 +1,3 @@
+Regression test for the bounds check elimination pass, which
+uses to generate a HDeoptimization instruction with an
+HEnvironment that does not have the uses lists updated.
diff --git a/test/471-deopt-environment/src/Main.java b/test/471-deopt-environment/src/Main.java
new file mode 100644
index 0000000000..5c5080be54
--- /dev/null
+++ b/test/471-deopt-environment/src/Main.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+public class Main {
+
+  private static int willInline(int a, int b) {
+    return a & b;
+  }
+
+  static int[] a = new int[4];
+  static int field = 42;
+
+  public static void main(String[] args) throws Exception {
+    // The order of optimizations that would lead to the problem was:
+    // 1) Inlining of `willInline`.
+    // 2) Bounds check elimination inserting a deopt at a[0] and removing the HBoundsCheck.
+    // 3) Instruction simplifier simpilifying the inlined willInline to just `field`.
+    //
+    // At this point, if the environment of the HDeoptimization instruction was
+    // just a pointer to the one in a[0], the uses lists would have not been updated
+    // and the HBoundsCheck being dead code after the HDeoptimization, the simplifcation
+    // at step 3) would not updated that environment.
+    int inEnv = willInline(field, field);
+    int doAdds = a[0] + a[1] + a[2] + a[3];
+
+    if (inEnv != 42) {
+      throw new Error("Expected 42");
+    }
+
+    if (doAdds != 0) {
+      throw new Error("Expected 0");
+    }
+  }
+}