[analyzer] print() JSONify: SVal implementation

[Charusso]

Summary

-

[Charusso]

Most of the new print() should be different from the default one, that is why print*Json() name introduced. I have not seen any more problematic printing so I can begin with the Python script as it now recognizes our JSON-format. Also extra commas are removed from all the dumps.

[NoQ]

I have not seen any more problematic printing so I can begin with the Python script as it now recognizes our JSON-format.

Fantastic! Let's commit all this stuff.

clang/include/clang/StaticAnalyzer/Core/PathSensitive/SVals.h

public:
   /// getAsSymbolicExpression - If this Sval wraps a symbolic expression then
   ///  return that expression.  Otherwise return NULL.
   const SymExpr *getAsSymbolicExpression() const;
 
   const SymExpr *getAsSymExpr() const;
 
   const MemRegion *getAsRegion() const;
 
+  /// printJson - Pretty-prints in JSON format.
+  void printJson(raw_ostream &Out, bool AddQuotes) const;
+
   void dumpToStream(raw_ostream &OS) const;
   void dump() const;
 
   SymExpr::symbol_iterator symbol_begin() const {
     const SymExpr *SE = getAsSymbol(/*IncludeBaseRegions=*/true);
     if (SE)
       return SE->symbol_begin();
     else

clang/lib/StaticAnalyzer/Core/Environment.cpp

for (BindingsTy::iterator I = ExprBindings.begin(); I != ExprBindings.end();
          ++I) {
       if (I->first.getLocationContext() != LC)
         continue;
 
       const Stmt *S = I->first.getStmt();
       Indent(Out, InnerSpace, IsDot)
           << "{ \"lctx_id\": " << LC->getID()
           << ", \"stmt_id\": " << S->getID(Ctx) << ", \"pretty\": ";
-
       S->printJson(Out, nullptr, PP, /*AddQuotes=*/true);
 
-      Out << ", \"value\": \"" << I->second << "\" }";
+      Out << ", \"value\": ";
+      I->second.printJson(Out, /*AddQuotes=*/true);
+
+      Out << " }";
 
       if (I != LastI)
         Out << ',';
       Out << NL;
     }
 
     if (HasItem)
       Indent(Out, --InnerSpace, IsDot) << ']';
     else
       Out << "null ";
   });
 
   Indent(Out, --Space, IsDot) << "]," << NL; // End of Environment.
 }

clang/lib/StaticAnalyzer/Core/SVals.cpp

 //
 //===----------------------------------------------------------------------===//
 
 #include "clang/StaticAnalyzer/Core/PathSensitive/SVals.h"
 #include "clang/AST/Decl.h"
 #include "clang/AST/DeclCXX.h"
 #include "clang/AST/Expr.h"
 #include "clang/AST/Type.h"
+#include "clang/Basic/JsonSupport.h"
 #include "clang/Basic/LLVM.h"
 #include "clang/StaticAnalyzer/Core/PathSensitive/BasicValueFactory.h"
 #include "clang/StaticAnalyzer/Core/PathSensitive/MemRegion.h"
 #include "clang/StaticAnalyzer/Core/PathSensitive/SValBuilder.h"
 #include "clang/StaticAnalyzer/Core/PathSensitive/SymExpr.h"
 #include "clang/StaticAnalyzer/Core/PathSensitive/SymbolManager.h"
 #include "llvm/ADT/Optional.h"
 #include "llvm/Support/Casting.h"

 }
 
 //===----------------------------------------------------------------------===//
 // Pretty-Printing.
 //===----------------------------------------------------------------------===//
 
 LLVM_DUMP_METHOD void SVal::dump() const { dumpToStream(llvm::errs()); }
 
+void SVal::printJson(raw_ostream &Out, bool AddQuotes) const {
+  std::string Buf;
+  llvm::raw_string_ostream TempOut(Buf);
+
+  dumpToStream(TempOut);
+
+  Out << JsonFormat(TempOut.str(), AddQuotes);
+}
+
 void SVal::dumpToStream(raw_ostream &os) const {
   switch (getBaseKind()) {
     case UnknownValKind:
       os << "Unknown";
       break;
     case NonLocKind:
       castAs<NonLoc>().dumpToStream(os);
       break;