[llvm] Revert "[llvm-cov] Export decision coverage to output json" (PR #144783)
Alan Phipps via llvm-commits
llvm-commits at lists.llvm.org
Wed Jun 18 12:12:26 PDT 2025
https://github.com/evodius96 created https://github.com/llvm/llvm-project/pull/144783
Reverts llvm/llvm-project#144335
Need to resolve test failures
>From 6192df16081fd36c7e4f947ee8956233cf02464b Mon Sep 17 00:00:00 2001
From: Alan Phipps <a-phipps at ti.com>
Date: Wed, 18 Jun 2025 14:11:57 -0500
Subject: [PATCH] Revert "[llvm-cov] Export decision coverage to output json
(#144335)"
This reverts commit ab6beeca9ccc1968661eea27c1a55e8734f7437b.
---
.../llvm/ProfileData/Coverage/CoverageMapping.h | 12 ------------
llvm/tools/llvm-cov/CoverageExporterJson.cpp | 6 ++----
2 files changed, 2 insertions(+), 16 deletions(-)
diff --git a/llvm/include/llvm/ProfileData/Coverage/CoverageMapping.h b/llvm/include/llvm/ProfileData/Coverage/CoverageMapping.h
index 8e6180be25b51..d1230b0ba7c58 100644
--- a/llvm/include/llvm/ProfileData/Coverage/CoverageMapping.h
+++ b/llvm/include/llvm/ProfileData/Coverage/CoverageMapping.h
@@ -31,7 +31,6 @@
#include "llvm/Support/Endian.h"
#include "llvm/Support/Error.h"
#include "llvm/Support/raw_ostream.h"
-#include <algorithm>
#include <cassert>
#include <cstdint>
#include <iterator>
@@ -495,17 +494,6 @@ struct MCDCRecord {
return TV[TestVectorIndex].first[PosToID[Condition]];
}
- /// Return the number of True and False decisions for all executed test
- /// vectors.
- std::pair<unsigned, unsigned> getDecisions() const {
- const unsigned TrueDecisions =
- std::count_if(TV.begin(), TV.end(), [](const auto &TestVec) {
- return TestVec.second == CondState::MCDC_True;
- });
-
- return {TrueDecisions, TV.size() - TrueDecisions};
- }
-
/// Return the Result evaluation for an executed test vector.
/// See MCDCRecordProcessor::RecordTestVector().
CondState getTVResult(unsigned TestVectorIndex) {
diff --git a/llvm/tools/llvm-cov/CoverageExporterJson.cpp b/llvm/tools/llvm-cov/CoverageExporterJson.cpp
index 024693a24cc23..4088c1b053aa8 100644
--- a/llvm/tools/llvm-cov/CoverageExporterJson.cpp
+++ b/llvm/tools/llvm-cov/CoverageExporterJson.cpp
@@ -62,7 +62,7 @@
#include <utility>
/// The semantic version combined as a string.
-#define LLVM_COVERAGE_EXPORT_JSON_STR "3.0.0"
+#define LLVM_COVERAGE_EXPORT_JSON_STR "2.0.1"
/// Unique type identifier for JSON coverage export.
#define LLVM_COVERAGE_EXPORT_JSON_TYPE_STR "llvm.coverage.json.export"
@@ -110,10 +110,8 @@ json::Array gatherConditions(const coverage::MCDCRecord &Record) {
json::Array renderMCDCRecord(const coverage::MCDCRecord &Record) {
const llvm::coverage::CounterMappingRegion &CMR = Record.getDecisionRegion();
- const auto [TrueDecisions, FalseDecisions] = Record.getDecisions();
return json::Array({CMR.LineStart, CMR.ColumnStart, CMR.LineEnd,
- CMR.ColumnEnd, TrueDecisions, FalseDecisions,
- CMR.ExpandedFileID, int64_t(CMR.Kind),
+ CMR.ColumnEnd, CMR.ExpandedFileID, int64_t(CMR.Kind),
gatherConditions(Record)});
}
More information about the llvm-commits
mailing list