averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

[Macros] Improve parsing, representation, and serialization of role attributes

Browse Source 
Parse compound and special names in the macro role attributes
(`@freestanding` and `@attached`). This allows both compound names and
initializers, e.g., `init(coding:)`.

Fixes rdar://107967344.
This commit is contained in:
Doug Gregor
2023-04-20 08:23:26 -07:00
parent 1c3667b52a
commit ae4a5ded8f
15 changed files with 254 additions and 252 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
lib/Serialization/Deserialization.cpp
View File

@@ -5599,16 +5599,33 @@ llvm::Error DeclDeserializer::deserializeDeclCommon() {
readRecord(scratch, isImplicit, rawMacroSyntax, rawMacroRole,
numNames, introducedDeclNames);
auto role = *getActualMacroRole(rawMacroRole);
if (introducedDeclNames.size() != numNames * 2)
return MF.diagnoseFatal();
SmallVector<MacroIntroducedDeclName, 1> names;
for (unsigned i = 0; i < introducedDeclNames.size(); i += 2) {
unsigned nameIdx = 0;
while (nameIdx < introducedDeclNames.size()) {
auto kind = getActualMacroIntroducedDeclNameKind(
(uint8_t)introducedDeclNames[i]);
auto identifier =
MF.getIdentifier(IdentifierID(introducedDeclNames[i + 1]));
names.push_back(MacroIntroducedDeclName(*kind, identifier));
(uint8_t)introducedDeclNames[nameIdx++]);
auto baseName =
MF.getDeclBaseName(IdentifierID(introducedDeclNames[nameIdx++]));
unsigned numArgs = introducedDeclNames[nameIdx++];
if (numArgs == 0) {
names.push_back(MacroIntroducedDeclName(*kind, baseName));
continue;
}
SmallVector<Identifier, 2> argLabels;
for (unsigned i : range(0, numArgs - 1)) {
(void)i;
argLabels.push_back(
MF.getDeclBaseName(
IdentifierID(introducedDeclNames[nameIdx++]))
.getIdentifier());
}
DeclName name(ctx, baseName, argLabels);
names.push_back(MacroIntroducedDeclName(*kind, name));
}
Attr = MacroRoleAttr::create(
ctx, SourceLoc(), SourceRange(),
static_cast<MacroSyntax>(rawMacroSyntax), SourceLoc(), role, names,