Skip to content

Commit 3cfb730

Browse files
committed
Relax internal/private checks in coverage IR test
Since https://reviews.llvm.org/D103355 this will usually also use internal rather than private on Windows as well. We don't particularly care about this implementation detail, just accept either.
1 parent 6a454ed commit 3cfb730

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

src/test/run-make-fulldeps/coverage-llvmir/Makefile

-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ DEFINE_INTERNAL=define internal
2222
ifdef IS_WINDOWS
2323
LLVM_FILECHECK_OPTIONS=\
2424
-check-prefixes=CHECK,WINDOWS \
25-
-DPRIVATE_GLOBAL='internal global' \
2625
-DDEFINE_INTERNAL='$(DEFINE_INTERNAL)' \
2726
-DCOMDAT_IF_SUPPORTED='$(COMDAT_IF_SUPPORTED)' \
2827
-DINSTR_PROF_DATA='.lprfd$$M' \
@@ -36,7 +35,6 @@ ifdef IS_WINDOWS
3635
else
3736
LLVM_FILECHECK_OPTIONS=\
3837
-check-prefixes=CHECK \
39-
-DPRIVATE_GLOBAL='private global' \
4038
-DDEFINE_INTERNAL='$(DEFINE_INTERNAL)' \
4139
-DCOMDAT_IF_SUPPORTED='$(COMDAT_IF_SUPPORTED)' \
4240
-DINSTR_PROF_DATA='$(DATA_SECTION_PREFIX)__llvm_prf_data$(INSTR_PROF_DATA_SUFFIX)' \

src/test/run-make-fulldeps/coverage-llvmir/filecheck.testprog.txt

+4-4
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,17 @@ CHECK-SAME: section "[[INSTR_PROF_COVMAP]]", align 8
1111

1212
WINDOWS: @__llvm_profile_runtime = external global i32
1313

14-
CHECK: @__profc__R{{[a-zA-Z0-9_]+}}testprog14will_be_called = [[PRIVATE_GLOBAL]]
14+
CHECK: @__profc__R{{[a-zA-Z0-9_]+}}testprog14will_be_called = {{private|internal}} global
1515
CHECK-SAME: section "[[INSTR_PROF_CNTS]]"{{.*}}, align 8
1616

17-
CHECK: @__profd__R{{[a-zA-Z0-9_]+}}testprog14will_be_called = [[PRIVATE_GLOBAL]]
17+
CHECK: @__profd__R{{[a-zA-Z0-9_]+}}testprog14will_be_called = {{private|internal}} global
1818
CHECK-SAME: @__profc__R{{[a-zA-Z0-9_]+}}testprog14will_be_called,
1919
CHECK-SAME: section "[[INSTR_PROF_DATA]]"{{.*}}, align 8
2020

21-
CHECK: @__profc__R{{[a-zA-Z0-9_]+}}testprog4main = [[PRIVATE_GLOBAL]]
21+
CHECK: @__profc__R{{[a-zA-Z0-9_]+}}testprog4main = {{private|internal}} global
2222
CHECK-SAME: section "[[INSTR_PROF_CNTS]]"{{.*}}, align 8
2323

24-
CHECK: @__profd__R{{[a-zA-Z0-9_]+}}testprog4main = [[PRIVATE_GLOBAL]]
24+
CHECK: @__profd__R{{[a-zA-Z0-9_]+}}testprog4main = {{private|internal}} global
2525
CHECK-SAME: @__profc__R{{[a-zA-Z0-9_]+}}testprog4main,
2626
CHECK-SAME: section "[[INSTR_PROF_DATA]]"{{.*}}, align 8
2727

0 commit comments

Comments
 (0)