Skip to content

Commit fb0c705

Browse files
authored
[clang] NFCI: Make ASTContext optional in the AST text dumper again (#94522)
1 parent 11c0832 commit fb0c705

File tree

2 files changed

+13
-9
lines changed

2 files changed

+13
-9
lines changed

clang/lib/AST/TextNodeDumper.cpp

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -958,6 +958,9 @@ void TextNodeDumper::dumpTemplateArgument(const TemplateArgument &TA) {
958958
}
959959
OS << " '" << Str << "'";
960960

961+
if (!Context)
962+
return;
963+
961964
if (TemplateArgument CanonTA = Context->getCanonicalTemplateArgument(TA);
962965
!CanonTA.structurallyEquals(TA)) {
963966
llvm::SmallString<128> CanonStr;
@@ -1139,15 +1142,17 @@ void TextNodeDumper::dumpTemplateName(TemplateName TN, StringRef Label) {
11391142
}
11401143
OS << " '" << Str << "'";
11411144

1142-
if (TemplateName CanonTN = Context->getCanonicalTemplateName(TN);
1143-
CanonTN != TN) {
1144-
llvm::SmallString<128> CanonStr;
1145-
{
1146-
llvm::raw_svector_ostream SS(CanonStr);
1147-
CanonTN.print(SS, PrintPolicy);
1145+
if (Context) {
1146+
if (TemplateName CanonTN = Context->getCanonicalTemplateName(TN);
1147+
CanonTN != TN) {
1148+
llvm::SmallString<128> CanonStr;
1149+
{
1150+
llvm::raw_svector_ostream SS(CanonStr);
1151+
CanonTN.print(SS, PrintPolicy);
1152+
}
1153+
if (CanonStr != Str)
1154+
OS << ":'" << CanonStr << "'";
11481155
}
1149-
if (CanonStr != Str)
1150-
OS << ":'" << CanonStr << "'";
11511156
}
11521157
}
11531158
dumpBareTemplateName(TN);

clang/lib/AST/Type.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4481,7 +4481,6 @@ static CachedProperties computeCachedProperties(const Type *T) {
44814481
#define NON_CANONICAL_UNLESS_DEPENDENT_TYPE(Class,Base) case Type::Class:
44824482
#include "clang/AST/TypeNodes.inc"
44834483
// Treat instantiation-dependent types as external.
4484-
if (!T->isInstantiationDependentType()) T->dump();
44854484
assert(T->isInstantiationDependentType());
44864485
return CachedProperties(Linkage::External, false);
44874486

0 commit comments

Comments
 (0)