Compiler crash workaround
The compiler was dying during its type inference pass. I believe
this is related to losing type information during the verifier's
instruction rewriting, but will investiate further to make sure.
Workaround is to just disable register promotion when this situation
is detected.
Change-Id: I1c963d67f7d61a1c1666d4ef8d593d8685ac60e0
diff --git a/src/compiler/Ralloc.cc b/src/compiler/Ralloc.cc
index b4cc0b5..184db9f 100644
--- a/src/compiler/Ralloc.cc
+++ b/src/compiler/Ralloc.cc
@@ -216,7 +216,27 @@
definedCore |= (cUnit->regLocation[ssaRep->uses[i]].defined
&& cUnit->regLocation[ssaRep->uses[i]].core);
}
- DCHECK(!(definedFP && definedCore));
+ /*
+ * TODO: cleaner fix
+ * We don't normally expect to see a Dalvik register
+ * definition used both as a floating point and core
+ * value. However, the instruction rewriting that occurs
+ * during verification can eliminate some type information,
+ * leaving us confused. The real fix here is either to
+ * add explicit type information to Dalvik byte codes,
+ * or to recognize OP_THROW_VERIFICATION_ERROR as
+ * an unconditional branch and support dead code elimination.
+ * As a workaround we can detect this situation and
+ * disable register promotion (which is the only thing that
+ * relies on distinctions between core and fp usages.
+ */
+ if ((definedFP && definedCore) &&
+ ((cUnit->disableOpt & (1 << kPromoteRegs)) == 0)) {
+ LOG(WARNING) << art::PrettyMethod(cUnit->method)
+ << " op at block " << bb->id
+ << " has both fp and core uses for same def.";
+ cUnit->disableOpt |= (1 << kPromoteRegs);
+ }
changed |= setFp(cUnit, ssaRep->defs[0], definedFP);
changed |= setCore(cUnit, ssaRep->defs[0], definedCore);
for (int i = 0; i < ssaRep->numUses; i++) {