Merge branch 'master' into egormayorov

src/Transformations/MoveOperators/move_operators.cpp

@@ -17,6 +17,9 @@
 
 using namespace std;
 
+// Provided by Sage runtime (declared in libSage++.h)
+extern SgFile *current_file;
+
 
 set<int> loop_tags = {FOR_NODE};
 set<int> control_tags = {IF_NODE, ELSEIF_NODE, DO_WHILE_NODE, WHILE_NODE, LOGIF_NODE};
@@ -551,13 +554,23 @@ static bool reorderOperatorsInBasicBlockUsingDeps(SAPFOR::BasicBlock* bb)
 void moveOperators(SgFile *file, map<string, vector<LoopGraph*>>& loopGraph, 
                    const map<FuncInfo*, vector<SAPFOR::BasicBlock*>>& FullIR, 
                    int& countOfTransform) {
-    if (!file)
-        return;
+    // Correct usage pattern in this project:
+    // save current file -> switch -> work on current_file -> restore.
+    const string oldFileName = (current_file ? current_file->filename() : "");
 
-    const int funcNum = file->numberOfFunctions();
+    for (const auto& [fileName, _] : loopGraph)
+    {
+        if (SgFile::switchToFile(fileName.c_str()) == -1)
+            continue;
 
-    for (int i = 0; i < funcNum; ++i) {
-        SgStatement* st = file->functions(i);
+        SgFile* curFile = current_file;
+        if (!curFile)
+            continue;
+
+        const int funcNum = curFile->numberOfFunctions();
+        for (int i = 0; i < funcNum; ++i)
+        {
+            SgStatement* st = curFile->functions(i);
 
             const auto loopBlocks = findBlocksInLoopsByFullIR(st, FullIR);
             for (auto* bb : loopBlocks)
@@ -568,4 +581,8 @@ void moveOperators(SgFile *file, map<string, vector<LoopGraph*>>& loopGraph,
                     countOfTransform += 1;
             }
         }
+    }
+
+    if (!oldFileName.empty())
+        SgFile::switchToFile(oldFileName.c_str());
 }