llvmorg-github-actions[bot] wrote:
<!--LLVM PR SUMMARY COMMENT-->
@llvm/pr-subscribers-testing-tools
Author: Joel E. Denny (jdenny-ornl)
<details>
<summary>Changes</summary>
For example, this patch adds the "for" and "at" annotations below:
```
Input was:
<<<<<<
1: offload triples:
check:2'0 { search range start (exclusive)
check:2'1 error: no match found
check:2'2 for: CHECK: nvptx64-nvidia-cuda
check:2'3 at: /tmp/check.txt:2
2: - amdgcn-amd-amdhsa
3: - x86_64-linux-gnu
4: - x86_64-unknown-linux-gnu
.
.
.
14: - x86_64-linux-android
15:
16: host triples:
check:2'4 } search range end (exclusive)
17: - nvptx64-nvidia-cuda
18: - x86_64-linux-gnu
.
.
.
>>>>>>
```
This change was previously discussed at:
- <https://reviews.llvm.org/D83650#<!-- -->2146534>
-
<https://github.com/llvm/llvm-project/issues/77257#issuecomment-4276117811>
-
<https://github.com/llvm/llvm-project/issues/77257#issuecomment-4314101143>
This patch adds the new annotations only for errors. If people feel that
quoting the patterns for all successful FileCheck directives is worthwhile, we
could pursue that in a subsequent patch. However, that might be too verbose,
even with `-vv`. If that much info is needed while debugging, the user should
probably go ahead and open the check file, and annotation labels (e.g.,
"check:2") already indicate where to look up patterns.
---
Patch is 96.06 KiB, truncated to 20.00 KiB below, full version:
https://github.com/llvm/llvm-project/pull/207486.diff
14 Files Affected:
- (modified) llvm/test/FileCheck/dump-input/annotations.txt (+106-39)
- (modified) llvm/test/FileCheck/dump-input/color.txt (+14-7)
- (modified) llvm/test/FileCheck/dump-input/context.txt (+52-33)
- (modified) llvm/test/FileCheck/dump-input/enable.txt (+17-14)
- (modified) llvm/test/FileCheck/dump-input/filter.txt (+314-290)
- (modified)
llvm/test/FileCheck/dump-input/search-range-annotations/check-label-follows.txt
(+5-3)
- (modified)
llvm/test/FileCheck/dump-input/search-range-annotations/check-next-same.txt
(+10-4)
- (modified)
llvm/test/FileCheck/dump-input/search-range-annotations/check-not.txt (+5-3)
- (modified)
llvm/test/FileCheck/match-time-error-propagation/invalid-excluded-pattern.txt
(+13-8)
- (modified)
llvm/test/FileCheck/match-time-error-propagation/invalid-expected-pattern.txt
(+10-8)
- (modified)
llvm/test/FileCheck/match-time-error-propagation/matched-excluded-pattern.txt
(+12-9)
- (modified)
llvm/test/FileCheck/match-time-error-propagation/matched-expected-pattern.txt
(+12-10)
- (modified) llvm/test/FileCheck/unmatched-substs-captures.txt (+8-5)
- (modified) llvm/utils/FileCheck/FileCheck.cpp (+124-2)
``````````diff
diff --git a/llvm/test/FileCheck/dump-input/annotations.txt
b/llvm/test/FileCheck/dump-input/annotations.txt
index 18ece6b508c5f..213dd529fdaa1 100644
--- a/llvm/test/FileCheck/dump-input/annotations.txt
+++ b/llvm/test/FileCheck/dump-input/annotations.txt
@@ -26,7 +26,7 @@
;
; DEFINE: %{check-fc} = \
; DEFINE: FileCheck -strict-whitespace -match-full-lines %s \
-; DEFINE: -allow-unused-prefixes \
+; DEFINE: -allow-unused-prefixes -DCHK_FILE=%t.chk \
; DEFINE: -implicit-check-not='remark:' -implicit-check-not='error:'
;
; For each case, it is usually best to run these in order of decreasing
@@ -134,10 +134,12 @@
; CHK-V-NEXT:check:1 ^~~~~
; CHK-NEXT:check:2'0 { search range start (exclusive)
; CHK-NEXT:check:2'1 error: no match found in search range
+; CHK-NEXT:check:2'2 for: CHECK: world
+; CHK-NEXT:check:2'3 at: [[CHK_FILE]]:2
; CHK-NEXT: 2: again
; CHK-NEXT: 3: whirled
-; CHK-NEXT:check:2'2 ? possible intended match
-; CHK-NEXT:check:2'3 } search range end (exclusive)
+; CHK-NEXT:check:2'4 ? possible intended match
+; CHK-NEXT:check:2'5 } search range end (exclusive)
; CHK-NEXT:>>>>>>
; CHK-NOT:{{.}}
@@ -168,9 +170,11 @@
; CNT-V-NEXT:count:1'1 ^~~~
; CNT-V-NEXT:count:1'2 { search range start (exclusive)
; CNT-V-NEXT:count:1'3 error: no match found in search range
+; CNT-V-NEXT:count:1'4 for: CHECK-COUNT-3: pete
+; CNT-V-NEXT:count:1'5 at: [[CHK_FILE]]:1
; CNT-V-NEXT: 3: repeat
-; CNT-V-NEXT:count:1'4 ? possible intended match
-; CNT-V-NEXT:count:1'5 } search range end (exclusive)
+; CNT-V-NEXT:count:1'6 ? possible intended match
+; CNT-V-NEXT:count:1'7 } search range end (exclusive)
; CNT-V-NEXT:>>>>>>
; CNT-V-NOT:{{.}}
@@ -179,9 +183,11 @@
; CNT-Q-NEXT: 2: repete
; CNT-Q-NEXT:count:1'0 { search range start (exclusive)
; CNT-Q-NEXT:count:1'1 error: no match found in search range
+; CNT-Q-NEXT:count:1'2 for: CHECK-COUNT-3: pete
+; CNT-Q-NEXT:count:1'3 at: [[CHK_FILE]]:1
; CNT-Q-NEXT: 3: repeat
-; CNT-Q-NEXT:count:1'2 ? possible intended match
-; CNT-Q-NEXT:count:1'3 } search range end (exclusive)
+; CNT-Q-NEXT:count:1'4 ? possible intended match
+; CNT-Q-NEXT:count:1'5 } search range end (exclusive)
; CNT-Q-NEXT:>>>>>>
; CNT-Q-NOT:{{.}}
@@ -213,6 +219,8 @@
; NXT-V-NEXT:next:2 ^~~~~
; NXT-NEXT:next:3'0 { } search range (exclusive bounds)
; NXT-NEXT:next:3'1 error: no match found in search range
+; NXT-NEXT:next:3'2 for: CHECK-NEXT: world
+; NXT-NEXT:next:3'3 at: [[CHK_FILE]]:3
; NXT-NEXT:>>>>>>
; NXT-NOT:{{.}}
@@ -238,7 +246,9 @@
; NXT2-NEXT: 3: yonder
; NXT2-NEXT: 4: world
; NXT2-NEXT:next:3'1 !~~~~ error: match on wrong line
-; NXT2-NEXT:next:3'2 } search range end (exclusive)
+; NXT2-NEXT:next:3'2 for: CHECK-NEXT: world
+; NXT2-NEXT:next:3'3 at: [[CHK_FILE]]:3
+; NXT2-NEXT:next:3'4 } search range end (exclusive)
; NXT2-NEXT:>>>>>>
; NXT2-NOT:{{.}}
@@ -268,6 +278,8 @@
; SAM-V-NEXT:same:2 ^~~~~
; SAM-NEXT:same:3'0 { } search range (exclusive bounds)
; SAM-NEXT:same:3'1 error: no match found in search
range
+; SAM-NEXT:same:3'2 for: CHECK-SAME: again
+; SAM-NEXT:same:3'3 at: [[CHK_FILE]]:3
; SAM-NEXT:>>>>>>
; SAM-NOT:{{.}}
@@ -290,7 +302,9 @@
; SAM2-NEXT:same:3'0 { search range start (exclusive)
; SAM2-NEXT: 2: again
; SAM2-NEXT:same:3'1 !~~~~ error: match on wrong line
-; SAM2-NEXT:same:3'2 } search range end (exclusive)
+; SAM2-NEXT:same:3'2 for: CHECK-SAME: again
+; SAM2-NEXT:same:3'3 at: [[CHK_FILE]]:3
+; SAM2-NEXT:same:3'4 } search range end (exclusive)
; SAM2-NEXT:>>>>>>
; SAM2-NOT:{{.}}
@@ -331,10 +345,12 @@
; EMP-V-NEXT:empty:2 ^
; EMP-NEXT:empty:3'0 { search range start (exclusive)
; EMP-NEXT:empty:3'1 error: no match found in search range
+; EMP-NEXT:empty:3'2 for: CHECK-EMPTY:
+; EMP-NEXT:empty:3'3 at: [[CHK_FILE]]:3
; EMP-NEXT: 3: world
; EMP-NEXT: 4: label
; EMP-V-NEXT:label:4 ^~~~~
-; EMP-NEXT:empty:3'2 } search range end (exclusive)
+; EMP-NEXT:empty:3'4 } search range end (exclusive)
; EMP-NEXT:>>>>>>
; EMP-NOT:{{.}}
@@ -369,9 +385,11 @@
; EMP2-V-NEXT:check:1 ^~~~~
; EMP2-NEXT:empty:2'0 { search range start (exclusive)
; EMP2-NEXT: 2: world
-; EMP2-NEXT:empty:2'2 } search range end (exclusive)
+; EMP2-NEXT:empty:2'4 } search range end (exclusive)
; EMP2-NEXT: 3:
; EMP2-NEXT:empty:2'1 ! error: match on wrong line
+; EMP2-NEXT:empty:2'2 for: CHECK-EMPTY:
+; EMP2-NEXT:empty:2'3 at: [[CHK_FILE]]:2
; EMP2-NEXT:>>>>>>
; EMP2-NOT:{{.}}
@@ -402,9 +420,11 @@
; NOT-NEXT:not:2'0 { search range start (exclusive)
; NOT-NEXT: 2: world
; NOT-NEXT:not:2'1 !~~~~ error: no match expected
+; NOT-NEXT:not:2'2 for: CHECK-NOT: world
+; NOT-NEXT:not:2'3 at: [[CHK_FILE]]:2
; NOT-NEXT: 3: again
; NOT-VV-NEXT:not:1'1 } search range end (exclusive)
-; NOT-NEXT:not:2'2 } search range end (exclusive)
+; NOT-NEXT:not:2'4 } search range end (exclusive)
; NOT-VV-NEXT: 4:
; NOT-VV-NEXT:eof:2 ^
; NOT-NEXT:>>>>>>
@@ -428,10 +448,12 @@
; NOT2-NEXT:not:2'0 { search range start (exclusive)
; NOT2-NEXT: 2: world
; NOT2-NEXT:not:2'1 !~~~~ error: no match expected
+; NOT2-NEXT:not:2'2 for: CHECK-NOT: world
+; NOT2-NEXT:not:2'3 at: [[CHK_FILE]]:2
; NOT2-NEXT: 3: again
; NOT2-V-NEXT:check:3 ^~~
; NOT2-VV-NEXT:not:1'1 } search range end (exclusive)
-; NOT2-NEXT:not:2'2 } search range end (exclusive)
+; NOT2-NEXT:not:2'4 } search range end (exclusive)
; NOT2-NEXT:>>>>>>
; NOT2-NOT:{{.}}
@@ -467,9 +489,11 @@
; DAG-VV-NEXT:dag:4'0 !~~ discard: overlaps earlier match
; DAG-VV-NEXT:dag:4'1 { search range start (exclusive)
; DAG-VV-NEXT:dag:4'2 error: no match found in search range
+; DAG-VV-NEXT:dag:4'3 for: CHECK-DAG: def
+; DAG-VV-NEXT:dag:4'4 at: [[CHK_FILE]]:4
; DAG-VV-NEXT: 3: abc
; DAG-VV-NEXT:dag:3'1 ^~~
-; DAG-VV-NEXT:dag:4'3 } search range end (exclusive)
+; DAG-VV-NEXT:dag:4'5 } search range end (exclusive)
; DAG-VV-NEXT:>>>>>>
; DAG-VV-NOT:{{.}}
@@ -480,9 +504,11 @@
; DAG-VQ-NEXT:dag:1 ^~~
; DAG-VQ-NEXT:dag:4'0 { search range start (exclusive)
; DAG-VQ-NEXT:dag:4'1 error: no match found in search range
+; DAG-VQ-NEXT:dag:4'2 for: CHECK-DAG: def
+; DAG-VQ-NEXT:dag:4'3 at: [[CHK_FILE]]:4
; DAG-VQ-NEXT: 3: abc
; DAG-VQ-NEXT:dag:3 ^~~
-; DAG-VQ-NEXT:dag:4'2 } search range end (exclusive)
+; DAG-VQ-NEXT:dag:4'4 } search range end (exclusive)
; DAG-VQ-NEXT:>>>>>>
; DAG-VQ-NOT:{{.}}
@@ -491,8 +517,10 @@
; DAG-Q-NEXT: 2: def
; DAG-Q-NEXT:dag:4'0 { search range start (exclusive)
; DAG-Q-NEXT:dag:4'1 error: no match found in search range
+; DAG-Q-NEXT:dag:4'2 for: CHECK-DAG: def
+; DAG-Q-NEXT:dag:4'3 at: [[CHK_FILE]]:4
; DAG-Q-NEXT: 3: abc
-; DAG-Q-NEXT:dag:4'2 } search range end (exclusive)
+; DAG-Q-NEXT:dag:4'4 } search range end (exclusive)
; DAG-Q-NEXT:>>>>>>
; DAG-Q-NOT:{{.}}
@@ -529,6 +557,8 @@
; DAG1L-VV-NEXT:dag:5'1 !~~ discard: overlaps earlier
match
; DAG1L-VV-NEXT:dag:5'2 { } search range (exclusive
bounds)
; DAG1L-VV-NEXT:dag:5'3 error: no match found in
search range
+; DAG1L-VV-NEXT:dag:5'4 for: CHECK-DAG: def
+; DAG1L-VV-NEXT:dag:5'5 at: [[CHK_FILE]]:5
; DAG1L-VV-NEXT:>>>>>>
; DAG1L-VV-NOT:{{.}}
@@ -540,6 +570,8 @@
; DAG1L-VQ-NEXT:dag:4 ^~
; DAG1L-VQ-NEXT:dag:5'0 { } search range (exclusive
bounds)
; DAG1L-VQ-NEXT:dag:5'1 error: no match found in
search range
+; DAG1L-VQ-NEXT:dag:5'2 for: CHECK-DAG: def
+; DAG1L-VQ-NEXT:dag:5'3 at: [[CHK_FILE]]:5
; DAG1L-VQ-NEXT:>>>>>>
; DAG1L-VQ-NOT:{{.}}
@@ -547,6 +579,8 @@
; DAG1L-Q-NEXT: 1: abc def abc def
; DAG1L-Q-NEXT:dag:5'0 { } search range (exclusive
bounds)
; DAG1L-Q-NEXT:dag:5'1 error: no match found in
search range
+; DAG1L-Q-NEXT:dag:5'2 for: CHECK-DAG: def
+; DAG1L-Q-NEXT:dag:5'3 at: [[CHK_FILE]]:5
; DAG1L-Q-NEXT:>>>>>>
; DAG1L-Q-NOT:{{.}}
@@ -614,16 +648,20 @@
; LAB-V-NEXT:label:2'1 ^~~~~~
; LAB-V-NEXT:check:3'0 { search range start (exclusive)
; LAB-V-NEXT:check:3'1 error: no match found in search range
+; LAB-V-NEXT:check:3'2 for: CHECK: foobar
+; LAB-V-NEXT:check:3'3 at: [[CHK_FILE]]:3
; LAB-V-NEXT: 3: textA
; LAB-V-NEXT: 4: labelB
; LAB-V-NEXT:label:4 ^~~~~~
-; LAB-V-NEXT:check:3'2 } search range end (exclusive)
+; LAB-V-NEXT:check:3'4 } search range end (exclusive)
; LAB-V-NEXT: 5: textB
; LAB-V-NEXT: 6: labelC
; LAB-V-NEXT:label:6'0 ^~~~~~
; LAB-V-NEXT:check:5 ^~~~~~
; LAB-V-NEXT:label:6'1 {} search range (exclusive bounds)
; LAB-V-NEXT:label:6'2 error: no match found in search range
+; LAB-V-NEXT:label:6'3 for: CHECK-LABEL: labelC
+; LAB-V-NEXT:label:6'4 at: [[CHK_FILE]]:6
; LAB-VV-NEXT:not:7'0 { search range start (exclusive)
; LAB-V-NEXT: 7: textC
; LAB-VV-NEXT:not:7'1 } search range end (exclusive)
@@ -633,7 +671,9 @@
; LAB-V-NEXT:not:9'0 { search range start (exclusive)
; LAB-V-NEXT: 9: textD
; LAB-V-NEXT:not:9'1 !~~~~ error: no match expected
-; LAB-V-NEXT:not:9'2 } search range end (exclusive)
+; LAB-V-NEXT:not:9'2 for: CHECK-NOT: textD
+; LAB-V-NEXT:not:9'3 at: [[CHK_FILE]]:9
+; LAB-V-NEXT:not:9'4 } search range end (exclusive)
; LAB-V-NEXT: 10: labelE
; LAB-V-NEXT:label:10'0 ^~~~~~
; LAB-V-NEXT:label:10'1 ^~~~~~
@@ -651,19 +691,25 @@
; LAB-Q-NEXT: 2: labelA
; LAB-Q-NEXT:check:3'0 { search range start (exclusive)
; LAB-Q-NEXT:check:3'1 error: no match found in search range
+; LAB-Q-NEXT:check:3'2 for: CHECK: foobar
+; LAB-Q-NEXT:check:3'3 at: [[CHK_FILE]]:3
; LAB-Q-NEXT: 3: textA
; LAB-Q-NEXT: 4: labelB
-; LAB-Q-NEXT:check:3'2 } search range end (exclusive)
+; LAB-Q-NEXT:check:3'4 } search range end (exclusive)
; LAB-Q-NEXT: 5: textB
; LAB-Q-NEXT: 6: labelC
; LAB-Q-NEXT:label:6'0 {} search range (exclusive bounds)
; LAB-Q-NEXT:label:6'1 error: no match found in search range
+; LAB-Q-NEXT:label:6'2 for: CHECK-LABEL: labelC
+; LAB-Q-NEXT:label:6'3 at: [[CHK_FILE]]:6
; LAB-Q-NEXT: 7: textC
; LAB-Q-NEXT: 8: labelD
; LAB-Q-NEXT:not:9'0 { search range start (exclusive)
; LAB-Q-NEXT: 9: textD
; LAB-Q-NEXT:not:9'1 !~~~~ error: no match expected
-; LAB-Q-NEXT:not:9'2 } search range end (exclusive)
+; LAB-Q-NEXT:not:9'2 for: CHECK-NOT: textD
+; LAB-Q-NEXT:not:9'3 at: [[CHK_FILE]]:9
+; LAB-Q-NEXT:not:9'4 } search range end (exclusive)
; LAB-Q-NEXT: 10: labelE
; LAB-Q-NEXT: 11: textE
; LAB-Q-NEXT: 12: labelF
@@ -713,6 +759,7 @@
; IMPNOT-VV-NEXT:not:imp2'2 { } search range (exclusive
bounds)
; IMPNOT-VV-NEXT:not:imp3'2 { } search range (exclusive
bounds)
; IMPNOT-VV-NEXT:not:imp3'3 !~~~~ error: no match expected
+; IMPNOT-VV-NEXT:not:imp3'4 for:
-implicit-check-not='again'
; IMPNOT-VV-NEXT:>>>>>>
; IMPNOT-VV-NOT:{{.}}
@@ -723,6 +770,7 @@
; IMPNOT-VQ-NEXT:check:3 ^
; IMPNOT-VQ-NEXT:not:imp3'0 { } search range (exclusive
bounds)
; IMPNOT-VQ-NEXT:not:imp3'1 !~~~~ error: no match expected
+; IMPNOT-VQ-NEXT:not:imp3'2 for:
-implicit-check-not='again'
; IMPNOT-VQ-NEXT:>>>>>>
; IMPNOT-VQ-NOT:{{.}}
@@ -730,6 +778,7 @@
; IMPNOT-Q-NEXT: 1: hello world again!
; IMPNOT-Q-NEXT:not:imp3'0 { } search range (exclusive
bounds)
; IMPNOT-Q-NEXT:not:imp3'1 !~~~~ error: no match expected
+; IMPNOT-Q-NEXT:not:imp3'2 for:
-implicit-check-not='again'
; IMPNOT-Q-NEXT:>>>>>>
; IMPNOT-Q-NOT:{{.}}
@@ -763,12 +812,14 @@
; SUBST-POS-V-NEXT:check:1'2 with "DEF_MATCH2"
equal to "def-match2"
; SUBST-POS-NEXT:check:2'0 { search range start
(exclusive)
; SUBST-POS-NEXT:check:2'1 error: match
failed for invalid pattern
-; SUBST-POS-NEXT:check:2'2 undefined
variable: UNDEF
-; SUBST-POS-NEXT:check:2'3 with "DEF_MATCH1"
equal to "def-match1"
-; SUBST-POS-NEXT:check:2'4 with "DEF_NOMATCH"
equal to "foobar"
+; SUBST-POS-NEXT:check:2'2 for: CHECK:
{{\[}}[DEF_MATCH1]] {{\[}}[UNDEF]] {{\[}}[DEF_NOMATCH]]
+; SUBST-POS-NEXT:check:2'3 at: [[CHK_FILE]]:2
+; SUBST-POS-NEXT:check:2'4 undefined
variable: UNDEF
+; SUBST-POS-NEXT:check:2'5 with "DEF_MATCH1"
equal to "def-match1"
+; SUBST-POS-NEXT:check:2'6 with "DEF_NOMATCH"
equal to "foobar"
; SUBST-POS-NEXT: 2: def-match1 def-nomatch
-; SUBST-POS-NEXT:check:2'5 ? possible intended
match
-; SUBST-POS-NEXT:check:2'6 } search range end
(exclusive)
+; SUBST-POS-NEXT:check:2'7 ? possible intended
match
+; SUBST-POS-NEXT:check:2'8 } search range end
(exclusive)
; SUBST-POS-NEXT:>>>>>>
;--------------------------------------------------
@@ -799,16 +850,20 @@
; SUBST-NEG-NEXT: 1: def-match1 def-nomatch
; SUBST-NEG-NEXT:not:1'0 { search range
start (exclusive)
; SUBST-NEG-NEXT:not:1'1 error: match
failed for invalid pattern
-; SUBST-NEG-NEXT:not:1'2 undefined
variable: UNDEF
-; SUBST-NEG-NEXT:not:1'3 with "DEF_MATCH1"
equal to "def-match1"
-; SUBST-NEG-NEXT:not:1'4 with
"DEF_NOMATCH" equal to "foobar"
+; SUBST-NEG-NEXT:not:1'2 for: CHECK-NOT:
{{\[}}[DEF_MATCH1]] {{\[}}[UNDEF]] {{\[}}[DEF_NOMATCH]]
+; SUBST-NEG-NEXT:not:1'3 at: [[CHK_FILE]]:1
+; SUBST-NEG-NEXT:not:1'4 undefined
variable: UNDEF
+; SUBST-NEG-NEXT:not:1'5 with "DEF_MATCH1"
equal to "def-match1"
+; SUBST-NEG-NEXT:not:1'6 with
"DEF_NOMATCH" equal to "foobar"
; SUBST-NEG-NEXT:not:2'0 { search range
start (exclusive)
; SUBST-NEG-NEXT: 2: def-match1 def-match2
-; SUBST-NEG-NEXT:not:1'5 } search range end
(exclusive)
+; SUBST-NEG-NEXT:not:1'7 } search range end
(exclusive)
; SUBST-NEG-NEXT:not:2'1 !~~~~~~~~~~~~~~~~~~~~ error: no match
expected
-; SUBST-NEG-NEXT:not:2'2 with "DEF_MATCH1"
equal to "def-match1"
-; SUBST-NEG-NEXT:not:2'3 with "DEF_MATCH2"
equal to "def-match2"
-; SUBST-NEG-NEXT:not:2'4 } search range end
(exclusive)
+; SUBST-NEG-NEXT:not:2'2 for: CHECK-NOT:
{{\[}}[DEF_MATCH1]] {{\[}}[DEF_MATCH2]]
+; SUBST-NEG-NEXT:not:2'3 at: [[CHK_FILE]]:2
+; SUBST-NEG-NEXT:not:2'4 with "DEF_MATCH1"
equal to "def-match1"
+; SUBST-NEG-NEXT:not:2'5 with "DEF_MATCH2"
equal to "def-match2"
+; SUBST-NEG-NEXT:not:2'6 } search range end
(exclusive)
; SUBST-NEG-NEXT: 3: END
; SUBST-NEG-V-NEXT:check:3 ^~~
; SUBST-NEG-NEXT:>>>>>>
@@ -864,8 +919,10 @@
; CAPTURE-NEG-NEXT:not:5'0 { search range start
(exclusive)
; CAPTURE-NEG-NEXT: 5: var in neg match: foo
; CAPTURE-NEG-NEXT:not:5'1 !~~~~~~~~~~~~~~~~~~~~ error: no match
expected
-; CAPTURE-NEG-NEXT:not:5'2 !~~ captured var
"VAR"
-; CAPTURE-NEG-NEXT:not:5'3 } search range end
(exclusive)
+; CAPTURE-NEG-NEXT:not:5'2 for: CHECK-NOT:
var in neg match: {{\[}}[VAR:foo]]
+; CAPTURE-NEG-NEXT:not:5'3 at:
[[CHK_FILE]]:5
+; CAPTURE-NEG-NEXT:not:5'4 !~~ captured var
"VAR"
+; CAPTURE-NEG-NEXT:not:5'5 } search range end
(exclusive)
; CAPTURE-NEG-NEXT: 6: END
; CAPTURE-NEG-V-NEXT:check:6 ^~~
; CAPTURE-NEG-NEXT:>>>>>>
@@ -904,7 +961,9 @@
; SUBST_NEXT-V-NEXT:check:1 ^~~
; SUBST_NEXT-NEXT:next:2'0 { } search range (exclusive bounds)
; SUBST_NEXT-NEXT:next:2'1 !~~ error: match on wrong line
-; SUBST_NEXT-V-NEXT:next:2'2 with "VAR" equal to "var"
+; SUBST_NEXT-NEXT:next:2'2 for: CHECK-NEXT: {{\[}}[VAR]]
+; SUBST_NEXT-NEXT:next:2'3 at: [[CHK_FILE]]:2
+; SUBST_NEXT-V-NEXT:next:2'4 with "VAR" equal to "var"
; SUBST_NEXT-NEXT:>>>>>>
;- - - - - - - - - - - - - - - - - - - - - - - - -
@@ -933,8 +992,10 @@
; SUBST_SAME-V-NEXT:same:2'0 { search range start (exclusive)
; SUBST_SAME-V-NEXT: 2: var
; SUBST_SAME-V-NEXT:same:2'1 !~~ error: match on wrong line
-; SUBST_SAME-V-NEXT:same:2'2 with "VAR" equal to "var"
-; SUBST_SAME-V-NEXT:same:2'3 } search range end (exclusive)
+; SUBST_SAME-V-NEXT:same:2'2 for: CHECK-SAME: {{\[}}[VAR]]
+; SUBST_SAME-V-NEXT:same:2'3 at: [[CHK_FILE]]:2
+; SUBST_SAME-V-NEXT:same:2'4 with "VAR" equal to "var"
+; SUBST_SAME-V-NEXT:same:2'5 ...
[truncated]
``````````
</details>
https://github.com/llvm/llvm-project/pull/207486
_______________________________________________
llvm-branch-commits mailing list
[email protected]
https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
