[analyzer] print() JSONify: ExplodedNode revision

[Charusso]

Summary

Revert node-ID removal.

[NoQ]

Great, thx!

cfe/trunk/lib/StaticAnalyzer/Core/ExprEngine.cpp

struct DOTGraphTraits<ExplodedGraph*> : public DefaultDOTGraphTraits {
   static std::string getNodeLabel(const ExplodedNode *N, ExplodedGraph *G){
     std::string Buf;
     llvm::raw_string_ostream Out(Buf);
 
     const bool IsDot = true;
     const unsigned int Space = 1;
     ProgramStateRef State = N->getState();
 
-    Out << "{ \"node_id\": \"" << (const void *)N
-        << "\", \"state_id\": " << State->getID()
+    Out << "{ \"node_id\": " << N->getID(G) << ", \"pointer\": \""
+        << (const void *)N << "\", \"state_id\": " << State->getID()
         << ", \"has_report\": " << (nodeHasBugReport(N) ? "true" : "false")
         << ",\\l";
 
     Indent(Out, Space, IsDot) << "\"program_points\": [\\l";
 
     // Dump program point for all the previously skipped nodes.
     traverseHiddenNodes(
         N,
         [&](const ExplodedNode *OtherNode) {
           Indent(Out, Space + 1, IsDot) << "{ ";
           OtherNode->getLocation().printJson(Out, /*NL=*/"\\l");
           Out << ", \"tag\": ";
           if (const ProgramPointTag *Tag = OtherNode->getLocation().getTag())
             Out << '\"' << Tag->getTagDescription() << "\" }";
           else
             Out << "null }";
         },
-  // Adds a comma and a new-line between each program point.
+        // Adds a comma and a new-line between each program point.
         [&](const ExplodedNode *) { Out << ",\\l"; },
         [&](const ExplodedNode *) { return false; });
 
     Out << "\\l"; // Adds a new-line to the last program point.
     Indent(Out, Space, IsDot) << "],\\l";
 
     bool SameAsAllPredecessors =
         std::all_of(N->pred_begin(), N->pred_end(), [&](const ExplodedNode *P) {