Skip to content

Commit 951b971

Browse files
dpaoliellodpaoliello
committed
Fix test failures
1 parent 082514f commit 951b971

File tree

2 files changed

+23
-23
lines changed

2 files changed

+23
-23
lines changed

‎llvm/test/CodeGen/X86/win64-eh-unwindv2-errors.mir‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
# BESTEFFORT-NOT: SEH_UnwindV2Start
77

88
;--- alloc_no_dealloc.mir
9-
# RUN: not llc -mtriple=x86_64-unknown-windows-msvc -o - \
9+
# RUN: not --crash llc -mtriple=x86_64-pc-windows-msvc -o - \
1010
# RUN: %t/alloc_no_dealloc.mir -run-pass=x86-wineh-unwindv2 2>&1 | \
1111
# RUN: FileCheck %s --check-prefix=ALLOC-NO-DEALLOC
12-
# RUN: llc -mtriple=x86_64-unknown-windows-msvc -o - %t/alloc_no_dealloc.mir \
12+
# RUN: llc -mtriple=x86_64-pc-windows-msvc -o - %t/alloc_no_dealloc.mir \
1313
# RUN: -run-pass=x86-wineh-unwindv2 -x86-wineh-unwindv2-force-mode=1 | \
1414
# RUN: FileCheck %s --check-prefix=BESTEFFORT
1515
# ALLOC-NO-DEALLOC: LLVM ERROR: Windows x64 Unwind v2 is required, but LLVM has generated incompatible code in function 'alloc_no_dealloc':
@@ -36,10 +36,10 @@ body: |
3636
...
3737

3838
;--- missed_push.mir
39-
# RUN: not llc -mtriple=x86_64-unknown-windows-msvc -o - %t/missed_push.mir \
39+
# RUN: not --crash llc -mtriple=x86_64-pc-windows-msvc -o - %t/missed_push.mir \
4040
# RUN: -run-pass=x86-wineh-unwindv2 2>&1 | FileCheck %s \
4141
# RUN: --check-prefix=MISSED-PUSH
42-
# RUN: llc -mtriple=x86_64-unknown-windows-msvc -o - %t/missed_push.mir \
42+
# RUN: llc -mtriple=x86_64-pc-windows-msvc -o - %t/missed_push.mir \
4343
# RUN: -run-pass=x86-wineh-unwindv2 -x86-wineh-unwindv2-force-mode=1 | \
4444
# RUN: FileCheck %s --check-prefix=BESTEFFORT
4545
# MISSED-PUSH: LLVM ERROR: Windows x64 Unwind v2 is required, but LLVM has generated incompatible code in function 'missed_push':
@@ -69,10 +69,10 @@ body: |
6969
...
7070

7171
;--- dealloc_no_alloc.mir
72-
# RUN: not llc -mtriple=x86_64-unknown-windows-msvc -o - \
72+
# RUN: not --crash llc -mtriple=x86_64-pc-windows-msvc -o - \
7373
# RUN: %t/dealloc_no_alloc.mir -run-pass=x86-wineh-unwindv2 2>&1 | \
7474
# RUN: FileCheck %s --check-prefix=DEALLOC-NO-ALLOC
75-
# RUN: llc -mtriple=x86_64-unknown-windows-msvc -o - %t/dealloc_no_alloc.mir \
75+
# RUN: llc -mtriple=x86_64-pc-windows-msvc -o - %t/dealloc_no_alloc.mir \
7676
# RUN: -run-pass=x86-wineh-unwindv2 -x86-wineh-unwindv2-force-mode=1 | \
7777
# RUN: FileCheck %s --check-prefix=BESTEFFORT
7878
# DEALLOC-NO-ALLOC: LLVM ERROR: Windows x64 Unwind v2 is required, but LLVM has generated incompatible code in function 'dealloc_no_alloc':
@@ -98,10 +98,10 @@ body: |
9898
...
9999

100100
;--- double_dealloc.mir
101-
# RUN: not llc -mtriple=x86_64-unknown-windows-msvc -o - %t/double_dealloc.mir \
101+
# RUN: not --crash llc -mtriple=x86_64-pc-windows-msvc -o - %t/double_dealloc.mir \
102102
# RUN: -run-pass=x86-wineh-unwindv2 2>&1 | FileCheck %s \
103103
# RUN: --check-prefix=DOUBLE-DEALLOC
104-
# RUN: llc -mtriple=x86_64-unknown-windows-msvc -o - %t/double_dealloc.mir \
104+
# RUN: llc -mtriple=x86_64-pc-windows-msvc -o - %t/double_dealloc.mir \
105105
# RUN: -run-pass=x86-wineh-unwindv2 -x86-wineh-unwindv2-force-mode=1 | \
106106
# RUN: FileCheck %s --check-prefix=BESTEFFORT
107107
# DOUBLE-DEALLOC: LLVM ERROR: Windows x64 Unwind v2 is required, but LLVM has generated incompatible code in function 'double_dealloc':
@@ -130,10 +130,10 @@ body: |
130130
...
131131

