From 154552e666347d41d95d7619c6ee56249ff4feca Mon Sep 17 00:00:00 2001 From: Nicolas Geoffray Date: Fri, 6 Mar 2015 16:10:14 +0000 Subject: Revert "[optimizing] Enable x86 long support." Few libcore failures. This reverts commit b4ba354cf8d22b261205494875cc014f18587b50. Change-Id: I4a28d853e730dff9b69aec9555505803cf2fcd63 --- compiler/optimizing/nodes.h | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) (limited to 'compiler/optimizing/nodes.h') diff --git a/compiler/optimizing/nodes.h b/compiler/optimizing/nodes.h index 6945ff0d53..b7dd756452 100644 --- a/compiler/optimizing/nodes.h +++ b/compiler/optimizing/nodes.h @@ -3289,19 +3289,8 @@ class HParallelMove : public HTemplateInstruction<0> { if (kIsDebugBuild) { if (instruction != nullptr) { for (size_t i = 0, e = moves_.Size(); i < e; ++i) { - if (moves_.Get(i).GetInstruction() == instruction) { - // Special case the situation where the move is for the spill slot - // of the instruction. - if ((GetPrevious() == instruction) - || ((GetPrevious() == nullptr) - && instruction->IsPhi() - && instruction->GetBlock() == GetBlock())) { - DCHECK_NE(destination.GetKind(), moves_.Get(i).GetDestination().GetKind()) - << "Doing parallel moves for the same instruction."; - } else { - DCHECK(false) << "Doing parallel moves for the same instruction."; - } - } + DCHECK_NE(moves_.Get(i).GetInstruction(), instruction) + << "Doing parallel moves for the same instruction."; } } for (size_t i = 0, e = moves_.Size(); i < e; ++i) { -- cgit v1.2.3-59-g8ed1b