From fd55f565498647851d08f10ecb8c4aac48687447 Mon Sep 17 00:00:00 2001 From: Alex Lorenz Date: Wed, 20 Aug 2014 17:11:53 +0000 Subject: [PATCH] Coverage mapping: fix mapping for objective-c for statement git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@216082 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CodeGen/CoverageMappingGen.cpp | 1 + test/CoverageMapping/objc.m | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/lib/CodeGen/CoverageMappingGen.cpp b/lib/CodeGen/CoverageMappingGen.cpp index 4c5f375116..86e2be8fbe 100644 --- a/lib/CodeGen/CoverageMappingGen.cpp +++ b/lib/CodeGen/CoverageMappingGen.cpp @@ -836,6 +836,7 @@ struct CounterCoverageMappingBuilder // Counter tracks the body of the loop. RegionMapper Cnt(this, S); BreakContinueStack.push_back(BreakContinue()); + Cnt.beginRegion(); VisitSubStmtRBraceState(S->getBody()); BreakContinue BC = BreakContinueStack.pop_back_val(); Cnt.adjustForControlFlow(); diff --git a/test/CoverageMapping/objc.m b/test/CoverageMapping/objc.m index e14caa9bdb..b41ab94ccf 100644 --- a/test/CoverageMapping/objc.m +++ b/test/CoverageMapping/objc.m @@ -9,3 +9,21 @@ void func(A *a) { // CHECK-NEXT: File 0, [[@LINE]]:17 -> [[@LINE+3]]:2 = #0 if (a) [a bork: 20 ]; // CHECK-NEXT: File 0, [[@LINE]]:5 -> [[@LINE]]:20 = #1 (HasCodeBefore = 0) } + +@interface NSArray ++ (NSArray*) arrayWithObjects: (id) first, ...; +- (unsigned) count; +@end + + // CHECK: func2 +void func2(NSArray *array) { // CHECK-NEXT: File 0, [[@LINE]]:28 -> [[@LINE+10]]:2 = #0 (HasCodeBefore = 0) + int i = 0; + for (NSArray *x in array) { // CHECK-NEXT: File 0, [[@LINE]]:29 -> [[@LINE+6]]:4 = #1 (HasCodeBefore = 0) + if (x) { // CHECK-NEXT: File 0, [[@LINE]]:12 -> [[@LINE+2]]:6 = #2 (HasCodeBefore = 0) + i = 1; + } else { // CHECK-NEXT: File 0, [[@LINE]]:12 -> [[@LINE+2]]:6 = (#1 - #2) (HasCodeBefore = 0) + i = -1; + } + } + i = 0; +} -- 2.40.0