ast-exporter: In VisitExpr, pre-compute the macro expansion stack

Author: Rua

c2rust-ast-exporter/src/AstExporter.cpp

@@ -1417,19 +1417,20 @@ class TranslateASTVisitor final
             return true;
         }
 
-        auto ExpansionRange = Mgr.getImmediateExpansionRange(Begin);
+        // Holds the stack of ranges of macro expansions that expand to this expression.
+        // The last element is the top-level macro call.
+        auto ExpansionStack = getMacroExpansionStack(Range);
+
+        if (ExpansionStack.empty()) {
+            return true;
+        }
+
         curMacroExpansionSource =
-            Lexer::getSourceText(ExpansionRange, Mgr, Context->getLangOpts());
-
-        // The macro stack unwound by getImmediateMacroCallerLoc and friends
-        // starts with literal replacement and works it's way to the macro call
-        // that was replaced.
-        while (Begin.isMacroID()) {
-            auto ExpansionRange = Mgr.getImmediateExpansionRange(Begin).getAsRange();
-            auto ExpansionBegin = ExpansionRange.getBegin();
-            auto ExpansionEnd = ExpansionRange.getEnd();
+            Lexer::getSourceText(ExpansionStack[0], Mgr, Context->getLangOpts());
+
+        for (auto &ExpansionRange : ExpansionStack) {
             StringRef name;
-            MacroInfo *mac = getMacroInfo(ExpansionBegin, name);
+            MacroInfo *mac = getMacroInfo(ExpansionRange.getBegin(), name);
 
             if (!mac || mac->getNumTokens() == 0) {
                 return true;
@@ -1440,22 +1441,39 @@ class TranslateASTVisitor final
             // Verify that this expansion covers the entire macro replacement
             // definition, i.e. E is not a subexpression of the macro
             // replacement.
-            if (Mgr.getSpellingLoc(Begin) != ReplacementBegin ||
-                Mgr.getSpellingLoc(End) != ReplacementEnd) {
+            if (Mgr.getSpellingLoc(Range.getBegin()) != ReplacementBegin ||
+                Mgr.getSpellingLoc(Range.getEnd()) != ReplacementEnd) {
                 return true;
             }
 
-            Begin = ExpansionBegin;
-            End = ExpansionEnd;
-
-            if (VisitMacro(name, Begin, mac, E)) {
+            if (VisitMacro(name, ExpansionRange.getBegin(), mac, E)) {
                 curMacroExpansionStack.push_back(mac);
             }
+
+            Range = ExpansionRange.getAsRange();
         }
 
         return true;
     }
 
+    std::vector<CharSourceRange> getMacroExpansionStack(SourceRange Range) const {
+        auto &Mgr = Context->getSourceManager();
+        auto Begin = Range.getBegin();
+        auto End = Range.getEnd();
+
+        // Holds the stack of ranges of macro expansions.
+        // The last element is the top-level macro call.
+        std::vector<CharSourceRange> ExpansionStack;
+
+        do {
+            auto ExpansionRange = Mgr.getImmediateExpansionRange(Begin);
+            ExpansionStack.push_back(ExpansionRange);
+            Begin = ExpansionRange.getBegin();
+        } while (Begin.isMacroID());
+
+        return ExpansionStack;
+    }
+
     bool VisitVAArgExpr(VAArgExpr *E) {
         std::vector<void *> childIds{E->getSubExpr()};
         encode_entry(E, TagVAArgExpr, childIds);