From c399fdc442db82dfda66e6c25518872ab0f1d24f Mon Sep 17 00:00:00 2001 From: Nicolas Geoffray Date: Wed, 21 Jan 2015 12:42:57 +0000 Subject: Revert "Fully support pairs in the register allocator." Libcore tests fail. This reverts commit 41aedbb684ccef76ff8373f39aba606ce4cb3194. Change-Id: I2572f120d4bbaeb7a4d4cbfd47ab00c9ea39ac6c --- compiler/optimizing/nodes.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'compiler/optimizing/nodes.cc') diff --git a/compiler/optimizing/nodes.cc b/compiler/optimizing/nodes.cc index 800af409a2..ade31380ec 100644 --- a/compiler/optimizing/nodes.cc +++ b/compiler/optimizing/nodes.cc @@ -646,7 +646,7 @@ HConstant* HBinaryOperation::TryStaticEvaluation() const { 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); } } -- cgit v1.2.3-59-g8ed1b