Skip to content

Commit 3ebd8df

Browse files
gottesmmgottesmm
committed
[gardening] Remove unnecessary -enable-sil-ownership from tests that now just get it from their pattern.
This just eliminates -enable-sil-ownership from all target-swift-frontend and target-swift-emit-silgen RUN lines. Both of those now include enable-sil-ownership in their expansion.
1 parent 0235a81 commit 3ebd8df

File tree

63 files changed

+100
-109
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+100
-109
lines changed

‎test/ClangImporter/serialization-sil.swift

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
21
// RUN: %empty-directory(%t)
3-
// RUN: %target-swift-frontend -emit-module-path %t/Test.swiftmodule -emit-sil -o /dev/null -module-name Test %s -sdk "" -import-objc-header %S/Inputs/serialization-sil.h -enable-sil-ownership
2+
// RUN: %target-swift-frontend -emit-module-path %t/Test.swiftmodule -emit-sil -o /dev/null -module-name Test %s -sdk "" -import-objc-header %S/Inputs/serialization-sil.h
43
// RUN: %target-sil-func-extractor %t/Test.swiftmodule -sil-print-debuginfo -func='$s4Test16testPartialApplyyySoAA_pF' -o - | %FileCheck %s
54

65
// REQUIRES: objc_interop

‎test/IRGen/keypath_witness_overrides.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// RUN: %empty-directory(%t)
2-
// RUN: %target-swift-frontend -module-name protocol_overrides -emit-module -enable-sil-ownership -enable-resilience -emit-module-path=%t/protocol_overrides.swiftmodule %S/../SILGen/Inputs/protocol_overrides.swift
2+
// RUN: %target-swift-frontend -module-name protocol_overrides -emit-module -enable-resilience -emit-module-path=%t/protocol_overrides.swiftmodule %S/../SILGen/Inputs/protocol_overrides.swift
33
// RUN: %target-swift-frontend -module-name keypath_witness_overrides -emit-ir %s -I %t | %FileCheck %s
44

55
import protocol_overrides

‎test/IRGen/outlined_copy_addr.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %target-swift-frontend -emit-ir -enable-sil-ownership -module-name outcopyaddr -primary-file %s | %FileCheck %s
1+
// RUN: %target-swift-frontend -emit-ir -module-name outcopyaddr -primary-file %s | %FileCheck %s
22

33
public protocol BaseProt {
44
}

‎test/Profiler/instrprof_basic.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %target-swift-frontend -parse-as-library -enable-sil-ownership -emit-silgen -profile-generate %s | %FileCheck %s
1+
// RUN: %target-swift-frontend -parse-as-library -emit-silgen -profile-generate %s | %FileCheck %s
22

33
// CHECK: sil hidden [ossa] @[[F_EMPTY:.*empty.*]] :
44
// CHECK: %[[NAME:.*]] = string_literal utf8 "{{.*}}instrprof_basic.swift:[[F_EMPTY]]"

‎test/Profiler/instrprof_operators.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %target-swift-frontend -parse-as-library -emit-silgen -enable-sil-ownership -profile-generate %s | %FileCheck %s
1+
// RUN: %target-swift-frontend -parse-as-library -emit-silgen -profile-generate %s | %FileCheck %s
22

33
// CHECK: sil hidden [ossa] @[[F_OPERATORS:.*operators.*]] :
44
// CHECK: %[[NAME:.*]] = string_literal utf8 "{{.*}}instrprof_operators.swift:[[F_OPERATORS]]"

‎test/Profiler/pgo_switchenum.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@
88

