Merge pull request #66532 from hborla/suppress-expansion-in-macro-argument

[Macros] Use source locations to determine whether to suppress macro expansions.
This commit is contained in:
Holly Borla
2023-06-12 11:18:25 -07:00
committed by GitHub
66 changed files with 513 additions and 250 deletions

View File

@@ -1926,7 +1926,7 @@ ModuleFile::resolveCrossReference(ModuleID MID, uint32_t pathLen) {
getIdentifier(privateDiscriminator));
} else {
baseModule->lookupQualified(baseModule, DeclNameRef(name),
NL_QualifiedDefault,
SourceLoc(), NL_QualifiedDefault,
values);
}
filterValues(filterTy, nullptr, nullptr, isType, inProtocolExt,
@@ -2113,7 +2113,7 @@ ModuleFile::resolveCrossReference(ModuleID MID, uint32_t pathLen) {
getIdentifier(privateDiscriminator));
} else {
otherModule->lookupQualified(otherModule, DeclNameRef(name),
NL_QualifiedDefault,
SourceLoc(), NL_QualifiedDefault,
values);
}