Skip to content

[NFC] Add names of deserialized decls to pretty stack traces #30759

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 2, 2020
Merged

[NFC] Add names of deserialized decls to pretty stack traces #30759

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 37 additions & 6 deletions lib/Serialization/Deserialization.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,17 @@ namespace {
}
};

class PrettySupplementalDeclNameTrace : public llvm::PrettyStackTraceEntry {
DeclName name;
public:
PrettySupplementalDeclNameTrace(DeclName name)
: name(name) { }

void print(raw_ostream &os) const override {
os << " ...decl is named '" << name << "'\n";
}
};

class PrettyXRefTrace :
public llvm::PrettyStackTraceEntry,
public XRefTracePath {
Expand Down Expand Up @@ -2375,6 +2386,7 @@ class DeclDeserializer {
rawAccessLevel, dependencyIDs);

Identifier name = MF.getIdentifier(nameID);
PrettySupplementalDeclNameTrace trace(name);

for (TypeID dependencyID : dependencyIDs) {
auto dependency = MF.getTypeChecked(dependencyID);
Expand Down Expand Up @@ -2505,6 +2517,7 @@ class DeclDeserializer {
rawInheritedAndDependencyIDs);

Identifier name = MF.getIdentifier(nameID);
PrettySupplementalDeclNameTrace trace(name);

for (TypeID dependencyID :
rawInheritedAndDependencyIDs.slice(numInheritedTypes)) {
Expand Down Expand Up @@ -2582,6 +2595,7 @@ class DeclDeserializer {
for (auto argNameID : argNameAndDependencyIDs.slice(0, numArgNames))
argNames.push_back(MF.getIdentifier(argNameID));
DeclName name(ctx, DeclBaseName::createConstructor(), argNames);
PrettySupplementalDeclNameTrace trace(name);

Optional<swift::CtorInitializerKind> initKind =
getActualCtorInitializerKind(storedInitKind);
Expand Down Expand Up @@ -2712,6 +2726,7 @@ class DeclDeserializer {
arrayFieldIDs);

Identifier name = MF.getIdentifier(nameID);
PrettySupplementalDeclNameTrace trace(name);

auto getErrorFlags = [&]() {
// Stored properties in classes still impact class object layout because
Expand Down Expand Up @@ -2879,6 +2894,10 @@ class DeclDeserializer {
interfaceTypeID, isIUO, isVariadic,
isAutoClosure, rawDefaultArg);

auto argName = MF.getIdentifier(argNameID);
auto paramName = MF.getIdentifier(paramNameID);
PrettySupplementalDeclNameTrace trace(paramName);

auto DC = MF.getDeclContext(contextID);
if (declOrOffset.isComplete())
return declOrOffset;
Expand All @@ -2888,10 +2907,8 @@ class DeclDeserializer {
if (!specifier)
MF.fatal();

auto param = MF.createDecl<ParamDecl>(SourceLoc(), SourceLoc(),
MF.getIdentifier(argNameID),
SourceLoc(),
MF.getIdentifier(paramNameID), DC);
auto param = MF.createDecl<ParamDecl>(SourceLoc(), SourceLoc(), argName,
SourceLoc(), paramName, DC);
param->setSpecifier(*specifier);

declOrOffset = param;
Expand Down Expand Up @@ -3023,6 +3040,7 @@ class DeclDeserializer {
dependencyIDs = nameAndDependencyIDs.drop_front();
}
}
PrettySupplementalDeclNameTrace trace(name);

Expected<Decl *> overriddenOrError = MF.getDeclChecked(overriddenID);
Decl *overridden;
Expand Down Expand Up @@ -3281,6 +3299,7 @@ class DeclDeserializer {
rawInheritedAndDependencyIDs);

Identifier name = MF.getIdentifier(nameID);
PrettySupplementalDeclNameTrace trace(name);

for (TypeID dependencyID :
rawInheritedAndDependencyIDs.slice(numInheritedTypes)) {
Expand Down Expand Up @@ -3340,6 +3359,10 @@ class DeclDeserializer {

OperatorLayout::readRecord(scratch, nameID, contextID,
designatedNominalTypeDeclIDs);

Identifier name = MF.getIdentifier(nameID);
PrettySupplementalDeclNameTrace trace(name);

auto DC = MF.getDeclContext(contextID);

SmallVector<NominalTypeDecl *, 1> designatedNominalTypes;
Expand All @@ -3351,7 +3374,7 @@ class DeclDeserializer {
}

auto result = MF.createDecl<OperatorDecl>(
DC, SourceLoc(), MF.getIdentifier(nameID), SourceLoc(),
DC, SourceLoc(), name, SourceLoc(),
ctx.AllocateCopy(designatedNominalTypes));

declOrOffset = result;
Expand Down Expand Up @@ -3380,6 +3403,8 @@ class DeclDeserializer {
decls_block::InfixOperatorLayout::readRecord(scratch, nameID, contextID,
precedenceGroupID,
designatedNominalTypeDeclIDs);
Identifier name = MF.getIdentifier(nameID);
PrettySupplementalDeclNameTrace trace(name);

Expected<Decl *> precedenceGroup = MF.getDeclChecked(precedenceGroupID);
if (!precedenceGroup)
Expand All @@ -3396,7 +3421,7 @@ class DeclDeserializer {
}

auto result = MF.createDecl<InfixOperatorDecl>(
DC, SourceLoc(), MF.getIdentifier(nameID), SourceLoc(), SourceLoc(),
DC, SourceLoc(), name, SourceLoc(), SourceLoc(),
ArrayRef<Identifier>{}, ArrayRef<SourceLoc>{});
result->setDesignatedNominalTypes(ctx.AllocateCopy(designatedNominalTypes));
ctx.evaluator.cacheOutput(
Expand Down Expand Up @@ -3487,6 +3512,7 @@ class DeclDeserializer {
rawInheritedAndDependencyIDs);

Identifier name = MF.getIdentifier(nameID);
PrettySupplementalDeclNameTrace trace(name);

for (TypeID dependencyID :
rawInheritedAndDependencyIDs.slice(numInheritedTypes)) {
Expand Down Expand Up @@ -3560,6 +3586,8 @@ class DeclDeserializer {
return declOrOffset;

Identifier name = MF.getIdentifier(nameID);
PrettySupplementalDeclNameTrace trace(name);

for (TypeID dependencyID :
rawInheritedAndDependencyIDs.slice(numInherited)) {
auto dependency = MF.getTypeChecked(dependencyID);
Expand Down Expand Up @@ -3638,6 +3666,7 @@ class DeclDeserializer {
argNames.push_back(MF.getIdentifier(argNameID));
DeclName compoundName(ctx, baseName, argNames);
DeclName name = argNames.empty() ? baseName : compoundName;
PrettySupplementalDeclNameTrace trace(name);

for (TypeID dependencyID : argNameAndDependencyIDs.slice(numArgNames)) {
auto dependency = MF.getTypeChecked(dependencyID);
Expand Down Expand Up @@ -3730,6 +3759,8 @@ class DeclDeserializer {
for (auto argNameID : argNameAndDependencyIDs.slice(0, numArgNames))
argNames.push_back(MF.getIdentifier(argNameID));
DeclName name(ctx, DeclBaseName::createSubscript(), argNames);
PrettySupplementalDeclNameTrace trace(name);

argNameAndDependencyIDs = argNameAndDependencyIDs.slice(numArgNames);

// Exctract the accessor IDs.
Expand Down