From 37fe26288aaacae0f26873131dd92704796e09ec Mon Sep 17 00:00:00 2001 From: Santiago Aboy Solanes Date: Tue, 6 Sep 2022 16:15:49 +0000 Subject: Revert "Add an environment to the beginning of catch blocks" This reverts commit f976aa822dd35496e4e936b5802af0d53d39ac95. Reason for revert: breaking some tests https://ci.chromium.org/ui/p/art/builders/ci/angler-armv8-ndebug/3244/blamelist Change-Id: I5c2732e81bef8a7e83b661b1b947d7c079994c1b --- compiler/optimizing/instruction_builder.cc | 9 --------- 1 file changed, 9 deletions(-) (limited to 'compiler/optimizing/instruction_builder.cc') diff --git a/compiler/optimizing/instruction_builder.cc b/compiler/optimizing/instruction_builder.cc index ba58c8d1fe..605427ba11 100644 --- a/compiler/optimizing/instruction_builder.cc +++ b/compiler/optimizing/instruction_builder.cc @@ -343,10 +343,6 @@ static bool IsBlockPopulated(HBasicBlock* block) { // Suspend checks were inserted into loop headers during building of dominator tree. DCHECK(block->GetFirstInstruction()->IsSuspendCheck()); return block->GetFirstInstruction() != block->GetLastInstruction(); - } else if (block->IsCatchBlock()) { - // Nops were inserted into the beginning of catch blocks. - DCHECK(block->GetFirstInstruction()->IsNop()); - return block->GetFirstInstruction() != block->GetLastInstruction(); } else { return !block->GetInstructions().IsEmpty(); } @@ -391,11 +387,6 @@ bool HInstructionBuilder::Build() { // This is slightly odd because the loop header might not be empty (TryBoundary). // But we're still creating the environment with locals from the top of the block. InsertInstructionAtTop(suspend_check); - } else if (current_block_->IsCatchBlock()) { - // We add an environment emitting instruction at the beginning of each catch block, in order - // to support try catch inlining. - // This is slightly odd because the catch block might not be empty (TryBoundary). - InsertInstructionAtTop(new (allocator_) HNop(block_dex_pc, /* needs_environment= */ true)); } if (block_dex_pc == kNoDexPc || current_block_ != block_builder_->GetBlockAt(block_dex_pc)) { -- cgit v1.2.3-59-g8ed1b