diff --git a/src/mapleall/maple_driver/src/driver_runner.cpp b/src/mapleall/maple_driver/src/driver_runner.cpp index 28adec1fba96ba377defe4f4ce179b1c718b22f1..40231dcdf0f77cec7744407fc36d6f2b685d8082 100644 --- a/src/mapleall/maple_driver/src/driver_runner.cpp +++ b/src/mapleall/maple_driver/src/driver_runner.cpp @@ -296,16 +296,15 @@ void DriverRunner::RunNewPM(const std::string &output, const std::string &vtable void DriverRunner::ProcessMpl2mplAndMePhases(const std::string &output, const std::string &vtableImplFile) { CHECK_MODULE(); theMIRModule = theModule; - if (withDwarf && !theModule->IsWithDbgInfo()) { - std::cout << "set up debug info " << std::endl; - theMIRModule->GetDbgInfo()->BuildDebugInfo(); - } if (mpl2mplOptions != nullptr || meOptions != nullptr) { // multi-thread is not supported for now. MeOption::threads = 1; // main entry of newpm for me&mpl2mpl RunNewPM(output, vtableImplFile); - return; + } + if (withDwarf && !theModule->IsWithDbgInfo()) { + std::cout << "set up debug info " << std::endl; + theMIRModule->GetDbgInfo()->BuildDebugInfo(); } } diff --git a/src/mapleall/maple_phase/include/phases.def b/src/mapleall/maple_phase/include/phases.def index c1e7593ac07c194f7dfc96f71f2fcbde570aaae1..13f6f39ad1d97fb9253437d366c5ef45a3c80175 100644 --- a/src/mapleall/maple_phase/include/phases.def +++ b/src/mapleall/maple_phase/include/phases.def @@ -7,7 +7,7 @@ ADDMODULEPHASE("reflectionanalysis", JAVALANG) ADDMODULEPHASE("GenNativeStubFunc", JAVALANG) ADDMODULEPHASE("gencheckcast", JAVALANG) ADDMODULEPHASE("javaintrnlowering", JAVALANG) -ADDMODULEPHASE("callgraph", Options::O2 && !Options::profileUse) +ADDMODULEPHASE("callgraph", !Options::profileUse) ADDMODULEPHASE("inline", Options::O2 && Options::useInline && !Options::profileUse) // run callgraph again to delete fully inlined static function ADDMODULEPHASE("callgraph", Options::O2 && Options::useInline && !Options::profileUse)