99
// RUN: %llvm-profdata merge %t/default.profraw -o %t/default.profdata
1010
// need to move counts attached to expr for this
11-
// RUN: %target-swift-frontend %s -Xllvm -sil-full-demangle -profile-use=%t/default.profdata -enable-sil-ownership -emit-sorted-sil -emit-sil -module-name pgo_switchenum -o - | %FileCheck %s --check-prefix=SIL
11+
// RUN: %target-swift-frontend %s -Xllvm -sil-full-demangle -profile-use=%t/default.profdata -emit-sorted-sil -emit-sil -module-name pgo_switchenum -o - | %FileCheck %s --check-prefix=SIL
1212
// need to lower switch_enum(addr) into IR for this
13-
// %target-swift-frontend %s -enable-sil-ownership -Xllvm -sil-full-demangle -profile-use=%t/default.profdata -emit-ir -module-name pgo_switchenum -o - | %FileCheck %s --check-prefix=IR
13+
// %target-swift-frontend %s -Xllvm -sil-full-demangle -profile-use=%t/default.profdata -emit-ir -module-name pgo_switchenum -o - | %FileCheck %s --check-prefix=IR
1414
// need to check Opt support
15-
// %target-swift-frontend %s -enable-sil-ownership -Xllvm -sil-full-demangle -profile-use=%t/default.profdata -O -emit-sorted-sil -emit-sil -module-name pgo_switchenum -o - | %FileCheck %s --check-prefix=SIL-OPT
15+
// %target-swift-frontend %s -Xllvm -sil-full-demangle -profile-use=%t/default.profdata -O -emit-sorted-sil -emit-sil -module-name pgo_switchenum -o - | %FileCheck %s --check-prefix=SIL-OPT
1616
// need to lower switch_enum(addr) into IR for this
17-
// %target-swift-frontend -enable-sil-ownership %s -Xllvm -sil-full-demangle -profile-use=%t/default.profdata -O -emit-ir -module-name pgo_switchenum -o - | %FileCheck %s --check-prefix=IR-OPT
17+
// %target-swift-frontend %s -Xllvm -sil-full-demangle -profile-use=%t/default.profdata -O -emit-ir -module-name pgo_switchenum -o - | %FileCheck %s --check-prefix=IR-OPT
1818

1919
// REQUIRES: profile_runtime
2020
// REQUIRES: executable_test

‎test/SILGen/apply_abstraction_nested.swift

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
2-
// RUN: %target-swift-frontend -enable-sil-ownership -emit-silgen %s | %FileCheck %s
1+
// RUN: %target-swift-emit-silgen -emit-silgen %s | %FileCheck %s
32

43
infix operator ~>
54

‎test/SILGen/codable/struct_codable_member_type_lookup.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %target-swift-frontend -emit-silgen -enable-sil-ownership %s | %FileCheck %s
1+
// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s
22

33
// Make sure we have an int, not a float.
44
//

‎test/SILGen/global_init_attribute.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// RUN: %empty-directory(%t)
2-
// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -emit-module -o %t %S/Inputs/def_global.swift -enable-sil-ownership
2+
// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -emit-module -o %t %S/Inputs/def_global.swift
33
// RUN: %target-swift-emit-silgen -Xllvm -sil-full-demangle -parse-as-library -I %t %s | %FileCheck %s
44
//
55
// Test that SILGen uses the "global_init" attribute for all global

‎test/SILGen/global_resilience.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// RUN: %empty-directory(%t)
2-
// RUN: %target-swift-frontend -emit-module -enable-sil-ownership -enable-resilience -emit-module-path=%t/resilient_global.swiftmodule -module-name=resilient_global %S/../Inputs/resilient_global.swift
3-
// RUN: %target-swift-emit-silgen -I %t -enable-resilience -enable-sil-ownership -parse-as-library %s | %FileCheck %s
2+
// RUN: %target-swift-frontend -emit-module -enable-resilience -emit-module-path=%t/resilient_global.swiftmodule -module-name=resilient_global %S/../Inputs/resilient_global.swift
3+
// RUN: %target-swift-emit-silgen -I %t -enable-resilience -parse-as-library %s | %FileCheck %s
44
// RUN: %target-swift-emit-sil -I %t -O -enable-resilience -parse-as-library %s | %FileCheck --check-prefix=CHECK-OPT %s
55

66
import resilient_global

‎test/SILGen/keypath_covariant_override.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// RUN: %target-swift-emit-silgen -enable-sil-ownership %s | %FileCheck %s
22
// RUN: %target-swift-emit-silgen -enable-sil-ownership -enable-resilience %s | %FileCheck %s
33

4-
// RUN: %target-swift-frontend -emit-ir -enable-sil-ownership %s
5-
// RUN: %target-swift-frontend -emit-ir -enable-sil-ownership -enable-resilience %s
4+
// RUN: %target-swift-frontend -emit-ir %s
5+
// RUN: %target-swift-frontend -emit-ir -enable-resilience %s
66

