commit cee552a858ed2b819f6440e555cc7165200dc0af
author Bill Buzbee <buzbee@android.com> Wed Nov 19 19:03:48 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Nov 19 19:03:49 2014 +0000
tree a20e0966969bd4919082ad38a15f5fca539f4561
parent f91ffc6db742e6d429b287db2e1843393802e32f
parent 4ee71b2df9eb74531d44528d028378bf0e90ecd7

Merge "ART: X86Mir2Lir::OpRegRegReg should expect kOpMul for r_dest == r_src2 case"

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 c1c79ca..ad3222c 100644
--- a/compiler/dex/quick/x86/utility_x86.cc
+++ b/compiler/dex/quick/x86/utility_x86.cc
@@ -488,6 +488,7 @@
       case kOpAdc:
       case kOpAnd:
       case kOpXor:
+      case kOpMul:
         break;
       default:
         LOG(FATAL) << "Bad case in OpRegRegReg " << op;

test/800-smali/expected.txt

diff --git a/test/800-smali/expected.txt b/test/800-smali/expected.txt
index 01d7b81..7674a8a 100644
--- a/test/800-smali/expected.txt
+++ b/test/800-smali/expected.txt
@@ -5,4 +5,5 @@
 sameFieldNames
 b/18380491
 invoke-super abstract
+BadCaseInOpRegRegReg
 Done!

test/800-smali/smali/BadCaseInOpRegRegReg.smali

diff --git a/test/800-smali/smali/BadCaseInOpRegRegReg.smali b/test/800-smali/smali/BadCaseInOpRegRegReg.smali
new file mode 100644
index 0000000..2683790
--- /dev/null
+++ b/test/800-smali/smali/BadCaseInOpRegRegReg.smali
@@ -0,0 +1,13 @@
+.class public LBadCaseInOpRegRegReg;
+
+.super Ljava/lang/Object;
+
+.method public static getInt()I
+    .registers 2
+    const/4 v0, 0x0
+    const/4 v1, 0x1
+    add-int/2addr v0, v1
+    add-int/lit8 v1, v0, 0x1
+    mul-int v0, v1, v0
+    return v0
+.end method

test/800-smali/src/Main.java

diff --git a/test/800-smali/src/Main.java b/test/800-smali/src/Main.java
index 3f613ef..8d318c3 100644
--- a/test/800-smali/src/Main.java
+++ b/test/800-smali/src/Main.java
@@ -60,6 +60,7 @@
             new Object[]{42}, null, 42));
         testCases.add(new TestCase("invoke-super abstract", "B18380491ConcreteClass", "foo",
             new Object[]{0}, new AbstractMethodError(), null));
+        testCases.add(new TestCase("BadCaseInOpRegRegReg", "BadCaseInOpRegRegReg", "getInt", null, null, 2));
     }
 
     public void runTests() {