Revert "[clang][NFC] Store a pointer to the ASTContext in ASTDumper and TextNodeDumper"
This reverts commit aa7fd905e4e1bc510448431da9310e8cf5197523.
I missed some dump() functions.
diff --git a/clang/lib/AST/APValue.cpp b/clang/lib/AST/APValue.cpp
index 4179162..50f8d05d 100644
--- a/clang/lib/AST/APValue.cpp
+++ b/clang/lib/AST/APValue.cpp
@@ -378,6 +378,11 @@
memcpy(RHS.Data.buffer, TmpData, DataSize);
}
+LLVM_DUMP_METHOD void APValue::dump() const {
+ dump(llvm::errs());
+ llvm::errs() << '\n';
+}
+
static double GetApproxValue(const llvm::APFloat &F) {
llvm::APFloat V = F;
bool ignored;
@@ -386,13 +391,7 @@
return V.convertToDouble();
}
-LLVM_DUMP_METHOD void APValue::dump() const {
- dump(llvm::errs(), /*Context=*/nullptr);
- llvm::errs() << '\n';
-}
-
-LLVM_DUMP_METHOD void APValue::dump(raw_ostream &OS,
- const ASTContext *Context) const {
+void APValue::dump(raw_ostream &OS) const {
switch (getKind()) {
case None:
OS << "None";
@@ -411,10 +410,10 @@
return;
case Vector:
OS << "Vector: ";
- getVectorElt(0).dump(OS, Context);
+ getVectorElt(0).dump(OS);
for (unsigned i = 1; i != getVectorLength(); ++i) {
OS << ", ";
- getVectorElt(i).dump(OS, Context);
+ getVectorElt(i).dump(OS);
}
return;
case ComplexInt:
@@ -430,37 +429,36 @@
case Array:
OS << "Array: ";
for (unsigned I = 0, N = getArrayInitializedElts(); I != N; ++I) {
- getArrayInitializedElt(I).dump(OS, Context);
- if (I != getArraySize() - 1)
- OS << ", ";
+ getArrayInitializedElt(I).dump(OS);
+ if (I != getArraySize() - 1) OS << ", ";
}
if (hasArrayFiller()) {
OS << getArraySize() - getArrayInitializedElts() << " x ";
- getArrayFiller().dump(OS, Context);
+ getArrayFiller().dump(OS);
}
return;
case Struct:
OS << "Struct ";
if (unsigned N = getStructNumBases()) {
OS << " bases: ";
- getStructBase(0).dump(OS, Context);
+ getStructBase(0).dump(OS);
for (unsigned I = 1; I != N; ++I) {
OS << ", ";
- getStructBase(I).dump(OS, Context);
+ getStructBase(I).dump(OS);
}
}
if (unsigned N = getStructNumFields()) {
OS << " fields: ";
- getStructField(0).dump(OS, Context);
+ getStructField(0).dump(OS);
for (unsigned I = 1; I != N; ++I) {
OS << ", ";
- getStructField(I).dump(OS, Context);
+ getStructField(I).dump(OS);
}
}
return;
case Union:
OS << "Union: ";
- getUnionValue().dump(OS, Context);
+ getUnionValue().dump(OS);
return;
case MemberPointer:
OS << "MemberPointer: <todo>";
diff --git a/clang/lib/AST/ASTDumper.cpp b/clang/lib/AST/ASTDumper.cpp
index 08a6d0c..d7a25cc 100644
--- a/clang/lib/AST/ASTDumper.cpp
+++ b/clang/lib/AST/ASTDumper.cpp
@@ -159,22 +159,17 @@
dump();
}
-LLVM_DUMP_METHOD void QualType::dump() const {
- ASTDumper Dumper(llvm::errs(), /*ShowColors=*/false);
+LLVM_DUMP_METHOD void QualType::dump() const { dump(llvm::errs()); }
+
+LLVM_DUMP_METHOD void QualType::dump(llvm::raw_ostream &OS) const {
+ ASTDumper Dumper(OS, nullptr, nullptr);
Dumper.Visit(*this);
}
-LLVM_DUMP_METHOD void QualType::dump(llvm::raw_ostream &OS,
- const ASTContext &Context) const {
- ASTDumper Dumper(OS, Context, Context.getDiagnostics().getShowColors());
- Dumper.Visit(*this);
-}
+LLVM_DUMP_METHOD void Type::dump() const { dump(llvm::errs()); }
-LLVM_DUMP_METHOD void Type::dump() const { QualType(this, 0).dump(); }
-
-LLVM_DUMP_METHOD void Type::dump(llvm::raw_ostream &OS,
- const ASTContext &Context) const {
- QualType(this, 0).dump(OS, Context);
+LLVM_DUMP_METHOD void Type::dump(llvm::raw_ostream &OS) const {
+ QualType(this, 0).dump(OS);
}
//===----------------------------------------------------------------------===//
@@ -194,7 +189,8 @@
(void)Deserialize; // FIXME?
P.Visit(this);
} else {
- ASTDumper P(OS, Ctx, Ctx.getDiagnostics().getShowColors());
+ ASTDumper P(OS, &Ctx.getCommentCommandTraits(), &SM,
+ SM.getDiagnostics().getShowColors(), Ctx.getPrintingPolicy());
P.setDeserialize(Deserialize);
P.Visit(this);
}
@@ -202,7 +198,9 @@
LLVM_DUMP_METHOD void Decl::dumpColor() const {
const ASTContext &Ctx = getASTContext();
- ASTDumper P(llvm::errs(), Ctx, /*ShowColors=*/true);
+ ASTDumper P(llvm::errs(), &Ctx.getCommentCommandTraits(),
+ &Ctx.getSourceManager(), /*ShowColors*/ true,
+ Ctx.getPrintingPolicy());
P.Visit(this);
}
@@ -216,8 +214,10 @@
const DeclContext *DC = this;
while (!DC->isTranslationUnit())
DC = DC->getParent();
- const ASTContext &Ctx = cast<TranslationUnitDecl>(DC)->getASTContext();
- ASTDumper P(OS, Ctx, Ctx.getDiagnostics().getShowColors());
+ ASTContext &Ctx = cast<TranslationUnitDecl>(DC)->getASTContext();
+ const SourceManager &SM = Ctx.getSourceManager();
+ ASTDumper P(OS, &Ctx.getCommentCommandTraits(), &Ctx.getSourceManager(),
+ SM.getDiagnostics().getShowColors(), Ctx.getPrintingPolicy());
P.setDeserialize(Deserialize);
P.dumpLookups(this, DumpDecls);
}
@@ -226,19 +226,27 @@
// Stmt method implementations
//===----------------------------------------------------------------------===//
-LLVM_DUMP_METHOD void Stmt::dump() const {
- ASTDumper P(llvm::errs(), /*ShowColors=*/false);
+LLVM_DUMP_METHOD void Stmt::dump(SourceManager &SM) const {
+ dump(llvm::errs(), SM);
+}
+
+LLVM_DUMP_METHOD void Stmt::dump(raw_ostream &OS, SourceManager &SM) const {
+ ASTDumper P(OS, nullptr, &SM);
P.Visit(this);
}
-LLVM_DUMP_METHOD void Stmt::dump(raw_ostream &OS,
- const ASTContext &Context) const {
- ASTDumper P(OS, Context, Context.getDiagnostics().getShowColors());
+LLVM_DUMP_METHOD void Stmt::dump(raw_ostream &OS) const {
+ ASTDumper P(OS, nullptr, nullptr);
+ P.Visit(this);
+}
+
+LLVM_DUMP_METHOD void Stmt::dump() const {
+ ASTDumper P(llvm::errs(), nullptr, nullptr);
P.Visit(this);
}
LLVM_DUMP_METHOD void Stmt::dumpColor() const {
- ASTDumper P(llvm::errs(), /*ShowColors=*/true);
+ ASTDumper P(llvm::errs(), nullptr, nullptr, /*ShowColors*/true);
P.Visit(this);
}
@@ -247,26 +255,27 @@
//===----------------------------------------------------------------------===//
LLVM_DUMP_METHOD void Comment::dump() const {
- const auto *FC = dyn_cast<FullComment>(this);
- if (!FC)
- return;
- ASTDumper Dumper(llvm::errs(), /*ShowColors=*/false);
- Dumper.Visit(FC, FC);
+ dump(llvm::errs(), nullptr, nullptr);
}
-LLVM_DUMP_METHOD void Comment::dump(raw_ostream &OS,
- const ASTContext &Context) const {
- const auto *FC = dyn_cast<FullComment>(this);
+LLVM_DUMP_METHOD void Comment::dump(const ASTContext &Context) const {
+ dump(llvm::errs(), &Context.getCommentCommandTraits(),
+ &Context.getSourceManager());
+}
+
+void Comment::dump(raw_ostream &OS, const CommandTraits *Traits,
+ const SourceManager *SM) const {
+ const FullComment *FC = dyn_cast<FullComment>(this);
if (!FC)
return;
- ASTDumper Dumper(OS, Context, Context.getDiagnostics().getShowColors());
- Dumper.Visit(FC, FC);
+ ASTDumper D(OS, Traits, SM);
+ D.Visit(FC, FC);
}
LLVM_DUMP_METHOD void Comment::dumpColor() const {
- const auto *FC = dyn_cast<FullComment>(this);
+ const FullComment *FC = dyn_cast<FullComment>(this);
if (!FC)
return;
- ASTDumper Dumper(llvm::errs(), /*ShowColors=*/true);
- Dumper.Visit(FC, FC);
+ ASTDumper D(llvm::errs(), nullptr, nullptr, /*ShowColors*/true);
+ D.Visit(FC, FC);
}
diff --git a/clang/lib/AST/ASTTypeTraits.cpp b/clang/lib/AST/ASTTypeTraits.cpp
index 34fc587..ccfc115 100644
--- a/clang/lib/AST/ASTTypeTraits.cpp
+++ b/clang/lib/AST/ASTTypeTraits.cpp
@@ -152,14 +152,13 @@
OS << "Unable to print values of type " << NodeKind.asStringRef() << "\n";
}
-void DynTypedNode::dump(llvm::raw_ostream &OS,
- const ASTContext &Context) const {
+void DynTypedNode::dump(llvm::raw_ostream &OS, SourceManager &SM) const {
if (const Decl *D = get<Decl>())
D->dump(OS);
else if (const Stmt *S = get<Stmt>())
- S->dump(OS, Context);
+ S->dump(OS, SM);
else if (const Type *T = get<Type>())
- T->dump(OS, Context);
+ T->dump(OS);
else
OS << "Unable to dump values of type " << NodeKind.asStringRef() << "\n";
}
diff --git a/clang/lib/AST/TextNodeDumper.cpp b/clang/lib/AST/TextNodeDumper.cpp
index 74966f8..0d49c44 100644
--- a/clang/lib/AST/TextNodeDumper.cpp
+++ b/clang/lib/AST/TextNodeDumper.cpp
@@ -51,15 +51,12 @@
llvm_unreachable("Decl that isn't part of DeclNodes.inc!");
}
-TextNodeDumper::TextNodeDumper(raw_ostream &OS, const ASTContext &Context,
- bool ShowColors)
- : TextTreeStructure(OS, ShowColors), OS(OS), ShowColors(ShowColors),
- Context(&Context), SM(&Context.getSourceManager()),
- PrintPolicy(Context.getPrintingPolicy()),
- Traits(&Context.getCommentCommandTraits()) {}
-
-TextNodeDumper::TextNodeDumper(raw_ostream &OS, bool ShowColors)
- : TextTreeStructure(OS, ShowColors), OS(OS), ShowColors(ShowColors) {}
+TextNodeDumper::TextNodeDumper(raw_ostream &OS, bool ShowColors,
+ const SourceManager *SM,
+ const PrintingPolicy &PrintPolicy,
+ const comments::CommandTraits *Traits)
+ : TextTreeStructure(OS, ShowColors), OS(OS), ShowColors(ShowColors), SM(SM),
+ PrintPolicy(PrintPolicy), Traits(Traits) {}
void TextNodeDumper::Visit(const comments::Comment *C,
const comments::FullComment *FC) {
@@ -715,7 +712,7 @@
if (Node->getResultAPValueKind() != APValue::None) {
ColorScope Color(OS, ShowColors, ValueColor);
OS << " ";
- Node->getAPValueResult().dump(OS, Context);
+ Node->getAPValueResult().dump(OS);
}
}
diff --git a/clang/lib/ASTMatchers/ASTMatchFinder.cpp b/clang/lib/ASTMatchers/ASTMatchFinder.cpp
index e88da16..563f3fc 100644
--- a/clang/lib/ASTMatchers/ASTMatchFinder.cpp
+++ b/clang/lib/ASTMatchers/ASTMatchFinder.cpp
@@ -755,7 +755,7 @@
return D->getKind() == Decl::TranslationUnit;
})) {
llvm::errs() << "Tried to match orphan node:\n";
- Node.dump(llvm::errs(), *ActiveASTContext);
+ Node.dump(llvm::errs(), ActiveASTContext->getSourceManager());
llvm_unreachable("Parent map should be complete!");
}
#endif
diff --git a/clang/lib/CodeGen/CGExprComplex.cpp b/clang/lib/CodeGen/CGExprComplex.cpp
index a498178..13a5713 100644
--- a/clang/lib/CodeGen/CGExprComplex.cpp
+++ b/clang/lib/CodeGen/CGExprComplex.cpp
@@ -98,7 +98,7 @@
}
ComplexPairTy VisitStmt(Stmt *S) {
- S->dump(llvm::errs(), CGF.getContext());
+ S->dump(CGF.getContext().getSourceManager());
llvm_unreachable("Stmt can't have complex result type!");
}
ComplexPairTy VisitExpr(Expr *S);
diff --git a/clang/lib/CodeGen/CGExprScalar.cpp b/clang/lib/CodeGen/CGExprScalar.cpp
index 6131f97..922aa95 100644
--- a/clang/lib/CodeGen/CGExprScalar.cpp
+++ b/clang/lib/CodeGen/CGExprScalar.cpp
@@ -413,7 +413,7 @@
}
Value *VisitStmt(Stmt *S) {
- S->dump(llvm::errs(), CGF.getContext());
+ S->dump(CGF.getContext().getSourceManager());
llvm_unreachable("Stmt can't have complex result type!");
}
Value *VisitExpr(Expr *S);
diff --git a/clang/lib/Frontend/ASTConsumers.cpp b/clang/lib/Frontend/ASTConsumers.cpp
index a73cc88..12fda45 100644
--- a/clang/lib/Frontend/ASTConsumers.cpp
+++ b/clang/lib/Frontend/ASTConsumers.cpp
@@ -103,9 +103,9 @@
// FIXME: Support OutputFormat in type dumping.
// FIXME: Support combining -ast-dump-decl-types with -ast-dump-lookups.
if (auto *VD = dyn_cast<ValueDecl>(InnerD))
- VD->getType().dump(Out, VD->getASTContext());
+ VD->getType().dump(Out);
if (auto *TD = dyn_cast<TypeDecl>(InnerD))
- TD->getTypeForDecl()->dump(Out, TD->getASTContext());
+ TD->getTypeForDecl()->dump(Out);
}
}