77
public class C : Hashable {
88
public static func ==(lhs: C, rhs: C) -> Bool { return lhs === rhs }

‎test/SILGen/keypath_witness_overrides.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// RUN: %empty-directory(%t)
2-
// RUN: %target-swift-frontend -module-name protocol_overrides -emit-module -enable-sil-ownership -enable-resilience -emit-module-path=%t/protocol_overrides.swiftmodule %S/Inputs/protocol_overrides.swift
2+
// RUN: %target-swift-frontend -module-name protocol_overrides -emit-module -enable-resilience -emit-module-path=%t/protocol_overrides.swiftmodule %S/Inputs/protocol_overrides.swift
33
// RUN: %target-swift-emit-silgen %s -I %t | %FileCheck %s
44

55
// Check that keypath formation properly records the point at which the witness

‎test/SILGen/keypaths_inlinable.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// RUN: %target-swift-emit-silgen %s | %FileCheck %s --check-prefix=CHECK --check-prefix=FRAGILE
22
// RUN: %target-swift-emit-silgen -enable-resilience %s | %FileCheck %s --check-prefix=CHECK --check-prefix=RESILIENT
33

4-
// RUN: %target-swift-frontend -emit-ir -enable-sil-ownership %s
5-
// RUN: %target-swift-frontend -emit-ir -enable-sil-ownership -enable-resilience %s
4+
// RUN: %target-swift-frontend -emit-ir %s
5+
// RUN: %target-swift-frontend -emit-ir -enable-resilience %s
66

77
public struct KeypathStruct {
88
public var stored: Int = 0

‎test/SILGen/mangling.swift

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
2-
// RUN: %target-swift-frontend -module-name mangling -Xllvm -sil-full-demangle -sdk %S/Inputs -I %S/Inputs -enable-source-import %s -emit-silgen -enable-sil-ownership | %FileCheck %s
1+
// RUN: %target-swift-frontend -module-name mangling -Xllvm -sil-full-demangle -sdk %S/Inputs -I %S/Inputs -enable-source-import %s -emit-silgen | %FileCheck %s
32

43
// REQUIRES: objc_interop
54

‎test/SILGen/mangling_ext_structA.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// RUN: %empty-directory(%t)
2-
// RUN: %target-swift-frontend -emit-module -enable-sil-ownership -o %t %S/Inputs/def_structA.swift
3-
// RUN: %target-swift-emit-silgen -enable-sil-ownership -module-name ext_structA -I %t %s | %FileCheck %s
2+
// RUN: %target-swift-frontend -emit-module -o %t %S/Inputs/def_structA.swift
3+
// RUN: %target-swift-emit-silgen -module-name ext_structA -I %t %s | %FileCheck %s
44

55
// Ensure that members of extensions of types from another module are mangled
66
// correctly.

‎test/SILGen/mangling_private.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
// RUN: %empty-directory(%t)
2-
// RUN: %target-swift-frontend -enable-sil-ownership -emit-module -o %t %S/Inputs/mangling_private_helper.swift
3-
// RUN: %target-swift-emit-silgen -enable-sil-ownership %S/Inputs/mangling_private_helper.swift | %FileCheck %s -check-prefix=CHECK-BASE
2+
// RUN: %target-swift-frontend -emit-module -o %t %S/Inputs/mangling_private_helper.swift
3+
// RUN: %target-swift-emit-silgen %S/Inputs/mangling_private_helper.swift | %FileCheck %s -check-prefix=CHECK-BASE
44

5-
// RUN: %target-swift-emit-silgen %s -I %t -enable-sil-ownership | %FileCheck %s
5+
// RUN: %target-swift-emit-silgen %s -I %t | %FileCheck %s
66

77
// RUN: cp %s %t
8-
// RUN: %target-swift-emit-silgen %t/mangling_private.swift -I %t -enable-sil-ownership | %FileCheck %s
8+
// RUN: %target-swift-emit-silgen %t/mangling_private.swift -I %t | %FileCheck %s
99

1010
// RUN: cp %s %t/other_name.swift
11-
// RUN: %target-swift-emit-silgen %t/other_name.swift -I %t -enable-sil-ownership -module-name mangling_private | %FileCheck %s -check-prefix=OTHER-NAME
11+
// RUN: %target-swift-emit-silgen %t/other_name.swift -I %t -module-name mangling_private | %FileCheck %s -check-prefix=OTHER-NAME
1212

1313
import mangling_private_helper
1414

‎test/SILGen/mangling_retroactive.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// RUN: %empty-directory(%t)
2-
// RUN: %target-swift-frontend -emit-module -enable-sil-ownership -o %t %S/Inputs/RetroactiveA.swift
3-
// RUN: %target-swift-frontend -emit-module -enable-sil-ownership -o %t %S/Inputs/RetroactiveB.swift
4-
// RUN: %target-swift-emit-silgen -enable-sil-ownership -I %t %s | %FileCheck %s
2+
// RUN: %target-swift-frontend -emit-module -o %t %S/Inputs/RetroactiveA.swift
3+
// RUN: %target-swift-frontend -emit-module -o %t %S/Inputs/RetroactiveB.swift
4+
// RUN: %target-swift-emit-silgen -I %t %s | %FileCheck %s
55

66

77
import RetroactiveA

‎test/SILGen/nsmanaged-witness-multi.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
// RUN: %empty-directory(%t)
22

3-
// RUN: %target-swift-frontend -module-name main -emit-silgen -enable-sil-ownership -sdk %S/Inputs -primary-file %s %S/Inputs/nsmanaged-witness-multi-other.swift -I %S/Inputs -I %t -enable-source-import | %FileCheck %s
3+
// RUN: %target-swift-frontend -module-name main -emit-silgen -sdk %S/Inputs -primary-file %s %S/Inputs/nsmanaged-witness-multi-other.swift -I %S/Inputs -I %t -enable-source-import | %FileCheck %s
44

5-
// RUN: %target-swift-frontend -module-name main -emit-silgen -enable-sil-ownership -sdk %S/Inputs -primary-file %s -primary-file %S/Inputs/nsmanaged-witness-multi-other.swift -I %S/Inputs -I %t -enable-source-import | %FileCheck %s
5+
// RUN: %target-swift-frontend -module-name main -emit-silgen -sdk %S/Inputs -primary-file %s -primary-file %S/Inputs/nsmanaged-witness-multi-other.swift -I %S/Inputs -I %t -enable-source-import | %FileCheck %s
66

7-
// RUN: %target-swift-frontend -module-name main -emit-silgen -enable-sil-ownership -sdk %S/Inputs %s %S/Inputs/nsmanaged-witness-multi-other.swift -I %S/Inputs -I %t -enable-source-import | %FileCheck %s
7+
// RUN: %target-swift-frontend -module-name main -emit-silgen -sdk %S/Inputs %s %S/Inputs/nsmanaged-witness-multi-other.swift -I %S/Inputs -I %t -enable-source-import | %FileCheck %s
88

99
// REQUIRES: objc_interop
1010
import Foundation

‎test/SILGen/objc_required_designated_init.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// RUN: %empty-directory(%t)
2-
// RUN: %target-swift-frontend -emit-module -enable-sil-ownership %S/Inputs/objc_required_designated_init_2.swift -module-name Booms -o %t/Booms.swiftmodule -import-objc-header %S/Inputs/objc_required_designated_init.h
3-
// RUN: %target-swift-emit-silgen -I %t -enable-sil-ownership -verify %s -import-objc-header %S/Inputs/objc_required_designated_init.h | %FileCheck %s
2+
// RUN: %target-swift-frontend -emit-module %S/Inputs/objc_required_designated_init_2.swift -module-name Booms -o %t/Booms.swiftmodule -import-objc-header %S/Inputs/objc_required_designated_init.h
3+
// RUN: %target-swift-emit-silgen -I %t -verify %s -import-objc-header %S/Inputs/objc_required_designated_init.h | %FileCheck %s
44
// RUN: %target-swift-emit-ir -I %t %s -import-objc-header %S/Inputs/objc_required_designated_init.h
55

66
// REQUIRES: objc_interop

‎test/SILGen/private_import.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
// RUN: %empty-directory(%t)
22

3-
// RUN: %target-swift-frontend -module-name Mod -emit-module -enable-private-imports -enable-sil-ownership -swift-version 5 -o %t %S/Inputs/private_import_module.swift
4-
// RUN: %target-swift-emit-silgen -enable-sil-ownership -I %t -primary-file %s %S/private_import_other.swift -module-name main -swift-version 5 | %FileCheck %s
5-
// RUN: %target-swift-emit-silgen -enable-sil-ownership -I %t %s %S/private_import_other.swift -module-name main -swift-version 5 | %FileCheck %s
6-
// RUN: %target-swift-emit-silgen -enable-sil-ownership -I %t %S/private_import_other.swift %s -module-name main -swift-version 5 | %FileCheck %s
3+
// RUN: %target-swift-frontend -module-name Mod -emit-module -enable-private-imports -swift-version 5 -o %t %S/Inputs/private_import_module.swift
4+
// RUN: %target-swift-emit-silgen -I %t -primary-file %s %S/private_import_other.swift -module-name main -swift-version 5 | %FileCheck %s
5+
// RUN: %target-swift-emit-silgen -I %t %s %S/private_import_other.swift -module-name main -swift-version 5 | %FileCheck %s
6+
// RUN: %target-swift-emit-silgen -I %t %S/private_import_other.swift %s -module-name main -swift-version 5 | %FileCheck %s
77
// RUN: %target-swift-emit-ir -enable-sil-ownership -I %t -primary-file %s %S/private_import_other.swift -module-name main -o /dev/null
88
// RUN: %target-swift-emit-ir -enable-sil-ownership -I %t -O -primary-file %s %S/private_import_other.swift -module-name main -o /dev/null
99

‎test/SILGen/private_import_other.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
// RUN: %empty-directory(%t)
22

3-
// RUN: %target-swift-frontend -module-name Mod -emit-module -enable-private-imports -enable-sil-ownership -swift-version 5 -o %t %S/Inputs/private_import_module.swift
4-
// RUN: %target-swift-emit-silgen -enable-sil-ownership -I %t -primary-file %s %S/private_import.swift -module-name main -swift-version 5 | %FileCheck %s
5-
// RUN: %target-swift-emit-silgen -enable-sil-ownership -I %t %s %S/private_import.swift -module-name main -swift-version 5 | %FileCheck %s
6-
// RUN: %target-swift-emit-silgen -enable-sil-ownership -I %t %S/private_import.swift %s -module-name main -swift-version 5 | %FileCheck %s
3+
// RUN: %target-swift-frontend -module-name Mod -emit-module -enable-private-imports -swift-version 5 -o %t %S/Inputs/private_import_module.swift
4+
// RUN: %target-swift-emit-silgen -I %t -primary-file %s %S/private_import.swift -module-name main -swift-version 5 | %FileCheck %s
5+
// RUN: %target-swift-emit-silgen -I %t %s %S/private_import.swift -module-name main -swift-version 5 | %FileCheck %s
6+
// RUN: %target-swift-emit-silgen -I %t %S/private_import.swift %s -module-name main -swift-version 5 | %FileCheck %s
77
// RUN: %target-swift-emit-ir -enable-sil-ownership -I %t -primary-file %s %S/private_import.swift -module-name main -o /dev/null
88
// RUN: %target-swift-emit-ir -enable-sil-ownership -I %t -O -primary-file %s %S/private_import.swift -module-name main -o /dev/null
99

‎test/SILGen/protocol_resilience.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
// RUN: %empty-directory(%t)
3-
// RUN: %target-swift-frontend -module-name protocol_resilience -emit-module -enable-sil-ownership -enable-resilience -emit-module-path=%t/resilient_protocol.swiftmodule -module-name=resilient_protocol %S/../Inputs/resilient_protocol.swift
3+
// RUN: %target-swift-frontend -module-name protocol_resilience -emit-module -enable-resilience -emit-module-path=%t/resilient_protocol.swiftmodule -module-name=resilient_protocol %S/../Inputs/resilient_protocol.swift
44
// RUN: %target-swift-emit-silgen -module-name protocol_resilience -I %t -enable-sil-ownership -enable-resilience %s | %FileCheck %s
55

66
import resilient_protocol

‎test/SILGen/protocol_with_superclass.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// RUN: %target-swift-emit-silgen -enable-sil-ownership %s | %FileCheck %s
2-
// RUN: %target-swift-frontend -emit-ir -enable-sil-ownership %s
1+
// RUN: %target-swift-emit-silgen %s | %FileCheck %s
2+
// RUN: %target-swift-frontend -emit-ir %s
33

44
// Protocols with superclass-constrained Self.
55

‎test/SILGen/protocol_with_superclass_where_clause.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// RUN: %target-swift-emit-silgen -enable-sil-ownership -module-name protocol_with_superclass %s | %FileCheck %s
2-
// RUN: %target-swift-frontend -emit-ir -enable-sil-ownership %s
2+
// RUN: %target-swift-frontend -emit-ir %s
33

44
// Protocols with superclass-constrained Self, written using a 'where' clause.
55

‎test/SILGen/struct_resilience.swift

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
21
// RUN: %empty-directory(%t)
3-
// RUN: %target-swift-frontend -emit-module -enable-resilience -emit-module-path=%t/resilient_struct.swiftmodule -enable-sil-ownership %S/../Inputs/resilient_struct.swift
4-
// RUN: %target-swift-emit-silgen -I %t -enable-sil-ownership -enable-resilience %s | %FileCheck %s
2+
// RUN: %target-swift-frontend -emit-module -enable-resilience -emit-module-path=%t/resilient_struct.swiftmodule %S/../Inputs/resilient_struct.swift
3+
// RUN: %target-swift-emit-silgen -I %t -enable-resilience %s | %FileCheck %s
54

65
import resilient_struct
76

‎test/SILGen/struct_resilience_testable.swift

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
21
// RUN: %empty-directory(%t)
3-
// RUN: %target-swift-frontend -emit-module -enable-resilience -enable-testing -emit-module-path=%t/resilient_struct.swiftmodule -enable-sil-ownership %S/../Inputs/resilient_struct.swift
4-
// RUN: %target-swift-emit-silgen -I %t -enable-sil-ownership %s | %FileCheck %s
2+
// RUN: %target-swift-frontend -emit-module -enable-resilience -enable-testing -emit-module-path=%t/resilient_struct.swiftmodule %S/../Inputs/resilient_struct.swift
3+
// RUN: %target-swift-emit-silgen -I %t %s | %FileCheck %s
54

65
@testable import resilient_struct
76

‎test/SILGen/subscript_accessor.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %target-swift-frontend -enable-sil-ownership -O -emit-sil -primary-file %s | %FileCheck %s
1+
// RUN: %target-swift-frontend -O -emit-sil -primary-file %s | %FileCheck %s
22

33
// CHECK-LABEL: sil hidden [transparent] @$s18subscript_accessor1XVxSgyciM
44
// CHECK: [[SETTER:%.*]] = function_ref @$s18subscript_accessor1XVxSgycis

‎test/SILGen/testable-multifile.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
// This test is paired with testable-multifile-other.swift.
22

33
// RUN: %empty-directory(%t)
4-
// RUN: %target-swift-frontend -emit-module %S/Inputs/TestableMultifileHelper.swift -enable-testing -enable-sil-ownership -o %t
4+
// RUN: %target-swift-frontend -emit-module %S/Inputs/TestableMultifileHelper.swift -enable-testing -o %t
55

6-
// RUN: %target-swift-emit-silgen -enable-sil-ownership -I %t %s %S/testable-multifile-other.swift -module-name main | %FileCheck %s
7-
// RUN: %target-swift-emit-silgen -enable-sil-ownership -I %t %S/testable-multifile-other.swift %s -module-name main | %FileCheck %s
8-
// RUN: %target-swift-emit-silgen -enable-sil-ownership -I %t -primary-file %s %S/testable-multifile-other.swift -module-name main | %FileCheck %s
6+
// RUN: %target-swift-emit-silgen -I %t %s %S/testable-multifile-other.swift -module-name main | %FileCheck %s
7+
// RUN: %target-swift-emit-silgen -I %t %S/testable-multifile-other.swift %s -module-name main | %FileCheck %s
8+
// RUN: %target-swift-emit-silgen -I %t -primary-file %s %S/testable-multifile-other.swift -module-name main | %FileCheck %s
99

1010
// Just make sure we don't crash later on.
1111
// RUN: %target-swift-emit-ir -enable-sil-ownership -I %t -primary-file %s %S/testable-multifile-other.swift -module-name main -o /dev/null

‎test/SILGen/witness_tables_serialized_import.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// RUN: %empty-directory(%t)
2-
// RUN: %target-swift-frontend -enable-sil-ownership -emit-module %S/witness_tables_serialized.swift -o %t -enable-resilience
3-
// RUN: %target-swift-emit-silgen -enable-sil-ownership -I %t %s | %FileCheck %s
2+
// RUN: %target-swift-frontend -emit-module %S/witness_tables_serialized.swift -o %t -enable-resilience
3+
// RUN: %target-swift-emit-silgen -I %t %s | %FileCheck %s
44

55
import witness_tables_serialized
66

‎test/SILOptimizer/access_enforcement_noescape.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %target-swift-frontend -module-name access_enforcement_noescape -enable-sil-ownership -enforce-exclusivity=checked -Onone -emit-sil -swift-version 4 -parse-as-library %s | %FileCheck %s
1+
// RUN: %target-swift-frontend -module-name access_enforcement_noescape -enforce-exclusivity=checked -Onone -emit-sil -swift-version 4 -parse-as-library %s | %FileCheck %s
22

33
// This tests SILGen and AccessEnforcementSelection as a single set of tests.
44
// (Some static/dynamic enforcement selection is done in SILGen, and some is

0 commit comments

Comments
 (0)