commit 0ead7ddfde5270c4086b45d5cf9ef9ae48b22568
author Andreas Gampe <agampe@google.com> Thu Aug 13 05:32:50 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Aug 13 05:32:50 2015 +0000
tree 95d13900fb7ab30bfa155ae51b3d04296d5eca43
parent 1e14055e92dff0e1f5189daccb4feb91c0b021d9
parent 1d4219ee25dfb228cc72f353d97be69584fc0722

am 1d4219ee: Merge "Intrinsics recognizer returns kNone for MIPS, MIPS64 instruction sets"

* commit '1d4219ee25dfb228cc72f353d97be69584fc0722':
  Intrinsics recognizer returns kNone for MIPS, MIPS64 instruction sets

compiler/optimizing/intrinsics.cc

diff --git a/compiler/optimizing/intrinsics.cc b/compiler/optimizing/intrinsics.cc
index c5ba8cb..3db9816 100644
--- a/compiler/optimizing/intrinsics.cc
+++ b/compiler/optimizing/intrinsics.cc
@@ -84,7 +84,10 @@
   }
 }
 
-static Intrinsics GetIntrinsic(InlineMethod method) {
+static Intrinsics GetIntrinsic(InlineMethod method, InstructionSet instruction_set) {
+  if (instruction_set == kMips || instruction_set == kMips64) {
+    return Intrinsics::kNone;
+  }
   switch (method.opcode) {
     // Floating-point conversions.
     case kIntrinsicDoubleCvt:
@@ -365,7 +368,7 @@
             driver_->GetMethodInlinerMap()->GetMethodInliner(&invoke->GetDexFile());
         DCHECK(inliner != nullptr);
         if (inliner->IsIntrinsic(invoke->GetDexMethodIndex(), &method)) {
-          Intrinsics intrinsic = GetIntrinsic(method);
+          Intrinsics intrinsic = GetIntrinsic(method, graph_->GetInstructionSet());
 
           if (intrinsic != Intrinsics::kNone) {
             if (!CheckInvokeType(intrinsic, invoke)) {