File tree Expand file tree Collapse file tree 6 files changed +6
-17
lines changed Expand file tree Collapse file tree 6 files changed +6
-17
lines changed Original file line number Diff line number Diff line change @@ -52,14 +52,6 @@ using namespace swift::silverifier;
52
52
53
53
using Lowering::AbstractionPattern;
54
54
55
- // This flag is used only to check that sil-combine can properly
56
- // remove any code after unreachable, thus bringing SIL into
57
- // its canonical form which may get temporarily broken during
58
- // intermediate transformations.
59
- static llvm::cl::opt<bool > SkipUnreachableMustBeLastErrors (
60
- " verify-skip-unreachable-must-be-last" ,
61
- llvm::cl::init (false ));
62
-
63
55
// This flag controls the default behaviour when hitting a verification
64
56
// failure (abort/exit).
65
57
static llvm::cl::opt<bool > AbortOnFailure (
@@ -1026,10 +1018,8 @@ class SILVerifier : public SILVerifierBase<SILVerifier> {
1026
1018
" Non-terminators cannot be the last in a block" );
1027
1019
}
1028
1020
} else {
1029
- // Skip the check for UnreachableInst, if explicitly asked to do so.
1030
- if (!isa<UnreachableInst>(I) || !SkipUnreachableMustBeLastErrors)
1031
- require (&*BB->rbegin () == I,
1032
- " Terminator must be the last in block" );
1021
+ require (&*BB->rbegin () == I,
1022
+ " Terminator must be the last in block" );
1033
1023
}
1034
1024
1035
1025
// Verify that all of our uses are in this function.
Original file line number Diff line number Diff line change 1
- // RUN: %target-sil-opt -enable-objc-interop -enforce-exclusivity=none -enable-sil-verify-all %s -sil-combine -verify-skip-unreachable-must-be-last | %FileCheck %s
1
+ // RUN: %target-sil-opt -enable-objc-interop -enforce-exclusivity=none -enable-sil-verify-all %s -sil-combine | %FileCheck %s
2
2
3
3
// Declare this SIL to be canonical because some tests break raw SIL
4
4
// conventions. e.g. address-type block args. -enforce-exclusivity=none is also
Original file line number Diff line number Diff line change 1
- // RUN: %target-sil-opt -enable-sil-verify-all %s -sil-combine -verify-skip-unreachable-must-be-last - sil-combine-disable-alloc-stack-opts | %FileCheck %s
1
+ // RUN: %target-sil-opt -enable-sil-verify-all %s -sil-combine -sil-combine-disable-alloc-stack-opts | %FileCheck %s
2
2
3
3
import Swift
4
4
import Builtin
Original file line number Diff line number Diff line change 1
- // RUN: %target-sil-opt -enforce-exclusivity=none -enable-sil-verify-all %s -sil-combine -verify-skip-unreachable-must-be-last - devirtualizer | %FileCheck %s
1
+ // RUN: %target-sil-opt -enforce-exclusivity=none -enable-sil-verify-all %s -sil-combine -devirtualizer | %FileCheck %s
2
2
3
3
// Test to see if concrete type can be propagated from
4
4
// global_addr in sil_combiner.
Original file line number Diff line number Diff line change 1
- // RUN: %target-sil-opt -enable-sil-verify-all %s -sil-combine -verify-skip-unreachable-must-be-last | %FileCheck %s
1
+ // RUN: %target-sil-opt -enable-sil-verify-all %s -sil-combine | %FileCheck %s
2
2
// REQUIRES: objc_interop
3
3
4
4
// See https://bugs.swift.org/browse/SR-5065, rdar://32511494
Original file line number Diff line number Diff line change @@ -27,7 +27,6 @@ _swift_complete()
27
27
-view-cfg-remove-use-list-comments \
28
28
-view-cfg-only-for-function \
29
29
-sil-print-no-color \
30
- -verify-skip-unreachable-must-be-last \
31
30
-aa \
32
31
-cache-aa-results \
33
32
-sil-dump-call-graph \
You can’t perform that action at this time.
0 commit comments