[analyzer] Fix JSON dumps for ExplodedNodes

[Charusso]

Summary

• Now we could see the has_report property in trim-egraph mode.
• This patch also removes the trailing comma after each node.

[Charusso]

clang/test/Analysis/dump_egraph.c

3 ↗

(On Diff #205086)

This did nothing.

[NoQ]

clang/test/Analysis/dump_egraph.c

3 ↗

(On Diff #205086)

Let's fix it by adding another // RUN: cat %t.dot | FileCheck %s after this line instead, so that both trimmed graph and untrimmed graph gets tested.

[Charusso]

Thanks for the review!

clang/test/Analysis/dump_egraph.c

3 ↗

(On Diff #205086)

I am not sure why Report.getErrorNode() == N is not enough, but now it passes well and satisfies the problem when we reported something on hidden nodes.

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

static bool nodeHasBugReport(const ExplodedNode *N) {
     BugReporter &BR = static_cast<ExprEngine &>(
       N->getState()->getStateManager().getOwningEngine()).getBugReporter();
 
     const auto EQClasses =
         llvm::make_range(BR.EQClasses_begin(), BR.EQClasses_end());
 
     for (const auto &EQ : EQClasses) {
       for (const BugReport &Report : EQ) {
-        if (Report.getErrorNode() == N)
+        if (Report.getErrorNode()->getState() == N->getState())
           return true;
       }
     }
     return false;
   }
 
   /// \p PreCallback: callback before break.
   /// \p PostCallback: callback after break.
bool SameAsAllPredecessors =
         });
 
     if (!SameAsAllPredecessors) {
       State->printDOT(Out, N->getLocationContext(), Space);
     } else {
       Indent(Out, Space, IsDot) << "\"program_state\": null";
     }
 
-    Out << "\\l}";
-    if (!N->succ_empty())
-      Out << ',';
-    Out << "\\l";
-
+    Out << "\\l}\\l";
     return Out.str();
   }
 };
 
 } // namespace llvm
 #endif
 
 void ExprEngine::ViewGraph(bool trim) {

cfe/trunk/test/Analysis/dump_egraph.c

-// RUN: %clang_analyze_cc1 -analyzer-checker=core -analyzer-dump-egraph=%t.dot %s
+// RUN: %clang_analyze_cc1 -analyzer-checker=core \
+// RUN:  -analyzer-dump-egraph=%t.dot %s
 // RUN: cat %t.dot | FileCheck %s
-// RUN: %clang_analyze_cc1 -analyzer-checker=core -analyzer-dump-egraph=%t.dot -trim-egraph %s
+
+// RUN: %clang_analyze_cc1 -analyzer-checker=core \
+// RUN:  -analyzer-dump-egraph=%t.dot \
+// RUN:  -trim-egraph %s
+// RUN: cat %t.dot | FileCheck %s
+
 // REQUIRES: asserts
 
 int getJ();
 
 int foo() {
   int *x = 0, *y = 0;
   return *x + *y;
 }
 
-// CHECK: digraph "Exploded Graph" {
-
 // CHECK: \"program_points\": [\l    \{ \"kind\": \"Edge\", \"src_id\": 2, \"dst_id\": 1, \"terminator\": null, \"term_kind\": null, \"tag\": null \}\l  ],\l  \"program_state\": null
 
 // CHECK: \"program_points\": [\l    \{ \"kind\": \"BlockEntrance\", \"block_id\": 1
 
 // CHECK: \"has_report\": true