From 080820c8e7a25bc3fb28d7c5a1524b0e5537c7a9 Mon Sep 17 00:00:00 2001 From: Aart Bik Date: Thu, 19 Apr 2018 04:02:36 +0000 Subject: Revert "Deopt does not throw" This reverts commit 2905de1c0e5b6a0c995be474b3f0efdfdc6a41c4. Reason for revert: test breaks on git_master-art-host; art-test-javac (linux) Change-Id: Ic39d442776858c74d2163683c78bd3a8072ad45e --- compiler/optimizing/nodes.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'compiler/optimizing/nodes.h') diff --git a/compiler/optimizing/nodes.h b/compiler/optimizing/nodes.h index b315c81693..79d733060b 100644 --- a/compiler/optimizing/nodes.h +++ b/compiler/optimizing/nodes.h @@ -1272,6 +1272,8 @@ class HBasicBlock : public ArenaObject { // the appropriate try entry will be returned. const HTryBoundary* ComputeTryEntryOfSuccessors() const; + bool HasThrowingInstructions() const; + // Returns whether this block dominates the blocked passed as parameter. bool Dominates(HBasicBlock* block) const; @@ -2130,7 +2132,6 @@ class HInstruction : public ArenaObject { !CanThrow() && !IsSuspendCheck() && !IsControlFlow() && - !IsDeoptimize() && !IsNativeDebugInfo() && !IsParameterValue() && // If we added an explicit barrier then we should keep it. @@ -3237,9 +3238,7 @@ class HDeoptimize FINAL : public HVariableInputSizeInstruction { bool NeedsEnvironment() const OVERRIDE { return true; } - // Even though deoptimize is often used for "exceptional cases" to go back to - // the interpreter, it never throws an exception. - bool CanThrow() const OVERRIDE { return false; } + bool CanThrow() const OVERRIDE { return true; } DeoptimizationKind GetDeoptimizationKind() const { return GetPackedField(); } -- cgit v1.2.3-59-g8ed1b