From 9d2a16b9b19bb3c63f7cba894fa1043b1487768d Mon Sep 17 00:00:00 2001 From: Vedant Kumar Date: Fri, 14 Oct 2016 23:38:16 +0000 Subject: [Coverage] Support for C++17 if initializers Differential Revision: https://reviews.llvm.org/D25572 llvm-svn: 284293 --- clang/test/CoverageMapping/if.c | 28 -------------------- clang/test/CoverageMapping/if.cpp | 39 ++++++++++++++++++++++++++++ clang/test/Profile/cxx-stmt-initializers.cpp | 12 +++++++++ 3 files changed, 51 insertions(+), 28 deletions(-) delete mode 100644 clang/test/CoverageMapping/if.c create mode 100644 clang/test/CoverageMapping/if.cpp (limited to 'clang/test') diff --git a/clang/test/CoverageMapping/if.c b/clang/test/CoverageMapping/if.c deleted file mode 100644 index 69544f68cfe..00000000000 --- a/clang/test/CoverageMapping/if.c +++ /dev/null @@ -1,28 +0,0 @@ -// RUN: %clang_cc1 -fprofile-instrument=clang -fcoverage-mapping -dump-coverage-mapping -emit-llvm-only -main-file-name if.c %s | FileCheck %s - -int main() { // CHECK: File 0, [[@LINE]]:12 -> {{[0-9]+}}:2 = #0 - int i = 0; - // CHECK-NEXT: File 0, [[@LINE+1]]:6 -> [[@LINE+1]]:12 = #0 - if(i == 0) i = 1; // CHECK-NEXT: File 0, [[@LINE]]:14 -> [[@LINE]]:19 = #1 - // CHECK-NEXT: File 0, [[@LINE+1]]:6 -> [[@LINE+1]]:12 = #0 - if(i == 1) - i = 2; // CHECK-NEXT: File 0, [[@LINE]]:5 -> [[@LINE]]:10 = #2 - // CHECK-NEXT: File 0, [[@LINE+1]]:6 -> [[@LINE+1]]:12 = #0 - if(i == 0) { i = 1; // CHECK-NEXT: File 0, [[@LINE]]:14 -> [[@LINE+2]]:4 = #3 - i = 2; - } - // CHECK-NEXT: File 0, [[@LINE+1]]:6 -> [[@LINE+1]]:12 = #0 - if(i != 0) { // CHECK-NEXT: File 0, [[@LINE]]:14 -> [[@LINE+2]]:4 = #4 - i = 1; - } else { // CHECK-NEXT: File 0, [[@LINE]]:10 -> [[@LINE+2]]:4 = (#0 - #4) - i = 3; - } - - i = i == 0? - i + 1 : // CHECK-NEXT: File 0, [[@LINE]]:9 -> [[@LINE]]:14 = #5 - i + 2; // CHECK-NEXT: File 0, [[@LINE]]:9 -> [[@LINE]]:14 = (#0 - #5) - // CHECK-NEXT: File 0, [[@LINE+1]]:14 -> [[@LINE+1]]:20 = #6 - i = i == 0?i + 12:i + 10; // CHECK-NEXT: File 0, [[@LINE]]:21 -> [[@LINE]]:27 = (#0 - #6) - - return 0; -} diff --git a/clang/test/CoverageMapping/if.cpp b/clang/test/CoverageMapping/if.cpp new file mode 100644 index 00000000000..95e6d8abe63 --- /dev/null +++ b/clang/test/CoverageMapping/if.cpp @@ -0,0 +1,39 @@ +// RUN: %clang_cc1 -fprofile-instrument=clang -fcoverage-mapping -dump-coverage-mapping -emit-llvm-only -std=c++1z -triple %itanium_abi_triple -main-file-name if.cpp %s | FileCheck %s + +int nop() { return 0; } + +// CHECK-LABEL: _Z3foov: +void foo() { // CHECK-NEXT: [[@LINE]]:12 -> [[@LINE+5]]:2 = #0 + if (int j = true ? nop() // CHECK-NEXT: [[@LINE]]:22 -> [[@LINE]]:27 = #2 + : nop(); // CHECK-NEXT: [[@LINE]]:22 -> [[@LINE]]:27 = (#0 - #2) + j) // CHECK-NEXT: [[@LINE]]:7 -> [[@LINE]]:8 = #0 + ++j; // CHECK-NEXT: [[@LINE]]:5 -> [[@LINE]]:8 = #1 +} + +// CHECK-LABEL: main: +int main() { // CHECK: File 0, [[@LINE]]:12 -> {{[0-9]+}}:2 = #0 + int i = 0; + // CHECK-NEXT: File 0, [[@LINE+1]]:6 -> [[@LINE+1]]:12 = #0 + if(i == 0) i = 1; // CHECK-NEXT: File 0, [[@LINE]]:14 -> [[@LINE]]:19 = #1 + // CHECK-NEXT: File 0, [[@LINE+1]]:6 -> [[@LINE+1]]:12 = #0 + if(i == 1) + i = 2; // CHECK-NEXT: File 0, [[@LINE]]:5 -> [[@LINE]]:10 = #2 + // CHECK-NEXT: File 0, [[@LINE+1]]:6 -> [[@LINE+1]]:12 = #0 + if(i == 0) { i = 1; // CHECK-NEXT: File 0, [[@LINE]]:14 -> [[@LINE+2]]:4 = #3 + i = 2; + } + // CHECK-NEXT: File 0, [[@LINE+1]]:6 -> [[@LINE+1]]:12 = #0 + if(i != 0) { // CHECK-NEXT: File 0, [[@LINE]]:14 -> [[@LINE+2]]:4 = #4 + i = 1; + } else { // CHECK-NEXT: File 0, [[@LINE]]:10 -> [[@LINE+2]]:4 = (#0 - #4) + i = 3; + } + + i = i == 0? + i + 1 : // CHECK-NEXT: File 0, [[@LINE]]:9 -> [[@LINE]]:14 = #5 + i + 2; // CHECK-NEXT: File 0, [[@LINE]]:9 -> [[@LINE]]:14 = (#0 - #5) + // CHECK-NEXT: File 0, [[@LINE+1]]:14 -> [[@LINE+1]]:20 = #6 + i = i == 0?i + 12:i + 10; // CHECK-NEXT: File 0, [[@LINE]]:21 -> [[@LINE]]:27 = (#0 - #6) + + return 0; +} diff --git a/clang/test/Profile/cxx-stmt-initializers.cpp b/clang/test/Profile/cxx-stmt-initializers.cpp index 0e3d54449ab..44f7edd276f 100644 --- a/clang/test/Profile/cxx-stmt-initializers.cpp +++ b/clang/test/Profile/cxx-stmt-initializers.cpp @@ -4,6 +4,7 @@ // RUN: FileCheck --input-file=%tgen -check-prefix=CHECK -check-prefix=PGOGEN %s // PGOGEN: @[[SIC:__profc__Z11switch_initv]] = private global [3 x i64] zeroinitializer +// PGOGEN: @[[IIC:__profc__Z7if_initv]] = private global [3 x i64] zeroinitializer // Note: We expect counters for the function entry block, the condition in the // switch initializer, and the switch successor block. @@ -15,3 +16,14 @@ void switch_init() { // PGOGEN: store {{.*}} @[[SIC]], i64 0, i64 2 // PGOGEN: store {{.*}} @[[SIC]], i64 0, i64 1 } + +// Note: We expect counters for the function entry block, the condition in the +// if initializer, and the if successor block. +// +// CHECK-LABEL: define {{.*}}void @_Z7if_initv() +// PGOGEN: store {{.*}} @[[IIC]], i64 0, i64 0 +void if_init() { + if (int i = true ? 0 : 1; i) {} + // PGOGEN: store {{.*}} @[[IIC]], i64 0, i64 2 + // PGOGEN: store {{.*}} @[[IIC]], i64 0, i64 1 +} -- cgit v1.2.3