Skip to content

Commit 2e40295

Browse files
committed
NFC: Extract simple_display for FileUnit
1 parent ae664fb commit 2e40295

File tree

3 files changed

+24
-13
lines changed

3 files changed

+24
-13
lines changed

include/swift/AST/FileUnit.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -369,6 +369,7 @@ class LoadedFile : public FileUnit {
369369
}
370370
};
371371

372+
void simple_display(llvm::raw_ostream &out, const FileUnit *file);
372373

373374
inline FileUnit &ModuleDecl::getMainFile(FileUnitKind expectedKind) const {
374375
assert(expectedKind != FileUnitKind::Source &&

lib/AST/Module.cpp

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1895,6 +1895,28 @@ void FileUnit::getTopLevelDeclsWhereAttributesMatch(
18951895
Results.erase(newEnd, Results.end());
18961896
}
18971897

1898+
void swift::simple_display(llvm::raw_ostream &out, const FileUnit *file) {
1899+
if (!file) {
1900+
out << "(null)";
1901+
return;
1902+
}
1903+
1904+
switch (file->getKind()) {
1905+
case FileUnitKind::Source:
1906+
out << '\"' << cast<SourceFile>(file)->getFilename() << '\"';
1907+
return;
1908+
case FileUnitKind::Builtin:
1909+
out << "(Builtin)";
1910+
return;
1911+
case FileUnitKind::DWARFModule:
1912+
case FileUnitKind::ClangModule:
1913+
case FileUnitKind::SerializedAST:
1914+
out << '\"' << cast<LoadedFile>(file)->getFilename() << '\"';
1915+
return;
1916+
}
1917+
llvm_unreachable("Unhandled case in switch");
1918+
}
1919+
18981920
StringRef LoadedFile::getFilename() const {
18991921
return "";
19001922
}

lib/SILGen/SILGenRequests.cpp

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -38,19 +38,7 @@ void swift::simple_display(llvm::raw_ostream &out,
3838
} else {
3939
assert(unit);
4040
out << "SIL Generation for file ";
41-
switch (unit->getKind()) {
42-
case FileUnitKind::Source:
43-
out << '\"' << cast<SourceFile>(unit)->getFilename() << '\"';
44-
break;
45-
case FileUnitKind::Builtin:
46-
out << "(Builtin)";
47-
break;
48-
case FileUnitKind::DWARFModule:
49-
case FileUnitKind::ClangModule:
50-
case FileUnitKind::SerializedAST:
51-
out << '\"' << cast<LoadedFile>(unit)->getFilename() << '\"';
52-
break;
53-
}
41+
simple_display(out, unit);
5442
}
5543
}
5644

0 commit comments

Comments
 (0)