am 6bc15e50: Merge "Fix x86 JIT log spam."

* commit '6bc15e501214d1e5544661438c1447d1cc4f98a5':
  Fix x86 JIT log spam.

1 files changed, 9 insertions, 1 deletions

diff --git a/vm/compiler/codegen/x86/AnalysisO1.cpp b/vm/compiler/codegen/x86/AnalysisO1.cpp
index d7e9726ec..2c816e3aa 100644
--- a/vm/compiler/codegen/x86/AnalysisO1.cpp
+++ b/vm/compiler/codegen/x86/AnalysisO1.cpp
@@ -864,7 +864,15 @@ int codeGenBasicBlock(const Method* method, BasicBlock_O1* bb) {
             }
 
             if (retCode == 1) {
-                ALOGE("JIT couldn't compile %s%s dex_pc=%d", method->clazz->descriptor, method->name, offsetPC);
+                // We always fall back to the interpreter for OP_INVOKE_OBJECT_INIT_RANGE,
+                // but any other failure is unexpected and should be logged.
+                if (mir->dalvikInsn.opcode != OP_INVOKE_OBJECT_INIT_RANGE) {
+                    ALOGE("JIT couldn't compile %s%s dex_pc=%d opcode=%d",
+                          method->clazz->descriptor,
+                          method->name,
+                          offsetPC,
+                          mir->dalvikInsn.opcode);
+                }
                 return -1;
             }
             updateConstInfo(bb);