[llvm] r266458 - Revert "[Coverage] Prevent detection of false instantiations in case of macro expansion."
Igor Kudrin via llvm-commits
llvm-commits at lists.llvm.org
Fri Apr 15 10:53:48 PDT 2016
Author: ikudrin
Date: Fri Apr 15 12:53:48 2016
New Revision: 266458
URL: http://llvm.org/viewvc/llvm-project?rev=266458&view=rev
Log:
Revert "[Coverage] Prevent detection of false instantiations in case of macro expansion."
This reverts commit r266436 as it broke buildbot.
Removed:
llvm/trunk/test/tools/llvm-cov/Inputs/prevent_false_instantiations.covmapping
llvm/trunk/test/tools/llvm-cov/Inputs/prevent_false_instantiations.cpp
llvm/trunk/test/tools/llvm-cov/Inputs/prevent_false_instantiations.proftext
llvm/trunk/test/tools/llvm-cov/prevent_false_instantiations.h
Modified:
llvm/trunk/lib/ProfileData/CoverageMapping.cpp
llvm/trunk/test/tools/llvm-cov/lit.local.cfg
llvm/trunk/unittests/ProfileData/CoverageMappingTest.cpp
Modified: llvm/trunk/lib/ProfileData/CoverageMapping.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ProfileData/CoverageMapping.cpp?rev=266458&r1=266457&r2=266458&view=diff
==============================================================================
--- llvm/trunk/lib/ProfileData/CoverageMapping.cpp (original)
+++ llvm/trunk/lib/ProfileData/CoverageMapping.cpp Fri Apr 15 12:53:48 2016
@@ -375,26 +375,30 @@ static SmallBitVector gatherFileIDs(Stri
return FilenameEquivalence;
}
-/// Return the ID of the file where the definition of the function is located.
-static Optional<unsigned> findMainViewFileID(const FunctionRecord &Function) {
+static Optional<unsigned> findMainViewFileID(StringRef SourceFile,
+ const FunctionRecord &Function) {
SmallBitVector IsNotExpandedFile(Function.Filenames.size(), true);
+ SmallBitVector FilenameEquivalence = gatherFileIDs(SourceFile, Function);
for (const auto &CR : Function.CountedRegions)
- if (CR.Kind == CounterMappingRegion::ExpansionRegion)
+ if (CR.Kind == CounterMappingRegion::ExpansionRegion &&
+ FilenameEquivalence[CR.FileID])
IsNotExpandedFile[CR.ExpandedFileID] = false;
+ IsNotExpandedFile &= FilenameEquivalence;
int I = IsNotExpandedFile.find_first();
if (I == -1)
return None;
return I;
}
-/// Check if SourceFile is the file that contains the definition of
-/// the Function. Return the ID of the file in that case or None otherwise.
-static Optional<unsigned> findMainViewFileID(StringRef SourceFile,
- const FunctionRecord &Function) {
- Optional<unsigned> I = findMainViewFileID(Function);
- if (I && SourceFile == Function.Filenames[*I])
- return I;
- return None;
+static Optional<unsigned> findMainViewFileID(const FunctionRecord &Function) {
+ SmallBitVector IsNotExpandedFile(Function.Filenames.size(), true);
+ for (const auto &CR : Function.CountedRegions)
+ if (CR.Kind == CounterMappingRegion::ExpansionRegion)
+ IsNotExpandedFile[CR.ExpandedFileID] = false;
+ int I = IsNotExpandedFile.find_first();
+ if (I == -1)
+ return None;
+ return I;
}
/// Sort a nested sequence of regions from a single file.
@@ -418,11 +422,13 @@ CoverageData CoverageMapping::getCoverag
for (const auto &Function : Functions) {
auto MainFileID = findMainViewFileID(Filename, Function);
+ if (!MainFileID)
+ continue;
auto FileIDs = gatherFileIDs(Filename, Function);
for (const auto &CR : Function.CountedRegions)
if (FileIDs.test(CR.FileID)) {
Regions.push_back(CR);
- if (MainFileID && isExpansion(CR, *MainFileID))
+ if (isExpansion(CR, *MainFileID))
FileCoverage.Expansions.emplace_back(CR, Function);
}
}
Removed: llvm/trunk/test/tools/llvm-cov/Inputs/prevent_false_instantiations.covmapping
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-cov/Inputs/prevent_false_instantiations.covmapping?rev=266457&view=auto
==============================================================================
Binary files llvm/trunk/test/tools/llvm-cov/Inputs/prevent_false_instantiations.covmapping (original) and llvm/trunk/test/tools/llvm-cov/Inputs/prevent_false_instantiations.covmapping (removed) differ
Removed: llvm/trunk/test/tools/llvm-cov/Inputs/prevent_false_instantiations.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-cov/Inputs/prevent_false_instantiations.cpp?rev=266457&view=auto
==============================================================================
--- llvm/trunk/test/tools/llvm-cov/Inputs/prevent_false_instantiations.cpp (original)
+++ llvm/trunk/test/tools/llvm-cov/Inputs/prevent_false_instantiations.cpp (removed)
@@ -1,15 +0,0 @@
-#include "prevent_false_instantiations.h"
-
-void func1() {
- DO_SOMETHING();
-}
-
-void func2() {
- DO_SOMETHING();
-}
-
-int main() {
- func1();
- func2();
- return 0;
-}
Removed: llvm/trunk/test/tools/llvm-cov/Inputs/prevent_false_instantiations.proftext
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-cov/Inputs/prevent_false_instantiations.proftext?rev=266457&view=auto
==============================================================================
--- llvm/trunk/test/tools/llvm-cov/Inputs/prevent_false_instantiations.proftext (original)
+++ llvm/trunk/test/tools/llvm-cov/Inputs/prevent_false_instantiations.proftext (removed)
@@ -1,26 +0,0 @@
-_Z5func1v
-# Func Hash:
-3
-# Num Counters:
-2
-# Counter Values:
-1
-0
-
-_Z5func2v
-# Func Hash:
-3
-# Num Counters:
-2
-# Counter Values:
-1
-0
-
-main
-# Func Hash:
-0
-# Num Counters:
-1
-# Counter Values:
-1
-
Modified: llvm/trunk/test/tools/llvm-cov/lit.local.cfg
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-cov/lit.local.cfg?rev=266458&r1=266457&r2=266458&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-cov/lit.local.cfg (original)
+++ llvm/trunk/test/tools/llvm-cov/lit.local.cfg Fri Apr 15 12:53:48 2016
@@ -1 +1 @@
-config.suffixes = ['.test', '.m', '.cpp', '.c', '.h']
+config.suffixes = ['.test', '.m', '.cpp', '.c']
Removed: llvm/trunk/test/tools/llvm-cov/prevent_false_instantiations.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-cov/prevent_false_instantiations.h?rev=266457&view=auto
==============================================================================
--- llvm/trunk/test/tools/llvm-cov/prevent_false_instantiations.h (original)
+++ llvm/trunk/test/tools/llvm-cov/prevent_false_instantiations.h (removed)
@@ -1,10 +0,0 @@
-// Checks that function instantiations don't go to a wrong file.
-
-// CHECK-NOT: {{_Z5func[1,2]v}}
-
-// RUN: llvm-profdata merge %S/Inputs/prevent_false_instantiations.proftext -o %t.profdata
-// RUN: llvm-cov show %S/Inputs/prevent_false_instantiations.covmapping -instr-profile %t.profdata -filename-equivalence %s | FileCheck %s
-
-#define DO_SOMETHING() \
- do { \
- } while (0)
Modified: llvm/trunk/unittests/ProfileData/CoverageMappingTest.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/ProfileData/CoverageMappingTest.cpp?rev=266458&r1=266457&r2=266458&view=diff
==============================================================================
--- llvm/trunk/unittests/ProfileData/CoverageMappingTest.cpp (original)
+++ llvm/trunk/unittests/ProfileData/CoverageMappingTest.cpp Fri Apr 15 12:53:48 2016
@@ -454,44 +454,6 @@ TEST_P(MaybeSparseCoverageMappingTest, s
ASSERT_EQ("func", Names[0]);
}
-TEST_P(MaybeSparseCoverageMappingTest, dont_detect_false_instantiations) {
- InstrProfRecord Record1("foo", 0x1234, {10});
- InstrProfRecord Record2("bar", 0x2345, {20});
- ProfileWriter.addRecord(std::move(Record1));
- ProfileWriter.addRecord(std::move(Record2));
-
- startFunction("foo", 0x1234);
- addCMR(Counter::getCounter(0), "expanded", 1, 1, 1, 10);
- addExpansionCMR("main", "expanded", 4, 1, 4, 5);
-
- startFunction("bar", 0x2345);
- addCMR(Counter::getCounter(0), "expanded", 1, 1, 1, 10);
- addExpansionCMR("main", "expanded", 9, 1, 9, 5);
-
- loadCoverageMapping();
-
- std::vector<const FunctionRecord *> Instantiations =
- LoadedCoverage->getInstantiations("expanded");
- ASSERT_TRUE(Instantiations.empty());
-}
-
-TEST_P(MaybeSparseCoverageMappingTest, load_coverage_for_expanded_file) {
- InstrProfRecord Record("func", 0x1234, {10});
- ProfileWriter.addRecord(std::move(Record));
-
- startFunction("func", 0x1234);
- addCMR(Counter::getCounter(0), "expanded", 1, 1, 1, 10);
- addExpansionCMR("main", "expanded", 4, 1, 4, 5);
-
- loadCoverageMapping();
-
- CoverageData Data = LoadedCoverage->getCoverageForFile("expanded");
- std::vector<CoverageSegment> Segments(Data.begin(), Data.end());
- ASSERT_EQ(2U, Segments.size());
- EXPECT_EQ(CoverageSegment(1, 1, 10, true), Segments[0]);
- EXPECT_EQ(CoverageSegment(1, 10, false), Segments[1]);
-}
-
INSTANTIATE_TEST_CASE_P(MaybeSparse, MaybeSparseCoverageMappingTest,
::testing::Bool());
More information about the llvm-commits
mailing list