[fix] Improve parseTraceEvent

misonijnik · Dec 13, 2022 · 0aa8b15 · 0aa8b15
1 parent 35fd8bc
commit 0aa8b15
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/lib/Runner/parse_static_analysis_json.cpp b/lib/Runner/parse_static_analysis_json.cpp
@@ -127,7 +127,7 @@ ReachWithError parseError(json &traceEvent) {
     return ReachWithError::None;
 }
 
-LocatedEvent *parseTraceEvent(json &traceEvent, unsigned id) {
+LocatedEvent *parseTraceEvent(json &traceEvent, unsigned id, bool last = false) {
   auto location = traceEvent.at("location");
   std::string file = location.at("file");
   auto error = parseError(traceEvent);
@@ -147,6 +147,9 @@ LocatedEvent *parseTraceEvent(json &traceEvent, unsigned id) {
     loc = new Location(file, reportLine);
   }
   auto le = new LocatedEvent(loc, error, id);
+  if (last) {
+    le->setErrorReachableIfNone();
+  }
   return locatedEvent(le);
 }
 
@@ -180,11 +183,14 @@ std::vector<LocatedEvent *> *parseTrace(json &trace, unsigned id) {
   auto out = new std::vector<LocatedEvent *>();
   out->reserve(trace.size() + 1);
   out->push_back(entryPoint);
-  for (auto traceEvent : trace) {
-    auto le = parseTraceEvent(traceEvent, id);
+  for (unsigned i = 0; i < trace.size() - 1; ++i) {
+    auto le = parseTraceEvent(trace[i], id);
+    out->push_back(le);
+  }
+  if (trace.size() > 0) {
+    auto le = parseTraceEvent(trace.back(), id, true);
     out->push_back(le);
   }
-  out->back()->setErrorReachableIfNone();
   return out;
 }