Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 11 additions & 6 deletions bin/llvm2lcov
Original file line number Diff line number Diff line change
Expand Up @@ -461,12 +461,17 @@ sub parse
# 'Executed MC/DC Test Vectors' table.
# However, this is not used for presenting MC/DC data,
# so we ignore this field.
die("unsupported MC/DC entry size $mSize in JSON file version '$json_version'"
)
unless ($json_version > version->parse("3.0.1") &&
$mSize == 11) ||
($json_version == version->parse("3.0.1") &&
$mSize == 10);
if (!( $json_version > version->parse("3.0.1") &&
$mSize == 11)
&&
!( $json_version == version->parse("3.0.1") &&
$mSize == 10)
) {
lcovutil::ignorable_error($lcovutil::ERROR_FORMAT,
"unsupported MC/DC entry size $mSize in JSON file version '$json_version'"
);
last;
}
my ($line, $col, $endLine, $endCol,
$trueCount, $falseCount, $fileId, $expandedId,
$kind, $cov) = @$m;
Expand Down