commit 51e55914d5b3045718e871401f096d059a2f7d31
author Mark Mendell <mark.p.mendell@intel.com> Tue Nov 10 17:26:10 2015 -0500
committer Mark Mendell <mark.p.mendell@intel.com> Thu Jan 14 22:31:38 2016 -0500
tree 98d7048faac437b6ba632701753313a6e9c4d769
parent 68c56ae9ccdb6e348501456e374ae65e74f6270c

JIT: Fix incorrect CHECK

MirMethodLoweringInfo::Resolve() contains a CHECK that fails if the
invoke being resolved is String.<init>().  This changes the invoke_type
to kDirect, and then CHECKs that it is kVirtual, which doesn't work
well.

Change-Id: I2c3afa38533fb39f0b1260968c46b251088e75c8
Signed-off-by: Mark Mendell <mark.p.mendell@intel.com>

compiler/dex/mir_method_info.cc

diff --git a/compiler/dex/mir_method_info.cc b/compiler/dex/mir_method_info.cc
index 658e7d6..c250bd9 100644
--- a/compiler/dex/mir_method_info.cc
+++ b/compiler/dex/mir_method_info.cc
@@ -100,8 +100,12 @@
     } else {
       // The method index is actually the dex PC in this case.
       // Calculate the proper dex file and target method idx.
+
+      // We must be in JIT mode if we get here.
       CHECK(use_jit);
-      CHECK_EQ(invoke_type, kVirtual);
+
+      // The invoke type better be virtual, except for the string init special case above.
+      CHECK_EQ(invoke_type, string_init ? kDirect : kVirtual);
       // Don't devirt if we are in a different dex file since we can't have direct invokes in
       // another dex file unless we always put a direct / patch pointer.
       devirt_target = nullptr;