From 79b7b4a1ba09bef2ceee8e56409266611d1a6b81 Mon Sep 17 00:00:00 2001 From: Fred Chow Date: Thu, 4 Nov 2021 23:31:38 -0700 Subject: [PATCH] Fixed assertion in stmtpre and turn on stmtpre phase for C --- src/mapleall/maple_me/src/me_stmt_pre.cpp | 3 +++ src/mapleall/maple_phase/include/phases.def | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/mapleall/maple_me/src/me_stmt_pre.cpp b/src/mapleall/maple_me/src/me_stmt_pre.cpp index 09f85567f8..608644cdd8 100644 --- a/src/mapleall/maple_me/src/me_stmt_pre.cpp +++ b/src/mapleall/maple_me/src/me_stmt_pre.cpp @@ -1100,6 +1100,9 @@ void MeStmtPre::BuildWorkList() { continue; } MapleStack *varStack = ssaPreMemPool->New>(ssaPreAllocator.Adapter()); + if (ost->GetVersionsIndices().empty()) { + continue; + } varStack->push(static_cast(irMap->GetOrCreateZeroVersionVarMeExpr(*ost))); versionStackVec[ost->GetIndex()] = varStack; } diff --git a/src/mapleall/maple_phase/include/phases.def b/src/mapleall/maple_phase/include/phases.def index 028e6c15bd..1c2fdf254f 100644 --- a/src/mapleall/maple_phase/include/phases.def +++ b/src/mapleall/maple_phase/include/phases.def @@ -59,7 +59,7 @@ ADDMAPLEMEPHASE("hdse", MeOption::optLevel >= 2) ADDMAPLEMEPHASE("may2dassign", JAVALANG && MeOption::optLevel >= 2) ADDMAPLEMEPHASE("condbasednpc", JAVALANG && MeOption::optLevel >= 2) ADDMAPLEMEPHASE("epre", MeOption::optLevel >= 2) -ADDMAPLEMEPHASE("stmtpre", JAVALANG && MeOption::optLevel >= 2) +ADDMAPLEMEPHASE("stmtpre", MeOption::optLevel >= 2) ADDMAPLEMEPHASE("analyzerc", MeOption::optLevel != 0 && JAVALANG && !MeOption::noRC && !MeOption::gcOnly) ADDMAPLEMEPHASE("rclowering", JAVALANG && !MeOption::noRC && MeOption::rcLowering && !MeOption::gcOnly) ADDMAPLEMEPHASE("gclowering", JAVALANG && MeOption::gcOnly) -- Gitee