132132
;--- dealloc_after_epilog.mir
133-
# RUN: not llc -mtriple=x86_64-unknown-windows-msvc -o - \
133+
# RUN: not --crash llc -mtriple=x86_64-pc-windows-msvc -o - \
134134
# RUN: %t/dealloc_after_epilog.mir -run-pass=x86-wineh-unwindv2 2>&1 | \
135135
# RUN: FileCheck %s --check-prefix=DEALLOC-AFTER-EPILOG
136-
# RUN: llc -mtriple=x86_64-unknown-windows-msvc -o - \
136+
# RUN: llc -mtriple=x86_64-pc-windows-msvc -o - \
137137
# RUN: %t/dealloc_after_epilog.mir -run-pass=x86-wineh-unwindv2 \
138138
# RUN: -x86-wineh-unwindv2-force-mode=1 | FileCheck %s \
139139
# RUN: --check-prefix=BESTEFFORT
@@ -160,10 +160,10 @@ body: |
160160
...
161161

162162
;--- pop_before_dealloc.mir
163-
# RUN: not llc -mtriple=x86_64-unknown-windows-msvc -o - \
163+
# RUN: not --crash llc -mtriple=x86_64-pc-windows-msvc -o - \
164164
# RUN: %t/pop_before_dealloc.mir -run-pass=x86-wineh-unwindv2 2>&1 | \
165165
# RUN: FileCheck %s --check-prefix=POP-BEFORE-DEALLOC
166-
# RUN: llc -mtriple=x86_64-unknown-windows-msvc -o - %t/pop_before_dealloc.mir \
166+
# RUN: llc -mtriple=x86_64-pc-windows-msvc -o - %t/pop_before_dealloc.mir \
167167
# RUN: -run-pass=x86-wineh-unwindv2 -x86-wineh-unwindv2-force-mode=1 | \
168168
# RUN: FileCheck %s --check-prefix=BESTEFFORT
169169
# POP-BEFORE-DEALLOC: LLVM ERROR: Windows x64 Unwind v2 is required, but LLVM has generated incompatible code in function 'pop_before_dealloc':
@@ -194,10 +194,10 @@ body: |
194194
...
195195

196196
;--- too_many_pops.mir
197-
# RUN: not llc -mtriple=x86_64-unknown-windows-msvc -o - %t/too_many_pops.mir \
197+
# RUN: not --crash llc -mtriple=x86_64-pc-windows-msvc -o - %t/too_many_pops.mir \
198198
# RUN: -run-pass=x86-wineh-unwindv2 2>&1 | FileCheck %s \
199199
# RUN: --check-prefix=TOO-MANY-POPS
200-
# RUN: llc -mtriple=x86_64-unknown-windows-msvc -o - %t/too_many_pops.mir \
200+
# RUN: llc -mtriple=x86_64-pc-windows-msvc -o - %t/too_many_pops.mir \
201201
# RUN: -run-pass=x86-wineh-unwindv2 -x86-wineh-unwindv2-force-mode=1 | \
202202
# RUN: FileCheck %s --check-prefix=BESTEFFORT
203203
# TOO-MANY-POPS: LLVM ERROR: Windows x64 Unwind v2 is required, but LLVM has generated incompatible code in function 'too_many_pops':
@@ -226,10 +226,10 @@ body: |
226226
...
227227

