Fix escaping bugs that currently affect the JSON formatting test on

Windows.

Other escaping bugs may remain; #620 is to fix all of them.

Fixes #619.

Author: mattmccutchen-cci

clang/include/clang/3C/PersistentSourceLoc.h

@@ -56,10 +56,13 @@ class PersistentSourceLoc {
       return FileName < O.FileName;
   }
 
-  void print(llvm::raw_ostream &O) const {
-    O << FileName << ":" << LineNo << ":" << ColNoS << ":" << ColNoE;
+  std::string toString() const {
+    return FileName + ":" + std::to_string(LineNo) + ":" +
+           std::to_string(ColNoS) + ":" + std::to_string(ColNoE);
   }
 
+  void print(llvm::raw_ostream &O) const { O << toString(); }
+
   void dump() const { print(llvm::errs()); }
 
   static PersistentSourceLoc mkPSL(const clang::Decl *D,

clang/lib/3C/3CInteractiveData.cpp

@@ -11,6 +11,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "clang/3C/3CInteractiveData.h"
+#include "llvm/Support/JSON.h"
 
 void ConstraintsInfo::clear() {
   RootWildAtomsWithReason.clear();
@@ -116,11 +117,9 @@ void ConstraintsInfo::printConstraintStats(llvm::raw_ostream &O,
   O << "\"InSrc\":" << (InSrcWildAtoms.find(Cause) != InSrcWildAtoms.end()) << ", ";
   O << "\"Location\":";
   const PersistentSourceLoc &PSL = PtrInfo.getLocation();
-  if (PSL.valid()) {
-    O << "\"";
-    PSL.print(O);
-    O << "\"";
-  } else
+  if (PSL.valid())
+    O << llvm::json::Value(PSL.toString());
+  else
     O << "null";
   O << ", ";
 

clang/lib/3C/ProgramInfo.cpp

@@ -13,6 +13,7 @@
 #include "clang/3C/ConstraintsGraph.h"
 #include "clang/3C/MappingVisitor.h"
 #include "clang/3C/Utils.h"
+#include "llvm/Support/JSON.h"
 #include <sstream>
 
 using namespace clang;
@@ -113,9 +114,9 @@ void ProgramInfo::dumpJson(llvm::raw_ostream &O) const {
     }
     PersistentSourceLoc L = I.first;
 
-    O << "{\"line\":\"";
-    L.print(O);
-    O << "\",\"Variables\":[";
+    O << "{\"line\":";
+    O << llvm::json::Value(L.toString());
+    O << ",\"Variables\":[";
     I.second->dumpJson(O);
     O << "]}";
     AddComma = true;
@@ -315,7 +316,7 @@ void ProgramInfo::printStats(const std::set<std::string> &F, raw_ostream &O,
         if (AddComma) {
           O << ",\n";
         }
-        O << "{\"" << I.first << "\":{";
+        O << "{" << llvm::json::Value(I.first) << ":{";
         O << "\"constraints\":" << V << ",";
         O << "\"ptr\":" << P << ",";
         O << "\"ntarr\":" << Nt << ",";