OS << "Binding for \"" << BI->first << "\":\n";
const ASTContext &Ctx = AST->getASTContext();
const SourceManager &SM = Ctx.getSourceManager();
- ASTDumper Dumper(OS, &Ctx.getCommentCommandTraits(), &SM,
- SM.getDiagnostics().getShowColors(), Ctx.getPrintingPolicy());
+ ASTDumper Dumper(OS, Ctx, SM.getDiagnostics().getShowColors());
Dumper.SetTraversalKind(QS.TK);
Dumper.Visit(BI->second);
OS << "\n";
llvm::Expected<Tweak::Effect> DumpAST::apply(const Selection &Inputs) {
std::string Str;
llvm::raw_string_ostream OS(Str);
- Node->dump(OS, Inputs.AST->getSourceManager());
+ Node->dump(OS, Inputs.AST->getASTContext());
return Effect::showMessage(std::move(OS.str()));
}
bool isAddrLabelDiff() const { return Kind == AddrLabelDiff; }
void dump() const;
- void dump(raw_ostream &OS) const;
+ void dump(raw_ostream &OS, const ASTContext *Context) const;
void printPretty(raw_ostream &OS, const ASTContext &Ctx, QualType Ty) const;
std::string getAsString(const ASTContext &Ctx, QualType Ty) const;
const bool ShowColors;
public:
- ASTDumper(raw_ostream &OS, const comments::CommandTraits *Traits,
- const SourceManager *SM)
- : ASTDumper(OS, Traits, SM, SM && SM->getDiagnostics().getShowColors()) {}
-
- ASTDumper(raw_ostream &OS, const comments::CommandTraits *Traits,
- const SourceManager *SM, bool ShowColors)
- : ASTDumper(OS, Traits, SM, ShowColors, LangOptions()) {}
- ASTDumper(raw_ostream &OS, const comments::CommandTraits *Traits,
- const SourceManager *SM, bool ShowColors,
- const PrintingPolicy &PrintPolicy)
- : NodeDumper(OS, ShowColors, SM, PrintPolicy, Traits), OS(OS),
- ShowColors(ShowColors) {}
+ ASTDumper(raw_ostream &OS, const ASTContext &Context, bool ShowColors)
+ : NodeDumper(OS, Context, ShowColors), OS(OS), ShowColors(ShowColors) {}
+
+ ASTDumper(raw_ostream &OS, bool ShowColors)
+ : NodeDumper(OS, ShowColors), OS(OS), ShowColors(ShowColors) {}
TextNodeDumper &doGetNodeDelegate() { return NodeDumper; }
void print(llvm::raw_ostream &OS, const PrintingPolicy &PP) const;
/// Dumps the node to the given output stream.
- void dump(llvm::raw_ostream &OS, SourceManager &SM) const;
+ void dump(llvm::raw_ostream &OS, const ASTContext &Context) const;
/// For nodes which represent textual entities in the source code,
/// return their SourceRange. For all other nodes, return SourceRange().
void dump() const;
void dumpColor() const;
- void dump(const ASTContext &Context) const;
- void dump(raw_ostream &OS, const CommandTraits *Traits,
- const SourceManager *SM) const;
+ void dump(raw_ostream &OS, const ASTContext &Context) const;
SourceRange getSourceRange() const LLVM_READONLY { return Range; }
/// Dumps the specified AST fragment and all subtrees to
/// \c llvm::errs().
void dump() const;
- void dump(SourceManager &SM) const;
- void dump(raw_ostream &OS, SourceManager &SM) const;
- void dump(raw_ostream &OS) const;
+ void dump(raw_ostream &OS, const ASTContext &Context) const;
/// \return Unique reproducible object identifier
int64_t getID(const ASTContext &Context) const;
const char *LastLocFilename = "";
unsigned LastLocLine = ~0U;
- const SourceManager *SM;
+ /// \p Context, \p SM, and \p Traits can be null. This is because we want
+ /// to be able to call \p dump() in a debugger without having to pass the
+ /// \p ASTContext to \p dump. Not all parts of the AST dump output will be
+ /// available without the \p ASTContext.
+ const ASTContext *Context = nullptr;
+ const SourceManager *SM = nullptr;
/// The policy to use for printing; can be defaulted.
- PrintingPolicy PrintPolicy;
+ PrintingPolicy PrintPolicy = LangOptions();
- const comments::CommandTraits *Traits;
+ const comments::CommandTraits *Traits = nullptr;
const char *getCommandName(unsigned CommandID);
public:
- TextNodeDumper(raw_ostream &OS, bool ShowColors, const SourceManager *SM,
- const PrintingPolicy &PrintPolicy,
- const comments::CommandTraits *Traits);
+ TextNodeDumper(raw_ostream &OS, const ASTContext &Context, bool ShowColors);
+ TextNodeDumper(raw_ostream &OS, bool ShowColors);
void Visit(const comments::Comment *C, const comments::FullComment *FC);
void dump(const char *s) const;
void dump() const;
- void dump(llvm::raw_ostream &OS) const;
+ void dump(llvm::raw_ostream &OS, const ASTContext &Context) const;
void Profile(llvm::FoldingSetNodeID &ID) const {
ID.AddPointer(getAsOpaquePtr());
CanQualType getCanonicalTypeUnqualified() const; // in CanonicalType.h
void dump() const;
- void dump(llvm::raw_ostream &OS) const;
+ void dump(llvm::raw_ostream &OS, const ASTContext &Context) const;
};
/// This will check for a TypedefType by removing any existing sugar
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;
return V.convertToDouble();
}
-void APValue::dump(raw_ostream &OS) const {
+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 {
switch (getKind()) {
case None:
OS << "None";
return;
case Vector:
OS << "Vector: ";
- getVectorElt(0).dump(OS);
+ getVectorElt(0).dump(OS, Context);
for (unsigned i = 1; i != getVectorLength(); ++i) {
OS << ", ";
- getVectorElt(i).dump(OS);
+ getVectorElt(i).dump(OS, Context);
}
return;
case ComplexInt:
case Array:
OS << "Array: ";
for (unsigned I = 0, N = getArrayInitializedElts(); I != N; ++I) {
- getArrayInitializedElt(I).dump(OS);
- if (I != getArraySize() - 1) OS << ", ";
+ getArrayInitializedElt(I).dump(OS, Context);
+ if (I != getArraySize() - 1)
+ OS << ", ";
}
if (hasArrayFiller()) {
OS << getArraySize() - getArrayInitializedElts() << " x ";
- getArrayFiller().dump(OS);
+ getArrayFiller().dump(OS, Context);
}
return;
case Struct:
OS << "Struct ";
if (unsigned N = getStructNumBases()) {
OS << " bases: ";
- getStructBase(0).dump(OS);
+ getStructBase(0).dump(OS, Context);
for (unsigned I = 1; I != N; ++I) {
OS << ", ";
- getStructBase(I).dump(OS);
+ getStructBase(I).dump(OS, Context);
}
}
if (unsigned N = getStructNumFields()) {
OS << " fields: ";
- getStructField(0).dump(OS);
+ getStructField(0).dump(OS, Context);
for (unsigned I = 1; I != N; ++I) {
OS << ", ";
- getStructField(I).dump(OS);
+ getStructField(I).dump(OS, Context);
}
}
return;
case Union:
OS << "Union: ";
- getUnionValue().dump(OS);
+ getUnionValue().dump(OS, Context);
return;
case MemberPointer:
OS << "MemberPointer: <todo>";
dump();
}
-LLVM_DUMP_METHOD void QualType::dump() const { dump(llvm::errs()); }
+LLVM_DUMP_METHOD void QualType::dump() const {
+ ASTDumper Dumper(llvm::errs(), /*ShowColors=*/false);
+ Dumper.Visit(*this);
+}
-LLVM_DUMP_METHOD void QualType::dump(llvm::raw_ostream &OS) const {
- ASTDumper Dumper(OS, nullptr, nullptr);
+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 {
- QualType(this, 0).dump(OS);
+LLVM_DUMP_METHOD void Type::dump(llvm::raw_ostream &OS,
+ const ASTContext &Context) const {
+ QualType(this, 0).dump(OS, Context);
}
//===----------------------------------------------------------------------===//
(void)Deserialize; // FIXME?
P.Visit(this);
} else {
- ASTDumper P(OS, &Ctx.getCommentCommandTraits(), &SM,
- SM.getDiagnostics().getShowColors(), Ctx.getPrintingPolicy());
+ ASTDumper P(OS, Ctx, Ctx.getDiagnostics().getShowColors());
P.setDeserialize(Deserialize);
P.Visit(this);
}
LLVM_DUMP_METHOD void Decl::dumpColor() const {
const ASTContext &Ctx = getASTContext();
- ASTDumper P(llvm::errs(), &Ctx.getCommentCommandTraits(),
- &Ctx.getSourceManager(), /*ShowColors*/ true,
- Ctx.getPrintingPolicy());
+ ASTDumper P(llvm::errs(), Ctx, /*ShowColors=*/true);
P.Visit(this);
}
const DeclContext *DC = this;
while (!DC->isTranslationUnit())
DC = DC->getParent();
- ASTContext &Ctx = cast<TranslationUnitDecl>(DC)->getASTContext();
- const SourceManager &SM = Ctx.getSourceManager();
- ASTDumper P(OS, &Ctx.getCommentCommandTraits(), &Ctx.getSourceManager(),
- SM.getDiagnostics().getShowColors(), Ctx.getPrintingPolicy());
+ const ASTContext &Ctx = cast<TranslationUnitDecl>(DC)->getASTContext();
+ ASTDumper P(OS, Ctx, Ctx.getDiagnostics().getShowColors());
P.setDeserialize(Deserialize);
P.dumpLookups(this, DumpDecls);
}
// Stmt method implementations
//===----------------------------------------------------------------------===//
-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 {
- ASTDumper P(OS, nullptr, nullptr);
+LLVM_DUMP_METHOD void Stmt::dump() const {
+ ASTDumper P(llvm::errs(), /*ShowColors=*/false);
P.Visit(this);
}
-LLVM_DUMP_METHOD void Stmt::dump() const {
- ASTDumper P(llvm::errs(), nullptr, nullptr);
+LLVM_DUMP_METHOD void Stmt::dump(raw_ostream &OS,
+ const ASTContext &Context) const {
+ ASTDumper P(OS, Context, Context.getDiagnostics().getShowColors());
P.Visit(this);
}
LLVM_DUMP_METHOD void Stmt::dumpColor() const {
- ASTDumper P(llvm::errs(), nullptr, nullptr, /*ShowColors*/true);
+ ASTDumper P(llvm::errs(), /*ShowColors=*/true);
P.Visit(this);
}
//===----------------------------------------------------------------------===//
LLVM_DUMP_METHOD void Comment::dump() const {
- dump(llvm::errs(), nullptr, nullptr);
-}
-
-LLVM_DUMP_METHOD void Comment::dump(const ASTContext &Context) const {
- dump(llvm::errs(), &Context.getCommentCommandTraits(),
- &Context.getSourceManager());
+ const auto *FC = dyn_cast<FullComment>(this);
+ if (!FC)
+ return;
+ ASTDumper Dumper(llvm::errs(), /*ShowColors=*/false);
+ Dumper.Visit(FC, FC);
}
-void Comment::dump(raw_ostream &OS, const CommandTraits *Traits,
- const SourceManager *SM) const {
- const FullComment *FC = dyn_cast<FullComment>(this);
+LLVM_DUMP_METHOD void Comment::dump(raw_ostream &OS,
+ const ASTContext &Context) const {
+ const auto *FC = dyn_cast<FullComment>(this);
if (!FC)
return;
- ASTDumper D(OS, Traits, SM);
- D.Visit(FC, FC);
+ ASTDumper Dumper(OS, Context, Context.getDiagnostics().getShowColors());
+ Dumper.Visit(FC, FC);
}
LLVM_DUMP_METHOD void Comment::dumpColor() const {
- const FullComment *FC = dyn_cast<FullComment>(this);
+ const auto *FC = dyn_cast<FullComment>(this);
if (!FC)
return;
- ASTDumper D(llvm::errs(), nullptr, nullptr, /*ShowColors*/true);
- D.Visit(FC, FC);
+ ASTDumper Dumper(llvm::errs(), /*ShowColors=*/true);
+ Dumper.Visit(FC, FC);
}
OS << "Unable to print values of type " << NodeKind.asStringRef() << "\n";
}
-void DynTypedNode::dump(llvm::raw_ostream &OS, SourceManager &SM) const {
+void DynTypedNode::dump(llvm::raw_ostream &OS,
+ const ASTContext &Context) const {
if (const Decl *D = get<Decl>())
D->dump(OS);
else if (const Stmt *S = get<Stmt>())
- S->dump(OS, SM);
+ S->dump(OS, Context);
else if (const Type *T = get<Type>())
- T->dump(OS);
+ T->dump(OS, Context);
else
OS << "Unable to dump values of type " << NodeKind.asStringRef() << "\n";
}
llvm_unreachable("Decl that isn't part of DeclNodes.inc!");
}
-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) {}
+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) {}
void TextNodeDumper::Visit(const comments::Comment *C,
const comments::FullComment *FC) {
if (Node->getResultAPValueKind() != APValue::None) {
ColorScope Color(OS, ShowColors, ValueColor);
OS << " ";
- Node->getAPValueResult().dump(OS);
+ Node->getAPValueResult().dump(OS, Context);
}
}
return D->getKind() == Decl::TranslationUnit;
})) {
llvm::errs() << "Tried to match orphan node:\n";
- Node.dump(llvm::errs(), ActiveASTContext->getSourceManager());
+ Node.dump(llvm::errs(), *ActiveASTContext);
llvm_unreachable("Parent map should be complete!");
}
#endif
}
ComplexPairTy VisitStmt(Stmt *S) {
- S->dump(CGF.getContext().getSourceManager());
+ S->dump(llvm::errs(), CGF.getContext());
llvm_unreachable("Stmt can't have complex result type!");
}
ComplexPairTy VisitExpr(Expr *S);
}
Value *VisitStmt(Stmt *S) {
- S->dump(CGF.getContext().getSourceManager());
+ S->dump(llvm::errs(), CGF.getContext());
llvm_unreachable("Stmt can't have complex result type!");
}
Value *VisitExpr(Expr *S);
// 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->getType().dump(Out, VD->getASTContext());
if (auto *TD = dyn_cast<TypeDecl>(InnerD))
- TD->getTypeForDecl()->dump(Out);
+ TD->getTypeForDecl()->dump(Out, TD->getASTContext());
}
}
if (MY_DEBUG) {
llvm::errs() << "=== Source:\n" << Source << "\n=== AST:\n";
- FC->dump(llvm::errs(), &Traits, &SourceMgr);
+ FC->dump();
}
Token Tok;
const DynTypedNode &Node) override {
std::string DumpStr;
llvm::raw_string_ostream Dump(DumpStr);
- Node.dump(Dump, *Result.SourceManager);
+ Node.dump(Dump, *Result.Context);
if (Dump.str().find(ExpectSubstring) == std::string::npos) {
std::string MsgStr;