Skip to content

[ASTDumper] Remove hasNonStandardOutput #81351

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
May 8, 2025
Merged

[ASTDumper] Remove hasNonStandardOutput #81351

Show file tree
Hide file tree
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
30 changes: 6 additions & 24 deletions lib/AST/ASTDumper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -805,8 +805,6 @@ namespace {
virtual void printSourceRange(const SourceRange R, const ASTContext *Ctx,
Label label) = 0;

virtual bool hasNonStandardOutput() const = 0;

/// Indicates whether the output format is meant to be parsable. Parsable
/// output should use structure rather than stringification to convey
/// detailed information, and generally provides more information than the
Expand Down Expand Up @@ -900,10 +898,6 @@ namespace {
}, label, RangeColor);
}

bool hasNonStandardOutput() const override {
return &OS != &llvm::errs() && &OS != &llvm::dbgs();
}

bool isParsable() const override { return false; }
};

Expand Down Expand Up @@ -1014,8 +1008,6 @@ namespace {
OS.attributeEnd();
}

bool hasNonStandardOutput() const override { return true; }

bool isParsable() const override { return true; }
};

Expand Down Expand Up @@ -1046,10 +1038,6 @@ namespace {
GetTypeOfExpr(getTypeOfExpr), GetTypeOfTypeRepr(getTypeOfTypeRepr),
GetTypeOfKeyPathComponent(getTypeOfKeyPathComponent) {}

bool hasNonStandardOutput() {
return Writer.hasNonStandardOutput();
}

bool isTypeChecked() const {
return MemberLoading == ASTDumpMemberLoading::TypeChecked;
}
Expand Down Expand Up @@ -3015,11 +3003,6 @@ void swift::printContext(raw_ostream &os, DeclContext *dc) {
<< "autoclosure discriminator=";
}

// If we aren't printing to standard error or the debugger output stream,
// this client expects to see the computed discriminator. Compute it now.
if (&os != &llvm::errs() && &os != &llvm::dbgs())
(void)ACE->getDiscriminator();

PrintWithColorRAII(os, DiscriminatorColor) << ACE->getRawDiscriminator();
break;
}
Expand Down Expand Up @@ -4094,16 +4077,15 @@ class PrintExpr : public ExprVisitor<PrintExpr, void, Label>,
printFoot();
}

void printClosure(AbstractClosureExpr *E, char const *name,
Label label) {
void printClosure(AbstractClosureExpr *E, char const *name, Label label) {
printCommon(E, name, label);

// If we aren't printing to standard error or the debugger output stream,
// this client expects to see the computed discriminator. Compute it now.
if (hasNonStandardOutput())
(void)E->getDiscriminator();
// If we're dumping the type-checked AST, compute the discriminator if
// needed. Otherwise, print the cached discriminator.
auto discriminator = isTypeChecked() ? E->getDiscriminator()
: E->getRawDiscriminator();

printField(E->getRawDiscriminator(), Label::always("discriminator"),
printField(discriminator, Label::always("discriminator"),
DiscriminatorColor);
printIsolation(E->getActorIsolation());

Expand Down
10 changes: 5 additions & 5 deletions test/IDE/range_info_basics.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,7 @@ func testPropertyWrapper() {
// CHECK13-NEXT: b = b.bigEndian.bigEndian.byteSwapped
// CHECK13-NEXT: print(b + c)</Content>
// CHECK13-NEXT: <Type>Void</Type>
// CHECK13-NEXT: <Context>swift_ide_test.(file).foo6().explicit closure discriminator=0</Context>
// CHECK13-NEXT: <Context>swift_ide_test.(file).foo6().explicit closure discriminator={{[0-9]+}}</Context>
// CHECK13-NEXT: <Declared>a</Declared><OutscopeReference>false</OutscopeReference>
// CHECK13-NEXT: <Declared>b</Declared><OutscopeReference>false</OutscopeReference>
// CHECK13-NEXT: <Declared>c</Declared><OutscopeReference>false</OutscopeReference>
Expand All @@ -396,7 +396,7 @@ func testPropertyWrapper() {
// CHECK14-NEXT: return 1
// CHECK14-NEXT: }()</Content>
// CHECK14-NEXT: <Type>Int</Type>
// CHECK14-NEXT: <Context>swift_ide_test.(file).foo6().explicit closure discriminator=0</Context>
// CHECK14-NEXT: <Context>swift_ide_test.(file).foo6().explicit closure discriminator={{[0-9]+}}</Context>
// CHECK14-NEXT: <Declared>a</Declared><OutscopeReference>false</OutscopeReference>
// CHECK14-NEXT: <Declared>b</Declared><OutscopeReference>false</OutscopeReference>
// CHECK14-NEXT: <Declared>c</Declared><OutscopeReference>false</OutscopeReference>
Expand All @@ -418,7 +418,7 @@ func testPropertyWrapper() {
// CHECK15-NEXT: let c = a.byteSwapped
// CHECK15-NEXT: b = b.bigEndian.bigEndian.byteSwapped</Content>
// CHECK15-NEXT: <Type>Void</Type>
// CHECK15-NEXT: <Context>swift_ide_test.(file).foo6().explicit closure discriminator=0.explicit closure discriminator=0</Context>
// CHECK15-NEXT: <Context>swift_ide_test.(file).foo6().explicit closure discriminator={{[0-9]+}}.explicit closure discriminator={{[0-9]+}}</Context>
// CHECK15-NEXT: <Declared>a</Declared><OutscopeReference>false</OutscopeReference>
// CHECK15-NEXT: <Declared>b</Declared><OutscopeReference>true</OutscopeReference>
// CHECK15-NEXT: <Declared>c</Declared><OutscopeReference>true</OutscopeReference>
Expand All @@ -435,7 +435,7 @@ func testPropertyWrapper() {
// CHECK16-NEXT: print(b + c)
// CHECK16-NEXT: return 1</Content>
// CHECK16-NEXT: <Type>Int</Type>
// CHECK16-NEXT: <Context>swift_ide_test.(file).foo6().explicit closure discriminator=0.explicit closure discriminator=0</Context>
// CHECK16-NEXT: <Context>swift_ide_test.(file).foo6().explicit closure discriminator={{[0-9]+}}.explicit closure discriminator={{[0-9]+}}</Context>
// CHECK16-NEXT: <Declared>a</Declared><OutscopeReference>false</OutscopeReference>
// CHECK16-NEXT: <Declared>b</Declared><OutscopeReference>false</OutscopeReference>
// CHECK16-NEXT: <Declared>c</Declared><OutscopeReference>false</OutscopeReference>
Expand All @@ -448,7 +448,7 @@ func testPropertyWrapper() {
// CHECK17: <Kind>SingleExpression</Kind>
// CHECK17-NEXT: <Content>print(b + c)</Content>
// CHECK17-NEXT: <Type>()</Type>
// CHECK17-NEXT: <Context>swift_ide_test.(file).foo6().explicit closure discriminator=0.explicit closure discriminator=0</Context>
// CHECK17-NEXT: <Context>swift_ide_test.(file).foo6().explicit closure discriminator={{[0-9]+}}.explicit closure discriminator={{[0-9]+}}</Context>
// CHECK17-NEXT: <Referenced>b</Referenced><Type>Int</Type>
// CHECK17-NEXT: <Referenced>c</Referenced><Type>Int</Type>
// CHECK17-NEXT: <ASTNodes>1</ASTNodes>
Expand Down