[analyzer] print() JSONify: Decl revision

[Charusso]

Summary

-

[NoQ]

Ouch, this is actually the place that i hate for doing the pretty-print! Let's just dump the qualified name of the decl instead for implicit calls, that's totally enough, it's completely unnecessary to dump the whole source code of the destructor.

[Charusso]

• Print out only the qualified name of each Decl.

[NoQ]

Great, thanks!

clang/include/clang/AST/DeclBase.h

public:
   void print(raw_ostream &Out, unsigned Indentation = 0,
              bool PrintInstantiation = false) const;
   void print(raw_ostream &Out, const PrintingPolicy &Policy,
              unsigned Indentation = 0, bool PrintInstantiation = false) const;
   static void printGroup(Decl** Begin, unsigned NumDecls,
                          raw_ostream &Out, const PrintingPolicy &Policy,
                          unsigned Indentation = 0);
 
+  void printJson(raw_ostream &Out, bool AddQuotes) const;
+
   // Debuggers don't usually respect default arguments.
   void dump() const;
 
   // Same as dump(), but forces color printing.
   void dumpColor() const;
 
   void dump(raw_ostream &Out, bool Deserialize = false,
             ASTDumpOutputFormat OutputFormat = ADOF_Default) const;

clang/lib/AST/DeclPrinter.cpp

 #include "clang/AST/Decl.h"
 #include "clang/AST/DeclCXX.h"
 #include "clang/AST/DeclObjC.h"
 #include "clang/AST/DeclTemplate.h"
 #include "clang/AST/DeclVisitor.h"
 #include "clang/AST/Expr.h"
 #include "clang/AST/ExprCXX.h"
 #include "clang/AST/PrettyPrinter.h"
+#include "clang/Basic/JsonSupport.h"
 #include "clang/Basic/Module.h"
 #include "llvm/Support/raw_ostream.h"
 using namespace clang;
 
 namespace {
   class DeclPrinter : public DeclVisitor<DeclPrinter> {
     raw_ostream &Out;
     PrintingPolicy Policy;
public:
     void prettyPrintAttributes(Decl *D);
     void prettyPrintPragmas(Decl *D);
     void printDeclType(QualType T, StringRef DeclName, bool Pack = false);
   };
 }
 
 void Decl::print(raw_ostream &Out, unsigned Indentation,
                  bool PrintInstantiation) const {
-  print(Out, getASTContext().getPrintingPolicy(), Indentation, PrintInstantiation);
+  print(Out, getASTContext().getPrintingPolicy(), Indentation,
+        PrintInstantiation);
 }
 
 void Decl::print(raw_ostream &Out, const PrintingPolicy &Policy,
                  unsigned Indentation, bool PrintInstantiation) const {
   DeclPrinter Printer(Out, Policy, getASTContext(), Indentation,
                       PrintInstantiation);
   Printer.Visit(const_cast<Decl*>(this));
 }
 
+void Decl::printJson(raw_ostream &Out, bool AddQuotes) const {
+  std::string Buf;
+  llvm::raw_string_ostream TempOut(Buf);
+
+  print(TempOut, getASTContext().getPrintingPolicy());
+
+  Out << JsonFormat(TempOut.str(), AddQuotes);
+}
+
 void TemplateParameterList::print(raw_ostream &Out, const ASTContext &Context,
                                   bool OmitTemplateKW) const {
   print(Out, Context, Context.getPrintingPolicy(), OmitTemplateKW);
 }
 
 void TemplateParameterList::print(raw_ostream &Out, const ASTContext &Context,
                                   const PrintingPolicy &Policy,
                                   bool OmitTemplateKW) const {

clang/lib/Analysis/ProgramPoint.cpp

void ProgramPoint::printJson(llvm::raw_ostream &Out, const char *NL) const {
 
   case ProgramPoint::LoopExitKind:
     Out << "LoopExit\", \"stmt\": \""
         << castAs<LoopExit>().getLoopStmt()->getStmtClassName() << '\"';
     break;
 
   case ProgramPoint::PreImplicitCallKind: {
     ImplicitCallPoint PC = castAs<ImplicitCallPoint>();
-    Out << "PreCall\", \"stmt\": \"";
-    PC.getDecl()->print(Out, Context.getLangOpts());
-    Out << "\", ";
+    Out << "PreCall\", \"decl\": ";
+    PC.getDecl()->printJson(Out, /*AddQuotes=*/true);
+    Out << ", ";
     printLocJson(Out, PC.getLocation(), SM);
     break;
   }
 
   case ProgramPoint::PostImplicitCallKind: {
     ImplicitCallPoint PC = castAs<ImplicitCallPoint>();
-    Out << "PostCall\", \"stmt\": \"";
-    PC.getDecl()->print(Out, Context.getLangOpts());
-    Out << "\", ";
+    Out << "PostCall\", \"decl\": ";
+    PC.getDecl()->printJson(Out, /*AddQuotes=*/true);
+    Out << ", ";
     printLocJson(Out, PC.getLocation(), SM);
     break;
   }
 
   case ProgramPoint::PostInitializerKind: {
     Out << "PostInitializer\", ";
     const CXXCtorInitializer *Init = castAs<PostInitializer>().getInitializer();
     if (const FieldDecl *FD = Init->getAnyMember()) {