Add swith to file usage

src/CreateInterTree/CreateInterTree.cpp

@@ -17,7 +17,7 @@ using std::fstream;
 static long int getNextTag()
 {
     static long int INTERVAL_TAG = 0;
-    return INTERVAL_TAG++;
+    return -(INTERVAL_TAG++);
 }
 
 //Debug funcs
@@ -413,7 +413,7 @@ static void findIntervals(SpfInterval *interval, map<int, int> &labelsRef, map<i
         inter->lineFile = std::make_pair(currentSt->lineNumber(), currentSt->fileName());
         inter->parent = interval;
         inter->exit_levels.push_back(0);
-        inter->tag = getNextTag();
+        inter->tag = currentSt->lineNumber();//getNextTag();
         interval->nested.push_back(inter);
 
         findIntervals(inter, labelsRef, gotoStmts, currentSt);

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,21 +554,35 @@ 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)
+    // Correct usage pattern in this project:
-        return;
+    // 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) {
+        SgFile* curFile = current_file;
-        SgStatement* st = file->functions(i);
+        if (!curFile)
+            continue;
 
-        const auto loopBlocks = findBlocksInLoopsByFullIR(st, FullIR);
+        const int funcNum = curFile->numberOfFunctions();
-        for (auto* bb : loopBlocks)
+        for (int i = 0; i < funcNum; ++i)
         {
-            if (!bb)
+            SgStatement* st = curFile->functions(i);
-                continue;
+
-            if (reorderOperatorsInBasicBlockUsingDeps(bb))
+            const auto loopBlocks = findBlocksInLoopsByFullIR(st, FullIR);
-                countOfTransform += 1;
+            for (auto* bb : loopBlocks)
+            {
+                if (!bb)
+                    continue;
+                if (reorderOperatorsInBasicBlockUsingDeps(bb))
+                    countOfTransform += 1;
+            }
         }
     }
+
+    if (!oldFileName.empty())
+        SgFile::switchToFile(oldFileName.c_str());
 }

src/Utils/version.h

@@ -1,3 +1,3 @@
 #pragma once
 
-#define VERSION_SPF "2468"
+#define VERSION_SPF "2470"