[clang][NFC] Unify `MacroState` `isAmbiguous` and `getModuleInfo` (#197867)
Every call to `MacroState::getModuleInfo`, and `MacroState::isAmbiguous`
are paired in the same function. Rather than doing the same work twice,
just unify them into a single function, `getModuleInfo`, that returns
both pieces of information in a new type `ModuleMacroInfo`.
Unfortunately, `getModuleInfo` and`ModuleMacroInfo` already exist, so
rename them to `getFullModuleInfo` and `FullModuleMacroInfo`,
respectively, since the new type is a subset of the old type. The new
type contains just the pieces consumers care about.
While we're there, use the range constructor of `llvm::DenseSet` instead
of default constructing and calling `insert` in a loop.
diff --git a/clang/include/clang/Lex/MacroInfo.h b/clang/include/clang/Lex/MacroInfo.h
index 19a7062..cd47a70 100644
--- a/clang/include/clang/Lex/MacroInfo.h
+++ b/clang/include/clang/Lex/MacroInfo.h
@@ -583,6 +583,11 @@
unsigned getNumOverridingMacros() const { return NumOverriddenBy; }
};
+struct ModuleMacroInfo {
+ ArrayRef<ModuleMacro *> ActiveModuleMacros = {};
+ bool IsAmbiguous = false;
+};
+
/// A description of the current definition of a macro.
///
/// The definition of a macro comprises a set of (at least one) defining
@@ -593,9 +598,9 @@
public:
MacroDefinition() = default;
- MacroDefinition(DefMacroDirective *MD, ArrayRef<ModuleMacro *> MMs,
- bool IsAmbiguous)
- : LatestLocalAndAmbiguous(MD, IsAmbiguous), ModuleMacros(MMs) {}
+ MacroDefinition(DefMacroDirective *MD, ModuleMacroInfo Info)
+ : LatestLocalAndAmbiguous(MD, Info.IsAmbiguous),
+ ModuleMacros(Info.ActiveModuleMacros) {}
/// Determine whether there is a definition of this macro.
explicit operator bool() const {
diff --git a/clang/include/clang/Lex/Preprocessor.h b/clang/include/clang/Lex/Preprocessor.h
index c0c94b7..eb9e46e 100644
--- a/clang/include/clang/Lex/Preprocessor.h
+++ b/clang/include/clang/Lex/Preprocessor.h
@@ -874,7 +874,7 @@
SmallVector<MacroExpandsInfo, 2> DelayedMacroExpandsCallbacks;
/// Information about a name that has been used to define a module macro.
- struct ModuleMacroInfo {
+ struct FullModuleMacroInfo {
/// The most recent macro directive for this identifier.
MacroDirective *MD;
@@ -891,15 +891,15 @@
/// The module macros that are overridden by this macro.
llvm::TinyPtrVector<ModuleMacro *> OverriddenMacros;
- ModuleMacroInfo(MacroDirective *MD) : MD(MD) {}
+ FullModuleMacroInfo(MacroDirective *MD) : MD(MD) {}
};
/// The state of a macro for an identifier.
class MacroState {
- mutable llvm::PointerUnion<MacroDirective *, ModuleMacroInfo *> State;
+ mutable llvm::PointerUnion<MacroDirective *, FullModuleMacroInfo *> State;
- ModuleMacroInfo *getModuleInfo(Preprocessor &PP,
- const IdentifierInfo *II) const {
+ FullModuleMacroInfo *getFullModuleInfo(Preprocessor &PP,
+ const IdentifierInfo *II) const {
if (II->isOutOfDate())
PP.updateOutOfDateIdentifier(*II);
// FIXME: Find a spare bit on IdentifierInfo and store a
@@ -910,10 +910,10 @@
!PP.CurSubmoduleState->VisibleModules.getGeneration())
return nullptr;
- auto *Info = dyn_cast_if_present<ModuleMacroInfo *>(State);
+ auto *Info = dyn_cast_if_present<FullModuleMacroInfo *>(State);
if (!Info) {
Info = new (PP.getPreprocessorAllocator())
- ModuleMacroInfo(cast<MacroDirective *>(State));
+ FullModuleMacroInfo(cast<MacroDirective *>(State));
State = Info;
}
@@ -939,32 +939,27 @@
}
~MacroState() {
- if (auto *Info = dyn_cast_if_present<ModuleMacroInfo *>(State))
- Info->~ModuleMacroInfo();
+ if (auto *Info = dyn_cast_if_present<FullModuleMacroInfo *>(State))
+ Info->~FullModuleMacroInfo();
}
MacroDirective *getLatest() const {
- if (auto *Info = dyn_cast_if_present<ModuleMacroInfo *>(State))
+ if (auto *Info = dyn_cast_if_present<FullModuleMacroInfo *>(State))
return Info->MD;
return cast<MacroDirective *>(State);
}
void setLatest(MacroDirective *MD) {
- if (auto *Info = dyn_cast_if_present<ModuleMacroInfo *>(State))
+ if (auto *Info = dyn_cast_if_present<FullModuleMacroInfo *>(State))
Info->MD = MD;
else
State = MD;
}
- bool isAmbiguous(Preprocessor &PP, const IdentifierInfo *II) const {
- auto *Info = getModuleInfo(PP, II);
- return Info ? Info->IsAmbiguous : false;
- }
-
- ArrayRef<ModuleMacro *>
- getActiveModuleMacros(Preprocessor &PP, const IdentifierInfo *II) const {
- if (auto *Info = getModuleInfo(PP, II))
- return Info->ActiveModuleMacros;
+ ModuleMacroInfo getModuleInfo(Preprocessor &PP,
+ const IdentifierInfo *II) const {
+ if (auto *Info = getFullModuleInfo(PP, II))
+ return ModuleMacroInfo{Info->ActiveModuleMacros, Info->IsAmbiguous};
return {};
}
@@ -977,7 +972,7 @@
}
void overrideActiveModuleMacros(Preprocessor &PP, IdentifierInfo *II) {
- if (auto *Info = getModuleInfo(PP, II)) {
+ if (auto *Info = getFullModuleInfo(PP, II)) {
Info->OverriddenMacros.insert(Info->OverriddenMacros.end(),
Info->ActiveModuleMacros.begin(),
Info->ActiveModuleMacros.end());
@@ -987,19 +982,19 @@
}
ArrayRef<ModuleMacro*> getOverriddenMacros() const {
- if (auto *Info = dyn_cast_if_present<ModuleMacroInfo *>(State))
+ if (auto *Info = dyn_cast_if_present<FullModuleMacroInfo *>(State))
return Info->OverriddenMacros;
return {};
}
void setOverriddenMacros(Preprocessor &PP,
ArrayRef<ModuleMacro *> Overrides) {
- auto *Info = dyn_cast_if_present<ModuleMacroInfo *>(State);
+ auto *Info = dyn_cast_if_present<FullModuleMacroInfo *>(State);
if (!Info) {
if (Overrides.empty())
return;
Info = new (PP.getPreprocessorAllocator())
- ModuleMacroInfo(cast<MacroDirective *>(State));
+ FullModuleMacroInfo(cast<MacroDirective *>(State));
State = Info;
}
Info->OverriddenMacros.clear();
@@ -1423,8 +1418,7 @@
while (isa_and_nonnull<VisibilityMacroDirective>(MD))
MD = MD->getPrevious();
return MacroDefinition(dyn_cast_or_null<DefMacroDirective>(MD),
- S.getActiveModuleMacros(*this, II),
- S.isAmbiguous(*this, II));
+ S.getModuleInfo(*this, II));
}
MacroDefinition getMacroDefinitionAtLoc(const IdentifierInfo *II,
@@ -1437,9 +1431,7 @@
if (auto *MD = S.getLatest())
DI = MD->findDirectiveAtLoc(Loc, getSourceManager());
// FIXME: Compute the set of active module macros at the specified location.
- return MacroDefinition(DI.getDirective(),
- S.getActiveModuleMacros(*this, II),
- S.isAmbiguous(*this, II));
+ return MacroDefinition(DI.getDirective(), S.getModuleInfo(*this, II));
}
/// Given an identifier, return its latest non-imported MacroDirective
@@ -2619,7 +2611,8 @@
/// Update the set of active module macros and ambiguity flag for a module
/// macro name.
- void updateModuleMacroInfo(const IdentifierInfo *II, ModuleMacroInfo &Info);
+ void updateModuleMacroInfo(const IdentifierInfo *II,
+ FullModuleMacroInfo &Info);
DefMacroDirective *AllocateDefMacroDirective(MacroInfo *MI,
SourceLocation Loc);
diff --git a/clang/lib/Lex/PPMacroExpansion.cpp b/clang/lib/Lex/PPMacroExpansion.cpp
index 20b8fe5..5fd3512d 100644
--- a/clang/lib/Lex/PPMacroExpansion.cpp
+++ b/clang/lib/Lex/PPMacroExpansion.cpp
@@ -176,7 +176,7 @@
}
void Preprocessor::updateModuleMacroInfo(const IdentifierInfo *II,
- ModuleMacroInfo &Info) {
+ FullModuleMacroInfo &Info) {
assert(Info.ActiveModuleMacrosGeneration !=
CurSubmoduleState->VisibleModules.getGeneration() &&
"don't need to update this macro name info");
@@ -264,7 +264,9 @@
State = &Pos->second;
llvm::errs() << "MacroState " << State << " " << II->getNameStart();
- if (State && State->isAmbiguous(*this, II))
+ const auto ModuleInfo =
+ State ? State->getModuleInfo(*this, II) : ModuleMacroInfo{};
+ if (ModuleInfo.IsAmbiguous)
llvm::errs() << " ambiguous";
if (State && !State->getOverriddenMacros().empty()) {
llvm::errs() << " overrides";
@@ -281,10 +283,8 @@
}
// Dump module macros.
- llvm::DenseSet<ModuleMacro*> Active;
- for (auto *MM : State ? State->getActiveModuleMacros(*this, II)
- : ArrayRef<ModuleMacro *>())
- Active.insert(MM);
+ llvm::DenseSet<ModuleMacro *> Active(llvm::from_range,
+ ModuleInfo.ActiveModuleMacros);
llvm::DenseSet<ModuleMacro*> Visited;
llvm::SmallVector<ModuleMacro *, 16> Worklist(Leaf);
while (!Worklist.empty()) {
