From 5feadf5d6907dc99b2058bb6943f628e5f4815d8 Mon Sep 17 00:00:00 2001 From: Vern Paxson Date: Thu, 28 Nov 2024 16:36:28 -0800 Subject: [PATCH] fixed -O dump-final-ZAM to work in conjunction with -O no-ZAM-opt --- src/script_opt/ZAM/Driver.cc | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/script_opt/ZAM/Driver.cc b/src/script_opt/ZAM/Driver.cc index a4be8b9d83..1cb8abfdd7 100644 --- a/src/script_opt/ZAM/Driver.cc +++ b/src/script_opt/ZAM/Driver.cc @@ -404,16 +404,19 @@ void ZAMCompiler::Dump() { } } else if ( analysis_options.dump_final_ZAM ) { - ASSERT(remapped_frame); - printf("\nFrame for %s:\n", func->GetName().c_str()); - for ( auto i = 0U; i < shared_frame_denizens.size(); ++i ) { - printf("frame[%d] =", i); - for ( auto& id : shared_frame_denizens[i].ids ) - printf(" %s", id->Name()); - printf("\n"); + if ( remapped_frame ) { + for ( auto i = 0U; i < shared_frame_denizens.size(); ++i ) { + printf("frame[%d] =", i); + for ( auto& id : shared_frame_denizens[i].ids ) + printf(" %s", id->Name()); + printf("\n"); + } } + else + for ( const auto& elem : frame_layout1 ) + printf("frame[%d] = %s\n", elem.second, elem.first->Name()); } if ( ! insts2.empty() )