Merge pull request #66967 from hborla/extension-macro

[Macros] Generalize `conformance` macros as `extension` macros
This commit is contained in:
Holly Borla
2023-06-29 08:57:04 -07:00
committed by GitHub
53 changed files with 651 additions and 59 deletions

View File

@@ -848,7 +848,8 @@ ModuleDecl::getOriginalLocation(SourceLoc loc) const {
case GeneratedSourceInfo::MemberAttributeMacroExpansion:
case GeneratedSourceInfo::MemberMacroExpansion:
case GeneratedSourceInfo::PeerMacroExpansion:
case GeneratedSourceInfo::ConformanceMacroExpansion: {
case GeneratedSourceInfo::ConformanceMacroExpansion:
case GeneratedSourceInfo::ExtensionMacroExpansion: {
// Location was within a macro expansion, return the expansion site, not
// the insertion location.
if (info->attachedMacroCustomAttr) {
@@ -1158,6 +1159,9 @@ llvm::Optional<MacroRole> SourceFile::getFulfilledMacroRole() const {
case GeneratedSourceInfo::ConformanceMacroExpansion:
return MacroRole::Conformance;
case GeneratedSourceInfo::ExtensionMacroExpansion:
return MacroRole::Extension;
case GeneratedSourceInfo::ReplacedFunctionBody:
case GeneratedSourceInfo::PrettyPrinted:
return llvm::None;