commit c399fdc442db82dfda66e6c25518872ab0f1d24f
author Nicolas Geoffray <ngeoffray@google.com> Wed Jan 21 12:42:57 2015 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Wed Jan 21 12:42:57 2015 +0000
tree 6f0841ad5e8e80b09e34e084ae8eac336bce73a2
parent 41aedbb684ccef76ff8373f39aba606ce4cb3194

Revert "Fully support pairs in the register allocator."

Libcore tests fail.

This reverts commit 41aedbb684ccef76ff8373f39aba606ce4cb3194.

Change-Id: I2572f120d4bbaeb7a4d4cbfd47ab00c9ea39ac6c

compiler/optimizing/nodes.cc

diff --git a/compiler/optimizing/nodes.cc b/compiler/optimizing/nodes.cc
index 800af40..ade3138 100644
--- a/compiler/optimizing/nodes.cc
+++ b/compiler/optimizing/nodes.cc
@@ -646,7 +646,7 @@
     if (GetResultType() == Primitive::kPrimLong) {
       return new(GetBlock()->GetGraph()->GetArena()) HLongConstant(value);
     } else {
-      DCHECK_EQ(GetResultType(), Primitive::kPrimInt);
+      DCHECK(GetResultType() == Primitive::kPrimInt);
       return new(GetBlock()->GetGraph()->GetArena()) HIntConstant(value);
     }
   }