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/code_generator.h | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'compiler/optimizing/code_generator.h') diff --git a/compiler/optimizing/code_generator.h b/compiler/optimizing/code_generator.h index 6b85aaa880..de247a98b9 100644 --- a/compiler/optimizing/code_generator.h +++ b/compiler/optimizing/code_generator.h @@ -846,11 +846,8 @@ class CodeGenerator : public DeletableArenaObject { void BlockIfInRegister(Location location, bool is_out = false) const; void EmitEnvironment(HEnvironment* environment, SlowPathCode* slow_path, - bool needs_vreg_info = true, - bool is_for_catch_handler = false, - bool innermost_environment = true); - void EmitVRegInfo(HEnvironment* environment, SlowPathCode* slow_path, bool is_for_catch_handler); - void EmitVRegInfoOnlyCatchPhis(HEnvironment* environment); + bool needs_vreg_info = true); + void EmitVRegInfo(HEnvironment* environment, SlowPathCode* slow_path); static void PrepareCriticalNativeArgumentMoves( HInvokeStaticOrDirect* invoke, -- cgit v1.2.3-59-g8ed1b