zequanwu created this revision.
zequanwu added reviewers: aaron.ballman, gulfem, hans.
Herald added a project: All.
zequanwu requested review of this revision.
Herald added a project: clang.
Herald added a subscriber: cfe-commits.
This is a split of D147073 <https://reviews.llvm.org/D147073>.
Fixes #45481
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D147569
Files:
clang/lib/CodeGen/CoverageMappingGen.cpp
clang/test/CoverageMapping/if.cpp
Index: clang/test/CoverageMapping/if.cpp
===================================================================
--- clang/test/CoverageMapping/if.cpp
+++ clang/test/CoverageMapping/if.cpp
@@ -1,6 +1,14 @@
-// RUN: %clang_cc1 -mllvm -emptyline-comment-coverage=false
-fprofile-instrument=clang -fcoverage-mapping -dump-coverage-mapping
-emit-llvm-only -std=c++2b -triple %itanium_abi_triple -main-file-name if.cpp
%s | FileCheck %s
+// RUN: %clang_cc1 -fms-extensions -mllvm -emptyline-comment-coverage=false
-fprofile-instrument=clang -fcoverage-mapping -dump-coverage-mapping
-emit-llvm-only -std=c++2b -triple %itanium_abi_triple -main-file-name if.cpp
%s | FileCheck %s
int nop() { return 0; }
+struct S {
+ int i;
+ int putprop(int j) {
+ i = j;
+ return i;
+ }
+ __declspec(property(put = putprop)) int the_prop;
+};
// CHECK-LABEL: _Z3foov:
// CHECK-NEXT: [[@LINE+3]]:12 -> [[@LINE+8]]:2
= #0
@@ -70,7 +78,17 @@
constexpr int c_i = check_consteval(0);
check_consteval(i);
- return 0;
+ // GH-45481
+ S s;
+ s.the_prop = 0? 1 : 2; // CHECK-NEXT: File 0, [[@LINE]]:16 ->
[[@LINE]]:17 = #0
+ // CHECK-NEXT: Branch,File 0, [[@LINE-1]]:16
-> [[@LINE-1]]:17 = 0, 0
+ // CHECK-NEXT: Gap,File 0, [[@LINE-2]]:18 ->
[[@LINE-2]]:19 = #7
+ // CHECK-NEXT: File 0, [[@LINE-3]]:19 ->
[[@LINE-3]]:20 = #7
+ // CHECK-NEXT: File 0, [[@LINE-4]]:23 ->
[[@LINE-4]]:24 = (#0 - #7)
+ if (s.the_prop = 1) { // CHECK-NEXT: File 0, [[@LINE]]:7 ->
[[@LINE]]:21 = #0
+ return 1; // CHECK-NEXT: Branch,File 0, [[@LINE-1]]:7 ->
[[@LINE-1]]:21 = #8, (#0 - #8)
+ } // CHECK-NEXT: Gap,File 0, [[@LINE-2]]:22 ->
[[@LINE-2]]:23 = #8
+ // CHECK-NEXT: File 0, [[@LINE-3]]:23 ->
[[@LINE-1]]:4 = #8
}
#define FOO true
Index: clang/lib/CodeGen/CoverageMappingGen.cpp
===================================================================
--- clang/lib/CodeGen/CoverageMappingGen.cpp
+++ clang/lib/CodeGen/CoverageMappingGen.cpp
@@ -1566,6 +1566,15 @@
// Lambdas are treated as their own functions for now, so we shouldn't
// propagate counts into them.
}
+
+ void VisitPseudoObjectExpr(const PseudoObjectExpr *POE) {
+ // Just visit syntatic expression as this is what users actually write.
+ VisitStmt(POE->getSyntacticForm());
+ }
+
+ void VisitOpaqueValueExpr(const OpaqueValueExpr* OVE) {
+ Visit(OVE->getSourceExpr());
+ }
};
} // end anonymous namespace
Index: clang/test/CoverageMapping/if.cpp
===================================================================
--- clang/test/CoverageMapping/if.cpp
+++ clang/test/CoverageMapping/if.cpp
@@ -1,6 +1,14 @@
-// RUN: %clang_cc1 -mllvm -emptyline-comment-coverage=false -fprofile-instrument=clang -fcoverage-mapping -dump-coverage-mapping -emit-llvm-only -std=c++2b -triple %itanium_abi_triple -main-file-name if.cpp %s | FileCheck %s
+// RUN: %clang_cc1 -fms-extensions -mllvm -emptyline-comment-coverage=false -fprofile-instrument=clang -fcoverage-mapping -dump-coverage-mapping -emit-llvm-only -std=c++2b -triple %itanium_abi_triple -main-file-name if.cpp %s | FileCheck %s
int nop() { return 0; }
+struct S {
+ int i;
+ int putprop(int j) {
+ i = j;
+ return i;
+ }
+ __declspec(property(put = putprop)) int the_prop;
+};
// CHECK-LABEL: _Z3foov:
// CHECK-NEXT: [[@LINE+3]]:12 -> [[@LINE+8]]:2 = #0
@@ -70,7 +78,17 @@
constexpr int c_i = check_consteval(0);
check_consteval(i);
- return 0;
+ // GH-45481
+ S s;
+ s.the_prop = 0? 1 : 2; // CHECK-NEXT: File 0, [[@LINE]]:16 -> [[@LINE]]:17 = #0
+ // CHECK-NEXT: Branch,File 0, [[@LINE-1]]:16 -> [[@LINE-1]]:17 = 0, 0
+ // CHECK-NEXT: Gap,File 0, [[@LINE-2]]:18 -> [[@LINE-2]]:19 = #7
+ // CHECK-NEXT: File 0, [[@LINE-3]]:19 -> [[@LINE-3]]:20 = #7
+ // CHECK-NEXT: File 0, [[@LINE-4]]:23 -> [[@LINE-4]]:24 = (#0 - #7)
+ if (s.the_prop = 1) { // CHECK-NEXT: File 0, [[@LINE]]:7 -> [[@LINE]]:21 = #0
+ return 1; // CHECK-NEXT: Branch,File 0, [[@LINE-1]]:7 -> [[@LINE-1]]:21 = #8, (#0 - #8)
+ } // CHECK-NEXT: Gap,File 0, [[@LINE-2]]:22 -> [[@LINE-2]]:23 = #8
+ // CHECK-NEXT: File 0, [[@LINE-3]]:23 -> [[@LINE-1]]:4 = #8
}
#define FOO true
Index: clang/lib/CodeGen/CoverageMappingGen.cpp
===================================================================
--- clang/lib/CodeGen/CoverageMappingGen.cpp
+++ clang/lib/CodeGen/CoverageMappingGen.cpp
@@ -1566,6 +1566,15 @@
// Lambdas are treated as their own functions for now, so we shouldn't
// propagate counts into them.
}
+
+ void VisitPseudoObjectExpr(const PseudoObjectExpr *POE) {
+ // Just visit syntatic expression as this is what users actually write.
+ VisitStmt(POE->getSyntacticForm());
+ }
+
+ void VisitOpaqueValueExpr(const OpaqueValueExpr* OVE) {
+ Visit(OVE->getSourceExpr());
+ }
};
} // end anonymous namespace
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
