From 57225969705df72ebe9270a1750e4d0a37c56d70 Mon Sep 17 00:00:00 2001 From: Vern Paxson Date: Wed, 14 Jun 2023 17:43:55 -0700 Subject: [PATCH] ZAM bug fix (simplification) for nested inline functions that don't do anything --- src/script_opt/ZAM/Stmt.cc | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/script_opt/ZAM/Stmt.cc b/src/script_opt/ZAM/Stmt.cc index d35c279c38..4d8e385c14 100644 --- a/src/script_opt/ZAM/Stmt.cc +++ b/src/script_opt/ZAM/Stmt.cc @@ -1047,14 +1047,7 @@ const ZAMStmt ZAMCompiler::CompileCatchReturn(const CatchReturnStmt* cr) ResolveCatchReturns(GoToTargetBeyond(block_end)); - // If control flow runs off the end of the block, then we need - // to consider sync'ing globals at that point. - auto block_last = LastStmt(block.get()); - - if ( block_last->Tag() == STMT_RETURN ) - return block_end; - - return top_main_inst; + return block_end; } const ZAMStmt ZAMCompiler::CompileStmts(const StmtList* ws)