228228
;--- pop_in_wrong_order.mir
229-
# RUN: not llc -mtriple=x86_64-unknown-windows-msvc -o - \
229+
# RUN: not --crash llc -mtriple=x86_64-pc-windows-msvc -o - \
230230
# RUN: %t/pop_in_wrong_order.mir -run-pass=x86-wineh-unwindv2 2>&1 | \
231231
# RUN: FileCheck %s --check-prefix=POP-WRONG-ORDER
232-
# RUN: llc -mtriple=x86_64-unknown-windows-msvc -o - %t/pop_in_wrong_order.mir \
232+
# RUN: llc -mtriple=x86_64-pc-windows-msvc -o - %t/pop_in_wrong_order.mir \
233233
# RUN: -run-pass=x86-wineh-unwindv2 -x86-wineh-unwindv2-force-mode=1 | \
234234
# RUN: FileCheck %s --check-prefix=BESTEFFORT
235235
# POP-WRONG-ORDER: LLVM ERROR: Windows x64 Unwind v2 is required, but LLVM has generated incompatible code in function 'pop_in_wrong_order':
@@ -260,10 +260,10 @@ body: |
260260
...
261261

262262
;--- pop_after_epilog.mir
263-
# RUN: not llc -mtriple=x86_64-unknown-windows-msvc -o - \
263+
# RUN: not --crash llc -mtriple=x86_64-pc-windows-msvc -o - \
264264
# RUN: %t/pop_after_epilog.mir -run-pass=x86-wineh-unwindv2 2>&1 | \
265265
# RUN: FileCheck %s --check-prefix=POP-AFTER-EPILOG
266-
# RUN: llc -mtriple=x86_64-unknown-windows-msvc -o - %t/pop_after_epilog.mir \
266+
# RUN: llc -mtriple=x86_64-pc-windows-msvc -o - %t/pop_after_epilog.mir \
267267
# RUN: -run-pass=x86-wineh-unwindv2 -x86-wineh-unwindv2-force-mode=1 | \
268268
# RUN: FileCheck %s --check-prefix=BESTEFFORT
269269
# POP-AFTER-EPILOG: LLVM ERROR: Windows x64 Unwind v2 is required, but LLVM has generated incompatible code in function 'pop_after_epilog':
@@ -289,10 +289,10 @@ body: |
289289
...
290290

291291
;--- instr_after_epilog.mir
292-
# RUN: not llc -mtriple=x86_64-unknown-windows-msvc -o - \
292+
# RUN: not --crash llc -mtriple=x86_64-pc-windows-msvc -o - \
293293
# RUN: %t/instr_after_epilog.mir -run-pass=x86-wineh-unwindv2 2>&1 | \
294294
# RUN: FileCheck %s --check-prefix=INSTR-AFTER-END
295-
# RUN: llc -mtriple=x86_64-unknown-windows-msvc -o - %t/instr_after_epilog.mir \
295+
# RUN: llc -mtriple=x86_64-pc-windows-msvc -o - %t/instr_after_epilog.mir \
296296
# RUN: -run-pass=x86-wineh-unwindv2 -x86-wineh-unwindv2-force-mode=1 | \
297297
# RUN: FileCheck %s --check-prefix=BESTEFFORT
298298
# INSTR-AFTER-END: LLVM ERROR: Windows x64 Unwind v2 is required, but LLVM has generated incompatible code in function 'instr_after_epilog':

‎llvm/test/CodeGen/X86/win64-eh-unwindv2-too-many-epilogs.mir‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
# Require V2 and restrict the number of unwind codes to 8
2-
# RUN: not llc -mtriple=x86_64-unknown-windows-msvc -o - %s \
2+
# RUN: not llc -mtriple=x86_64-pc-windows-msvc -o - %s \
33
# RUN: -run-pass=x86-wineh-unwindv2 -x86-wineh-unwindv2-max-unwind-codes=8 \
44
# RUN: 2>&1 | FileCheck %s -check-prefix=REQUIREV2
55

66
# Force best-effort and restrict the number of unwind codes to 8
7-
# RUN: llc -mtriple=x86_64-unknown-windows-msvc -o - %s \
7+
# RUN: llc -mtriple=x86_64-pc-windows-msvc -o - %s \
88
# RUN: -run-pass=x86-wineh-unwindv2 -x86-wineh-unwindv2-max-unwind-codes=8 \
99
# RUN: -x86-wineh-unwindv2-force-mode=1 | \
1010
# RUN: FileCheck %s -check-prefix=BESTEFFORT
1111

1212
# Require V2, but allow the default number of unwind codes (255)
13-
# RUN: llc -mtriple=x86_64-unknown-windows-msvc -o - %s \
13+
# RUN: llc -mtriple=x86_64-pc-windows-msvc -o - %s \
1414
# RUN: -run-pass=x86-wineh-unwindv2 | FileCheck %s -check-prefix=ALLOWMORE
1515

1616
# Usually 255 unwind codes are permitted, but we passed an arg to llc to limit

0 commit comments

Comments
 (0)