From 771e5cc519665ce0cc76985bb4803f0dd50c3b40 Mon Sep 17 00:00:00 2001 From: David Brazdil Date: Thu, 29 Oct 2015 22:47:39 +0000 Subject: Revert "ART: Enable more passes under try/catch" BCE does not set TryCatchInformation when creating new blocks. Will be fixed with DynamicBCE CL. This reverts commit 39fabd6bb6fcf7a712b370d3b6fd0ada83e2e5d8. Change-Id: I76ae707ac132bb1a4a9f64f4916ffcd786ef730c --- compiler/optimizing/nodes.cc | 8 -------- 1 file changed, 8 deletions(-) (limited to 'compiler/optimizing/nodes.cc') diff --git a/compiler/optimizing/nodes.cc b/compiler/optimizing/nodes.cc index 4345d55e90..348026551e 100644 --- a/compiler/optimizing/nodes.cc +++ b/compiler/optimizing/nodes.cc @@ -1129,14 +1129,6 @@ std::ostream& operator<<(std::ostream& os, const HInstruction::InstructionKind& } void HInstruction::MoveBefore(HInstruction* cursor) { - if (kIsDebugBuild && CanThrowIntoCatchBlock()) { - // Make sure we are not moving a throwing instruction out of its try block. - DCHECK(cursor->GetBlock()->IsTryBlock()); - const HTryBoundary& current_try = block_->GetTryCatchInformation()->GetTryEntry(); - const HTryBoundary& cursor_try = cursor->GetBlock()->GetTryCatchInformation()->GetTryEntry(); - DCHECK(cursor_try.HasSameExceptionHandlersAs(current_try)); - } - next_->previous_ = previous_; if (previous_ != nullptr) { previous_->next_ = next_; -- cgit v1.2.3-59-g8ed1b