From 9abf5d6c4b6264f06ee616886c3734ffdefb2395 Mon Sep 17 00:00:00 2001
From: Grigorii Gusev <gr@medhim.ru>
Date: Sat, 24 Feb 2024 21:26:05 +0300
Subject: [PATCH] private_removing: add call of remove_dead_code pass

---
 sapfor/experts/Sapfor_2017/_src/Sapfor.cpp                      | 1 +
 .../Sapfor_2017/_src/Transformations/private_removing.cpp       | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/sapfor/experts/Sapfor_2017/_src/Sapfor.cpp b/sapfor/experts/Sapfor_2017/_src/Sapfor.cpp
index 0dcb946..ed59769 100644
--- a/sapfor/experts/Sapfor_2017/_src/Sapfor.cpp
+++ b/sapfor/experts/Sapfor_2017/_src/Sapfor.cpp
@@ -2503,6 +2503,7 @@ void runPass(const int curr_regime, const char *proj_name, const char *folderNam
     case PRIVATE_REMOVING:
         runAnalysis(*project, curr_regime, false, "", folderName);
         runPass(REVERT_SUBST_EXPR_RD, proj_name, folderName);
+        runPass(REMOVE_DEAD_CODE, proj_name, folderName);
         if (folderName)
             runAnalysis(*project, UNPARSE_FILE, true, "", folderName);
         else
diff --git a/sapfor/experts/Sapfor_2017/_src/Transformations/private_removing.cpp b/sapfor/experts/Sapfor_2017/_src/Transformations/private_removing.cpp
index 96e4ba3..49156e1 100644
--- a/sapfor/experts/Sapfor_2017/_src/Transformations/private_removing.cpp
+++ b/sapfor/experts/Sapfor_2017/_src/Transformations/private_removing.cpp
@@ -747,7 +747,7 @@ void removePrivates(SgFile* file, vector<Messages>& messages, int& countOfTransf
 
         //removeDeadCodeFromLoop(varToRemove.loop); // TODO: problem with reverting substitution
         removeExcessiveDefs(varToRemove);
-        removeEmptyLoops(varToRemove.loop, messages);
+        //removeEmptyLoops(varToRemove.loop, messages); // removing is made by REMOVE_DEAD_CODE pass
 
         SgForStmt* loopStmt = (SgForStmt*)varToRemove.loop->loop->GetOriginal();
         vector<SgArrayRefExp*> varRefs = getDirectArrayRefs(loopStmt, varToRemove.varSymbol);