From 0ba627337274ccfb8c9cb9bf23fffb1e1b9d1430 Mon Sep 17 00:00:00 2001 From: Andreas Gampe Date: Tue, 24 Mar 2015 02:39:46 +0000 Subject: Revert "Deoptimization-based bce." This breaks compiling the core image: Error after BCE: art::SSAChecker: Instruction 219 in block 1 does not dominate use 221 in block 1. This reverts commit e295e6ec5beaea31be5d7d3c996cd8cfa2053129. Change-Id: Ieeb48797d451836ed506ccb940872f1443942e4e --- compiler/optimizing/nodes.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'compiler/optimizing/nodes.cc') diff --git a/compiler/optimizing/nodes.cc b/compiler/optimizing/nodes.cc index aeb1751f24..a90ebced69 100644 --- a/compiler/optimizing/nodes.cc +++ b/compiler/optimizing/nodes.cc @@ -696,8 +696,8 @@ HInstruction* HBinaryOperation::GetLeastConstantLeft() const { } } -bool HCondition::IsBeforeWhenDisregardMoves(HInstruction* instruction) const { - return this == instruction->GetPreviousDisregardingMoves(); +bool HCondition::IsBeforeWhenDisregardMoves(HIf* if_) const { + return this == if_->GetPreviousDisregardingMoves(); } HConstant* HConstant::NewConstant(ArenaAllocator* allocator, Primitive::Type type, int64_t val) { -- cgit v1.2.3-59-g8ed1b