diff options
| author | Igor Kudrin <ikudrin.dev@gmail.com> | 2016-08-29 11:48:50 +0000 |
|---|---|---|
| committer | Igor Kudrin <ikudrin.dev@gmail.com> | 2016-08-29 11:48:50 +0000 |
| commit | 8545dae226162723ee75867288103a9a71d0b91c (patch) | |
| tree | 4aa01c97f8b06117649d157cfb441a2b1efddd9e /clang/lib/CodeGen/CoverageMappingGen.cpp | |
| parent | 24281b4740799108fe935e3478dfbe3f27c2d36c (diff) | |
| download | llvm-8545dae226162723ee75867288103a9a71d0b91c.zip llvm-8545dae226162723ee75867288103a9a71d0b91c.tar.gz llvm-8545dae226162723ee75867288103a9a71d0b91c.tar.bz2 | |
[Coverage] Prevent creating a redundant counter if a nested body ends with a macro.
If there were several nested statements arranged in a way that all of them
end up with the same macro, then the expansion of this macro was assigned
with all the corresponding counters of these statements.
As a result, the wrong counter value was shown for the macro in llvm-cov.
This patch fixes the issue by preventing adding a counter for an expanded
source range if it already has an assigned counter, which is expected
to come from the most specific statement.
Differential Revision: https://reviews.llvm.org/D23160
llvm-svn: 279962
Diffstat (limited to 'clang/lib/CodeGen/CoverageMappingGen.cpp')
| -rw-r--r-- | clang/lib/CodeGen/CoverageMappingGen.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/clang/lib/CodeGen/CoverageMappingGen.cpp b/clang/lib/CodeGen/CoverageMappingGen.cpp index da6fa2a..080525c 100644 --- a/clang/lib/CodeGen/CoverageMappingGen.cpp +++ b/clang/lib/CodeGen/CoverageMappingGen.cpp @@ -432,7 +432,8 @@ struct CounterCoverageMappingBuilder SourceLocation NestedLoc = getStartOfFileOrMacro(EndLoc); assert(SM.isWrittenInSameFile(NestedLoc, EndLoc)); - SourceRegions.emplace_back(Region.getCounter(), NestedLoc, EndLoc); + if (!isRegionAlreadyAdded(NestedLoc, EndLoc)) + SourceRegions.emplace_back(Region.getCounter(), NestedLoc, EndLoc); EndLoc = getPreciseTokenLocEnd(getIncludeOrExpansionLoc(EndLoc)); if (EndLoc.isInvalid()) |