Author: vedantk Date: Wed May 30 16:35:44 2018 New Revision: 333609 URL: http://llvm.org/viewvc/llvm-project?rev=333609&view=rev Log: [Coverage] Discard the last uncompleted deferred region in a decl
Discard the last uncompleted deferred region in a decl, if one exists. This prevents lines at the end of a function containing only whitespace or closing braces from being marked as uncovered, if they follow a region terminator (return/break/etc). The previous behavior was to heuristically complete deferred regions at the end of a decl. In practice this ended up being too brittle for too little gain. Users would complain that there was no way to reach full code coverage because whitespace at the end of a function would be marked uncovered. rdar://40238228 Differential Revision: https://reviews.llvm.org/D46918 Modified: cfe/trunk/lib/CodeGen/CoverageMappingGen.cpp cfe/trunk/test/CoverageMapping/deferred-region.cpp cfe/trunk/test/CoverageMapping/label.cpp cfe/trunk/test/CoverageMapping/moremacros.c cfe/trunk/test/CoverageMapping/trycatch.cpp Modified: cfe/trunk/lib/CodeGen/CoverageMappingGen.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CoverageMappingGen.cpp?rev=333609&r1=333608&r2=333609&view=diff ============================================================================== --- cfe/trunk/lib/CodeGen/CoverageMappingGen.cpp (original) +++ cfe/trunk/lib/CodeGen/CoverageMappingGen.cpp Wed May 30 16:35:44 2018 @@ -834,22 +834,6 @@ struct CounterCoverageMappingBuilder handleFileExit(getEnd(S)); } - /// Determine whether the final deferred region emitted in \p Body should be - /// discarded. - static bool discardFinalDeferredRegionInDecl(Stmt *Body) { - if (auto *CS = dyn_cast<CompoundStmt>(Body)) { - Stmt *LastStmt = CS->body_back(); - if (auto *IfElse = dyn_cast<IfStmt>(LastStmt)) { - if (auto *Else = dyn_cast_or_null<CompoundStmt>(IfElse->getElse())) - LastStmt = Else->body_back(); - else - LastStmt = IfElse->getElse(); - } - return dyn_cast_or_null<ReturnStmt>(LastStmt); - } - return false; - } - void VisitDecl(const Decl *D) { assert(!DeferredRegion && "Deferred region never completed"); @@ -859,17 +843,13 @@ struct CounterCoverageMappingBuilder if (Body && SM.isInSystemHeader(SM.getSpellingLoc(getStart(Body)))) return; - Counter ExitCount = propagateCounts(getRegionCounter(Body), Body); + propagateCounts(getRegionCounter(Body), Body); assert(RegionStack.empty() && "Regions entered but never exited"); - if (DeferredRegion) { - // Complete (or discard) any deferred regions introduced by the last - // statement. - if (discardFinalDeferredRegionInDecl(Body)) - DeferredRegion = None; - else - popRegions(completeDeferred(ExitCount, getEnd(Body))); - } + // Discard the last uncompleted deferred region in a decl, if one exists. + // This prevents lines at the end of a function containing only whitespace + // or closing braces from being marked as uncovered. + DeferredRegion = None; } void VisitReturnStmt(const ReturnStmt *S) { Modified: cfe/trunk/test/CoverageMapping/deferred-region.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CoverageMapping/deferred-region.cpp?rev=333609&r1=333608&r2=333609&view=diff ============================================================================== --- cfe/trunk/test/CoverageMapping/deferred-region.cpp (original) +++ cfe/trunk/test/CoverageMapping/deferred-region.cpp Wed May 30 16:35:44 2018 @@ -7,11 +7,12 @@ void foo(int x) { if (x == 0) { return; - } // CHECK: Gap,File 0, [[@LINE]]:4 -> [[@LINE+2]]:2 = (#0 - #1) - + } // CHECK-NOT: Gap,File 0, [[@LINE]]:4 + //< Don't complete the last deferred region in a decl, even though it may + //< leave some whitespace marked with the same counter as the final return. } -// CHECK-NEXT: _Z4foooi: +// CHECK-LABEL: _Z4foooi: void fooo(int x) { if (x == 0) { return; @@ -19,7 +20,7 @@ void fooo(int x) { if (x == 1) { return; - } // CHECK: Gap,File 0, [[@LINE]]:4 -> [[@LINE+2]]:2 = ((#0 - #1) - #2) + } // CHECK-NOT: Gap,File 0, [[@LINE]]:4 } @@ -108,7 +109,7 @@ void weird_if() { } if (false) - return; // CHECK: Gap,File 0, [[@LINE]]:11 -> [[@LINE+1]]:2 + return; // CHECK-NOT: Gap,File 0, [[@LINE]]:11 } // CHECK-LABEL: _Z8for_loopv: @@ -167,7 +168,18 @@ void gotos() { return; // CHECK: [[@LINE]]:3 -> [[@LINE+4]]:2 = (#0 - #1) out: - return; // CHECK: Gap,File 0, [[@LINE]]:8 -> [[@LINE+1]]:2 = 0 + return; // CHECK-NOT: Gap,File 0, [[@LINE]]:8 +} + +// CHECK-LABEL: _Z8switchesv: +void switches() { + int x; + switch (x) { + case 0: + return; + default: + return; // CHECK-NOT: Gap,File 0, [[@LINE]] + } } #include "deferred-region-helper.h" Modified: cfe/trunk/test/CoverageMapping/label.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CoverageMapping/label.cpp?rev=333609&r1=333608&r2=333609&view=diff ============================================================================== --- cfe/trunk/test/CoverageMapping/label.cpp (original) +++ cfe/trunk/test/CoverageMapping/label.cpp Wed May 30 16:35:44 2018 @@ -16,11 +16,10 @@ void func() { // CHECK-NE goto x; // CHECK: File 0, [[@LINE]]:7 -> [[@LINE]]:13 = (#1 - #2) int k = 3; // CHECK-NEXT: File 0, [[@LINE-1]]:13 -> [[@LINE]]:5 = #3 } // CHECK-NEXT: File 0, [[@LINE-1]]:5 -> [[@LINE]]:4 = #3 - static int j = 0; // CHECK-NEXT: File 0, [[@LINE]]:3 -> [[@LINE+5]]:2 = ((#0 + #3) - #1) + static int j = 0; // CHECK-NEXT: File 0, [[@LINE]]:3 -> [[@LINE+4]]:2 = ((#0 + #3) - #1) ++j; if(j == 1) // CHECK-NEXT: File 0, [[@LINE]]:6 -> [[@LINE]]:12 = ((#0 + #3) - #1) goto x; // CHECK: File 0, [[@LINE]]:5 -> [[@LINE]]:11 = #4 - // CHECK-NEXT: File 0, [[@LINE-1]]:11 -> [[@LINE+1]]:2 = (((#0 + #3) - #1) - #4) } // CHECK-NEXT: test1 @@ -28,7 +27,7 @@ void test1(int x) { // CHECK-NE if(x == 0) // CHECK-NEXT: File 0, [[@LINE]]:6 -> [[@LINE]]:12 = #0 goto a; // CHECK: File 0, [[@LINE]]:5 -> [[@LINE]]:11 = #1 // CHECK-NEXT: File 0, [[@LINE-1]]:11 -> [[@LINE+1]]:3 = (#0 - #1) - goto b; // CHECK: Gap,File 0, [[@LINE]]:3 -> [[@LINE+5]]:2 = #3 + goto b; // CHECK: File 0, [[@LINE]]:3 -> [[@LINE+5]]:2 = (#0 - #1) // CHECK-NEXT: Gap,File 0, [[@LINE-1]]:9 -> [[@LINE+1]]:1 = #2 a: // CHECK-NEXT: File 0, [[@LINE]]:1 -> [[@LINE+3]]:2 = #2 b: // CHECK-NEXT: File 0, [[@LINE]]:1 -> [[@LINE+2]]:2 = #3 Modified: cfe/trunk/test/CoverageMapping/moremacros.c URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CoverageMapping/moremacros.c?rev=333609&r1=333608&r2=333609&view=diff ============================================================================== --- cfe/trunk/test/CoverageMapping/moremacros.c (original) +++ cfe/trunk/test/CoverageMapping/moremacros.c Wed May 30 16:35:44 2018 @@ -31,7 +31,7 @@ int main(int argc, const char *argv[]) { if (!argc) { return 0; // CHECK-NEXT: Expansion,File 0, [[@LINE+1]]:3 -> [[@LINE+1]]:8 = #4 - RBRAC // CHECK-NEXT: [[@LINE]]:8 -> [[@LINE+1]]:2 = (((#0 - #2) - #3) - #4) + RBRAC } // CHECK-NEXT: File 1, 3:15 -> 3:16 = #2 Modified: cfe/trunk/test/CoverageMapping/trycatch.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CoverageMapping/trycatch.cpp?rev=333609&r1=333608&r2=333609&view=diff ============================================================================== --- cfe/trunk/test/CoverageMapping/trycatch.cpp (original) +++ cfe/trunk/test/CoverageMapping/trycatch.cpp Wed May 30 16:35:44 2018 @@ -18,7 +18,7 @@ void func(int i) { // // CHECK: File 0, [[@LINE+1]]:10 -> [[@LINE+2]]:27 = (#0 - #1) } else if(i == 8) // CHECK-NEXT: File 0, [[@LINE]]:13 -> [[@LINE]]:19 = (#0 - #1) throw ImportantError(); // CHECK: File 0, [[@LINE]]:5 -> [[@LINE]]:27 = #2 -} // CHECK-NEXT: File 0, [[@LINE-1]]:27 -> [[@LINE]]:2 = ((#0 - #1) - #2) +} // CHECK-NEXT: main int main() { // CHECK-NEXT: File 0, [[@LINE]]:12 -> [[@LINE+13]]:2 = #0 _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits