From c7508e93fa3df3a3890f6b62550cbd5e35bdd8df Mon Sep 17 00:00:00 2001 From: David Brazdil Date: Mon, 27 Apr 2015 13:28:57 +0100 Subject: ART: Fix removing a Phi with RemoveInstruction Boolean simplifier might attempt to remove a Phi from the Instruction list. Change-Id: I698cc616549bd88dac96395cb2e5d09b5433d157 --- compiler/optimizing/nodes.h | 1 + 1 file changed, 1 insertion(+) (limited to 'compiler/optimizing/nodes.h') diff --git a/compiler/optimizing/nodes.h b/compiler/optimizing/nodes.h index d970e383ed..753c95b477 100644 --- a/compiler/optimizing/nodes.h +++ b/compiler/optimizing/nodes.h @@ -589,6 +589,7 @@ class HBasicBlock : public ArenaObject { // instruction is not in use and removes it from the use lists of its inputs. void RemoveInstruction(HInstruction* instruction, bool ensure_safety = true); void RemovePhi(HPhi* phi, bool ensure_safety = true); + void RemoveInstructionOrPhi(HInstruction* instruction, bool ensure_safety = true); bool IsLoopHeader() const { return (loop_information_ != nullptr) && (loop_information_->GetHeader() == this); -- cgit v1.2.3-59-g8ed1b