commit 00d1ef41d0d0d438d604d102183a6bfac58643e7
author Bill Buzbee <buzbee@android.com> Thu Jul 31 14:08:33 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jul 29 21:36:05 2014 +0000
tree 2fbe16f92e9353830dd6667728c6794d9925cacd
parent 70f7d48b9f2ad768c1e1a5bd96979870379f05e2
parent 54659e3a2c83d3949957a10436e55e525a430a15

Merge "ART: LoadConstWide should clobber temp reg"

compiler/dex/quick/x86/utility_x86.cc

diff --git a/compiler/dex/quick/x86/utility_x86.cc b/compiler/dex/quick/x86/utility_x86.cc
index ccffe5b..a77d79e 100644
--- a/compiler/dex/quick/x86/utility_x86.cc
+++ b/compiler/dex/quick/x86/utility_x86.cc
@@ -591,6 +591,7 @@
                            kDouble, kNotVolatile);
         res->target = data_target;
         res->flags.fixup = kFixupLoad;
+        Clobber(rl_method.reg);
         store_method_addr_used_ = true;
       } else {
         if (val_lo == 0) {

test/083-compiler-regressions/expected.txt

diff --git a/test/083-compiler-regressions/expected.txt b/test/083-compiler-regressions/expected.txt
index 9f57dbd..f8d92cc 100644
--- a/test/083-compiler-regressions/expected.txt
+++ b/test/083-compiler-regressions/expected.txt
@@ -37,3 +37,4 @@
 atomicLong passes
 LiveFlags passes trip 3
 LiveFlags passes trip 1
+minDoubleWith3ConstsTest passes

test/083-compiler-regressions/src/Main.java

diff --git a/test/083-compiler-regressions/src/Main.java b/test/083-compiler-regressions/src/Main.java
index 748b0de..c089c52 100644
--- a/test/083-compiler-regressions/src/Main.java
+++ b/test/083-compiler-regressions/src/Main.java
@@ -58,6 +58,21 @@
         ManyFloatArgs();
         atomicLong();
         LiveFlags.test();
+        minDoubleWith3ConstsTest();
+    }
+
+    public static double minDouble(double a, double b, double c) {
+        return Math.min(Math.min(a, b), c);
+    }
+
+    public static void minDoubleWith3ConstsTest() {
+        double result = minDouble(1.2, 2.5, Double.NaN);
+        if (Double.isNaN(result)) {
+            System.out.println("minDoubleWith3ConstsTest passes");
+        } else {
+            System.out.println("minDoubleWith3ConstsTest fails: " + result +
+                               " (expecting NaN)");
+        }
     }
 
     public static void atomicLong() {