diff --git a/lib/Basic/Mangler.cpp b/lib/Basic/Mangler.cpp index 90c761fb591..fc4eed6616a 100644 --- a/lib/Basic/Mangler.cpp +++ b/lib/Basic/Mangler.cpp @@ -21,10 +21,6 @@ using namespace swift; using namespace Mangle; -llvm::cl::opt MangleForTests( - "new-mangling-for-tests", llvm::cl::init(false), - llvm::cl::desc("Use new mangling for compiler tests")); - #ifndef NDEBUG llvm::cl::opt PrintSwiftManglingStats( diff --git a/test/ClangImporter/attr-swift_private.swift b/test/ClangImporter/attr-swift_private.swift index 709e2abe532..1e99cbd9c47 100644 --- a/test/ClangImporter/attr-swift_private.swift +++ b/test/ClangImporter/attr-swift_private.swift @@ -2,7 +2,7 @@ // RUN: %build-clang-importer-objc-overlays // RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk-nosource -I %t) -I %S/Inputs/custom-modules -typecheck %s -verify -verify-ignore-unknown -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk-nosource -I %t) -Xllvm -new-mangling-for-tests -I %S/Inputs/custom-modules -emit-ir %s -D IRGEN | %FileCheck %s +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk-nosource -I %t) -I %S/Inputs/custom-modules -emit-ir %s -D IRGEN | %FileCheck %s // RUN: %target-swift-ide-test(mock-sdk: %clang-importer-sdk-nosource -I %t) -I %S/Inputs/custom-modules -print-module -source-filename="%s" -module-to-print SwiftPrivateAttr > %t.txt // RUN: %FileCheck -check-prefix=GENERATED-NEGATIVE %s < %t.txt diff --git a/test/ClangImporter/ctypes_ir.swift b/test/ClangImporter/ctypes_ir.swift index 9a0cc9dcbe9..edcb3a859f0 100644 --- a/test/ClangImporter/ctypes_ir.swift +++ b/test/ClangImporter/ctypes_ir.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -Xllvm -new-mangling-for-tests -emit-ir -o - -primary-file %s | %FileCheck %s +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -emit-ir -o - -primary-file %s | %FileCheck %s // REQUIRES: OS=macosx diff --git a/test/ClangImporter/nullability_silgen.swift b/test/ClangImporter/nullability_silgen.swift index ed22eccfddc..d4e31e94242 100644 --- a/test/ClangImporter/nullability_silgen.swift +++ b/test/ClangImporter/nullability_silgen.swift @@ -1,7 +1,7 @@ // RUN: rm -rf %t && mkdir -p %t // RUN: %build-clang-importer-objc-overlays -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk-nosource -I %t) -Xllvm -new-mangling-for-tests -emit-silgen -I %S/Inputs/custom-modules %s | %FileCheck %s +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk-nosource -I %t) -emit-silgen -I %S/Inputs/custom-modules %s | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/ClangImporter/objc_ir.swift b/test/ClangImporter/objc_ir.swift index 480b589a665..bd97b03a3f7 100644 --- a/test/ClangImporter/objc_ir.swift +++ b/test/ClangImporter/objc_ir.swift @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir -p %t // RUN: %build-clang-importer-objc-overlays -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk-nosource -I %t) -Xllvm -new-mangling-for-tests -I %S/Inputs/custom-modules -emit-ir -o - -primary-file %s | %FileCheck %s +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk-nosource -I %t) -I %S/Inputs/custom-modules -emit-ir -o - -primary-file %s | %FileCheck %s // REQUIRES: objc_interop // REQUIRES: OS=macosx diff --git a/test/ClangImporter/optional.swift b/test/ClangImporter/optional.swift index c36ad533bab..3283877fd6b 100644 --- a/test/ClangImporter/optional.swift +++ b/test/ClangImporter/optional.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -Xllvm -new-mangling-for-tests -I %S/Inputs/custom-modules -emit-silgen -o - %s | %FileCheck %s +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -I %S/Inputs/custom-modules -emit-silgen -o - %s | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/ClangImporter/serialization-sil.swift b/test/ClangImporter/serialization-sil.swift index c482ea18393..3db31ec02e0 100644 --- a/test/ClangImporter/serialization-sil.swift +++ b/test/ClangImporter/serialization-sil.swift @@ -1,5 +1,5 @@ // RUN: rm -rf %t && mkdir -p %t -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-module-path %t/Test.swiftmodule -emit-sil -o /dev/null -module-name Test %s -sdk "" -import-objc-header %S/Inputs/serialization-sil.h +// 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 // RUN: %target-sil-func-extractor %t/Test.swiftmodule -func=_T04Test16testPartialApplyySoAA_pF -o - | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/ClangImporter/static_inline.swift b/test/ClangImporter/static_inline.swift index 6a56de2b1e6..d7454a229bd 100644 --- a/test/ClangImporter/static_inline.swift +++ b/test/ClangImporter/static_inline.swift @@ -2,9 +2,9 @@ // Check if SIL printing+parsing of a clang imported function works. -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -parse-as-library -module-name=test -emit-sil %s -import-objc-header %S/Inputs/static_inline.h -o %t/test.sil +// RUN: %target-swift-frontend -parse-as-library -module-name=test -emit-sil %s -import-objc-header %S/Inputs/static_inline.h -o %t/test.sil // RUN: %FileCheck < %t/test.sil %s -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -parse-as-library -module-name=test -O -emit-ir %t/test.sil -import-objc-header %S/Inputs/static_inline.h | %FileCheck --check-prefix=CHECK-IR %s +// RUN: %target-swift-frontend -parse-as-library -module-name=test -O -emit-ir %t/test.sil -import-objc-header %S/Inputs/static_inline.h | %FileCheck --check-prefix=CHECK-IR %s // CHECK: sil shared [clang c_inline_func] @c_inline_func : $@convention(c) (Int32) -> Int32 diff --git a/test/DebugInfo/Constructors.swift b/test/DebugInfo/Constructors.swift index 6f9c350f3fe..d7c66b73364 100644 --- a/test/DebugInfo/Constructors.swift +++ b/test/DebugInfo/Constructors.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests %s -emit-ir -g -o - | %FileCheck %s +// RUN: %target-swift-frontend %s -emit-ir -g -o - | %FileCheck %s struct Foo { // Allocating constructor - should have no line table info. // CHECK: !DISubprogram(name: "init", linkageName: "_T012Constructors3FooVACs5Int64V1x_tcfC", diff --git a/test/DebugInfo/Destructors.swift b/test/DebugInfo/Destructors.swift index 3ba75cb93f8..ada4c861afd 100644 --- a/test/DebugInfo/Destructors.swift +++ b/test/DebugInfo/Destructors.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests %s -emit-ir -g -o - | %FileCheck %s +// RUN: %target-swift-frontend %s -emit-ir -g -o - | %FileCheck %s public class Foo { // CHECK: !DISubprogram(name: "deinit", linkageName: "_T011Destructors3FooCfD" diff --git a/test/DebugInfo/DynamicSelf.swift b/test/DebugInfo/DynamicSelf.swift index 22f920bdd12..a09a4fac14b 100644 --- a/test/DebugInfo/DynamicSelf.swift +++ b/test/DebugInfo/DynamicSelf.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests %s -emit-ir -g -o - | %FileCheck %s +// RUN: %target-swift-frontend %s -emit-ir -g -o - | %FileCheck %s class C { let n : Int64 diff --git a/test/DebugInfo/EagerTypeMetadata.swift b/test/DebugInfo/EagerTypeMetadata.swift index 41e046955af..0a074ed5a3b 100644 --- a/test/DebugInfo/EagerTypeMetadata.swift +++ b/test/DebugInfo/EagerTypeMetadata.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests %s -Onone -emit-ir -g -o - | %FileCheck %s +// RUN: %target-swift-frontend %s -Onone -emit-ir -g -o - | %FileCheck %s public class C { diff --git a/test/DebugInfo/ProtocolContainer.swift b/test/DebugInfo/ProtocolContainer.swift index a5c843df499..c591db4f033 100644 --- a/test/DebugInfo/ProtocolContainer.swift +++ b/test/DebugInfo/ProtocolContainer.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests %s -emit-ir -g -o - | %FileCheck %s +// RUN: %target-swift-frontend %s -emit-ir -g -o - | %FileCheck %s func markUsed(_ t: T) {} diff --git a/test/DebugInfo/WeakCapture.swift b/test/DebugInfo/WeakCapture.swift index af037b08203..2bce9f8f984 100644 --- a/test/DebugInfo/WeakCapture.swift +++ b/test/DebugInfo/WeakCapture.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests %s -emit-ir -g -o - | %FileCheck %s +// RUN: %target-swift-frontend %s -emit-ir -g -o - | %FileCheck %s class A { init(handler: (() -> ())) { } } diff --git a/test/DebugInfo/alloca-init.swift b/test/DebugInfo/alloca-init.swift index e3a4d5d60e8..d8e9adc73e0 100644 --- a/test/DebugInfo/alloca-init.swift +++ b/test/DebugInfo/alloca-init.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests %s -emit-ir -g -o - | %FileCheck %s +// RUN: %target-swift-frontend %s -emit-ir -g -o - | %FileCheck %s func markUsed(_ t: T) {} diff --git a/test/DebugInfo/apple-types-accel.swift b/test/DebugInfo/apple-types-accel.swift index 8a48bc9b847..62cdaae2b95 100644 --- a/test/DebugInfo/apple-types-accel.swift +++ b/test/DebugInfo/apple-types-accel.swift @@ -1,5 +1,5 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests %s -emit-ir -g -o - | %FileCheck %s -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests %s -c -g -o %t.o +// RUN: %target-swift-frontend %s -emit-ir -g -o - | %FileCheck %s +// RUN: %target-swift-frontend %s -c -g -o %t.o // RUN: dwarfdump --apple-types %t.o | %FileCheck --check-prefix=CHECK-ACCEL %s // RUN: dwarfdump --debug-info %t.o | %FileCheck --check-prefix=CHECK-DWARF %s // DISABLED : dwarfdump --verify %t.o diff --git a/test/DebugInfo/archetype.swift b/test/DebugInfo/archetype.swift index 30639da3884..6b7e90acf6b 100644 --- a/test/DebugInfo/archetype.swift +++ b/test/DebugInfo/archetype.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -primary-file %s -emit-ir -g -o - | %FileCheck %s +// RUN: %target-swift-frontend -primary-file %s -emit-ir -g -o - | %FileCheck %s protocol IntegerArithmetic { static func uncheckedSubtract(_ lhs: Self, rhs: Self) -> (Self, Bool) diff --git a/test/DebugInfo/archetypes2.swift b/test/DebugInfo/archetypes2.swift index f7c6cda14a6..c8ccc1d5ec4 100644 --- a/test/DebugInfo/archetypes2.swift +++ b/test/DebugInfo/archetypes2.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests %s -emit-ir -verify -g -o - | %FileCheck %s +// RUN: %target-swift-frontend %s -emit-ir -verify -g -o - | %FileCheck %s func markUsed(_ t: T) {} diff --git a/test/DebugInfo/arg-debug_value.swift b/test/DebugInfo/arg-debug_value.swift index 746c1524eeb..dfd856678a5 100644 --- a/test/DebugInfo/arg-debug_value.swift +++ b/test/DebugInfo/arg-debug_value.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -primary-file %s -emit-ir -g -o - | %FileCheck %s +// RUN: %target-swift-frontend -primary-file %s -emit-ir -g -o - | %FileCheck %s // Verify that arguments described by debug_value intrinsics are only // emitted once. diff --git a/test/DebugInfo/attributes.swift b/test/DebugInfo/attributes.swift index 60b7c9dd9a5..7970dccbf80 100644 --- a/test/DebugInfo/attributes.swift +++ b/test/DebugInfo/attributes.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -disable-objc-attr-requires-foundation-module %s -emit-ir -g -o - | %FileCheck %s +// RUN: %target-swift-frontend -disable-objc-attr-requires-foundation-module %s -emit-ir -g -o - | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/DebugInfo/atype.swift b/test/DebugInfo/atype.swift index 4eed516d562..f6fc6499d41 100644 --- a/test/DebugInfo/atype.swift +++ b/test/DebugInfo/atype.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests %s -emit-ir -g -o - | %FileCheck %s +// RUN: %target-swift-frontend %s -emit-ir -g -o - | %FileCheck %s func markUsed(_ t: T) {} diff --git a/test/DebugInfo/autoclosure.swift b/test/DebugInfo/autoclosure.swift index 964e7b8dad2..98e90431e6c 100644 --- a/test/DebugInfo/autoclosure.swift +++ b/test/DebugInfo/autoclosure.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests %s -emit-ir -g -o - | %FileCheck %s +// RUN: %target-swift-frontend %s -emit-ir -g -o - | %FileCheck %s // CHECK: define{{.*}}@_T011autoclosure7call_meys5Int64VF // CHECK-NOT: ret void diff --git a/test/DebugInfo/bound-namealiastype.swift b/test/DebugInfo/bound-namealiastype.swift index 985896bdd10..c5daab7d881 100644 --- a/test/DebugInfo/bound-namealiastype.swift +++ b/test/DebugInfo/bound-namealiastype.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-ir -g %s -o - | %FileCheck %s +// RUN: %target-swift-frontend -emit-ir -g %s -o - | %FileCheck %s public protocol OS_dispatch_queue { } diff --git a/test/DebugInfo/capturelist.swift b/test/DebugInfo/capturelist.swift index 498e4e7210c..c82808ebdaf 100644 --- a/test/DebugInfo/capturelist.swift +++ b/test/DebugInfo/capturelist.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests %s -emit-ir -g -o - | %FileCheck %s +// RUN: %target-swift-frontend %s -emit-ir -g -o - | %FileCheck %s class C { func withClosure(_ : () -> ()) -> () {} diff --git a/test/DebugInfo/cleanupskip.swift b/test/DebugInfo/cleanupskip.swift index 13174eff3e6..62bea7be30e 100644 --- a/test/DebugInfo/cleanupskip.swift +++ b/test/DebugInfo/cleanupskip.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-ir -g %s -o - -O -disable-llvm-optzns | %FileCheck %s +// RUN: %target-swift-frontend -emit-ir -g %s -o - -O -disable-llvm-optzns | %FileCheck %s // REQUIRES: objc_interop import Foundation diff --git a/test/DebugInfo/closure-arg-linetable.swift b/test/DebugInfo/closure-arg-linetable.swift index 3cb8e5ccfab..6839259074b 100644 --- a/test/DebugInfo/closure-arg-linetable.swift +++ b/test/DebugInfo/closure-arg-linetable.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests %s -emit-ir -g -o - | %FileCheck %s +// RUN: %target-swift-frontend %s -emit-ir -g -o - | %FileCheck %s public class C { diff --git a/test/DebugInfo/closure-args.swift b/test/DebugInfo/closure-args.swift index 8f6ac304f26..86c1f14026a 100644 --- a/test/DebugInfo/closure-args.swift +++ b/test/DebugInfo/closure-args.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests %s -emit-ir -g -o - | %FileCheck %s +// RUN: %target-swift-frontend %s -emit-ir -g -o - | %FileCheck %s import Swift diff --git a/test/DebugInfo/closure-multivalue.swift b/test/DebugInfo/closure-multivalue.swift index b9f85d89a0d..08757d9cce1 100644 --- a/test/DebugInfo/closure-multivalue.swift +++ b/test/DebugInfo/closure-multivalue.swift @@ -31,7 +31,7 @@ public func demo() { demo() // At -O0, we should have a single aggregate argument. -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests %s -emit-ir -g -o - | %FileCheck %s --check-prefix=CHECK-O0 +// RUN: %target-swift-frontend %s -emit-ir -g -o - | %FileCheck %s --check-prefix=CHECK-O0 // Verify that a reabstraction thunk does not have a line number. // CHECK-O0-NOT: DW_OP_bit_piece // CHECK-O0-NOT: DW_OP_bit_piece diff --git a/test/DebugInfo/closure.swift b/test/DebugInfo/closure.swift index 78a2a09f726..a612ec53266 100644 --- a/test/DebugInfo/closure.swift +++ b/test/DebugInfo/closure.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests %s -emit-ir -g -o - | %FileCheck %s +// RUN: %target-swift-frontend %s -emit-ir -g -o - | %FileCheck %s func markUsed(_ t: T) {} diff --git a/test/DebugInfo/conditional-assign.swift b/test/DebugInfo/conditional-assign.swift index 90a79f4f98e..3c2d9cf2e52 100644 --- a/test/DebugInfo/conditional-assign.swift +++ b/test/DebugInfo/conditional-assign.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests %s -emit-sil -g -o - | %FileCheck %s +// RUN: %target-swift-frontend %s -emit-sil -g -o - | %FileCheck %s public protocol DelegateA {} public protocol DelegateB {} public protocol WithDelegate diff --git a/test/DebugInfo/debug_value_addr.swift b/test/DebugInfo/debug_value_addr.swift index 07f187a9613..1f9e3492647 100644 --- a/test/DebugInfo/debug_value_addr.swift +++ b/test/DebugInfo/debug_value_addr.swift @@ -1,5 +1,5 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -primary-file %s -emit-ir -g -o - | %FileCheck %s -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests %s -emit-sil -g -o - | %FileCheck -check-prefix=CHECK-SIL %s +// RUN: %target-swift-frontend -primary-file %s -emit-ir -g -o - | %FileCheck %s +// RUN: %target-swift-frontend %s -emit-sil -g -o - | %FileCheck -check-prefix=CHECK-SIL %s // Verify that -Onone shadow copies are emitted for debug_value_addr // instructions. diff --git a/test/DebugInfo/dynamic_layout.swift b/test/DebugInfo/dynamic_layout.swift index c6203e98b9f..ce96281c54b 100644 --- a/test/DebugInfo/dynamic_layout.swift +++ b/test/DebugInfo/dynamic_layout.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests %s -emit-ir -g -o - | %FileCheck %s +// RUN: %target-swift-frontend %s -emit-ir -g -o - | %FileCheck %s func markUsed(_ t: T) {} diff --git a/test/DebugInfo/generic_arg.swift b/test/DebugInfo/generic_arg.swift index d48db3e69ea..eeda299b96c 100644 --- a/test/DebugInfo/generic_arg.swift +++ b/test/DebugInfo/generic_arg.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests %s -emit-ir -g -o - | %FileCheck %s +// RUN: %target-swift-frontend %s -emit-ir -g -o - | %FileCheck %s import StdlibUnittest func foo(_ x: T) -> () { // CHECK: define {{.*}} @_T011generic_arg3fooyxlF diff --git a/test/DebugInfo/generic_arg2.swift b/test/DebugInfo/generic_arg2.swift index 49746f1d1d5..460fddcdeac 100644 --- a/test/DebugInfo/generic_arg2.swift +++ b/test/DebugInfo/generic_arg2.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests %s -emit-ir -g -o - | %FileCheck %s +// RUN: %target-swift-frontend %s -emit-ir -g -o - | %FileCheck %s // CHECK: define hidden swiftcc void @_T012generic_arg25ClassC3foo{{.*}}, %swift.type* %U // CHECK: call void @llvm.dbg.declare(metadata %swift.opaque** %y.addr, metadata ![[U:.*]], metadata !{{[0-9]+}}) diff --git a/test/DebugInfo/generic_arg3.swift b/test/DebugInfo/generic_arg3.swift index 9be405822ee..1ec961d09bb 100644 --- a/test/DebugInfo/generic_arg3.swift +++ b/test/DebugInfo/generic_arg3.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests %s -emit-ir -g -o - | %FileCheck %s +// RUN: %target-swift-frontend %s -emit-ir -g -o - | %FileCheck %s func apply(_ T : Type, fn: (Type) -> Type) -> Type { return fn(T) } diff --git a/test/DebugInfo/generic_arg4.swift b/test/DebugInfo/generic_arg4.swift index 669ecf4fdb9..9165b845a85 100644 --- a/test/DebugInfo/generic_arg4.swift +++ b/test/DebugInfo/generic_arg4.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests %s -emit-ir -g -o - | %FileCheck %s +// RUN: %target-swift-frontend %s -emit-ir -g -o - | %FileCheck %s // REQUIRES: objc_interop public struct Q { let x: T diff --git a/test/DebugInfo/generic_arg5.swift b/test/DebugInfo/generic_arg5.swift index 61b11ef7bf1..575d5fd8491 100644 --- a/test/DebugInfo/generic_arg5.swift +++ b/test/DebugInfo/generic_arg5.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests %s -emit-ir -g -o - | %FileCheck %s +// RUN: %target-swift-frontend %s -emit-ir -g -o - | %FileCheck %s public struct S { let value : Type diff --git a/test/DebugInfo/generic_args.swift b/test/DebugInfo/generic_args.swift index 093300e48e7..926a9afcca4 100644 --- a/test/DebugInfo/generic_args.swift +++ b/test/DebugInfo/generic_args.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -primary-file %s -emit-ir -verify -g -o - | %FileCheck %s +// RUN: %target-swift-frontend -primary-file %s -emit-ir -verify -g -o - | %FileCheck %s func markUsed(_ t: T) {} diff --git a/test/DebugInfo/generic_enum.swift b/test/DebugInfo/generic_enum.swift index cea04eadd01..29f7333c12b 100644 --- a/test/DebugInfo/generic_enum.swift +++ b/test/DebugInfo/generic_enum.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests %s -emit-ir -g -o - | %FileCheck %s +// RUN: %target-swift-frontend %s -emit-ir -g -o - | %FileCheck %s func markUsed(_ t: T) {} diff --git a/test/DebugInfo/generic_enum_closure.swift b/test/DebugInfo/generic_enum_closure.swift index 8150452f205..49f60f2bcf4 100644 --- a/test/DebugInfo/generic_enum_closure.swift +++ b/test/DebugInfo/generic_enum_closure.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -primary-file %s -emit-ir -g -o - | %FileCheck %s +// RUN: %target-swift-frontend -primary-file %s -emit-ir -g -o - | %FileCheck %s struct __CurrentErrno {} struct CErrorOr diff --git a/test/DebugInfo/gsil.swift b/test/DebugInfo/gsil.swift index ceae4bf91cc..29e621d4cee 100644 --- a/test/DebugInfo/gsil.swift +++ b/test/DebugInfo/gsil.swift @@ -1,5 +1,5 @@ // RUN: rm -rf %t && mkdir -p %t -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests %s -O -gsil -emit-ir -o %t/out.ir +// RUN: %target-swift-frontend %s -O -gsil -emit-ir -o %t/out.ir // RUN: %FileCheck %s < %t/out.ir // RUN: %FileCheck %s --check-prefix=CHECK_OUT_SIL < %t/out.ir.gsil_0.sil diff --git a/test/DebugInfo/guard-let.swift b/test/DebugInfo/guard-let.swift index b10b4d4b4ce..06cc206aea0 100644 --- a/test/DebugInfo/guard-let.swift +++ b/test/DebugInfo/guard-let.swift @@ -1,5 +1,5 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests %s -emit-ir -g -o - | %FileCheck %s -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests %s -emit-ir -g -o - | %FileCheck %s --check-prefix=CHECK2 +// RUN: %target-swift-frontend %s -emit-ir -g -o - | %FileCheck %s +// RUN: %target-swift-frontend %s -emit-ir -g -o - | %FileCheck %s --check-prefix=CHECK2 func use(_ t: T) {} public func f(_ i : Int?) diff --git a/test/DebugInfo/implicitdecl.swift b/test/DebugInfo/implicitdecl.swift index 108f7533271..c0050c31689 100644 --- a/test/DebugInfo/implicitdecl.swift +++ b/test/DebugInfo/implicitdecl.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-ir -g %s -o - | %FileCheck %s +// RUN: %target-swift-frontend -emit-ir -g %s -o - | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/DebugInfo/initializer.swift b/test/DebugInfo/initializer.swift index a2890847f8a..85eb2c1621d 100644 --- a/test/DebugInfo/initializer.swift +++ b/test/DebugInfo/initializer.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests %s -import-objc-header %S/Inputs/serialized-objc-header.h -emit-ir -g -o - | %FileCheck %s +// RUN: %target-swift-frontend %s -import-objc-header %S/Inputs/serialized-objc-header.h -emit-ir -g -o - | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/DebugInfo/inlined-generics.swift b/test/DebugInfo/inlined-generics.swift index 3005ee39a7c..21569112fa1 100644 --- a/test/DebugInfo/inlined-generics.swift +++ b/test/DebugInfo/inlined-generics.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -Xllvm -sil-inline-generics=true %s -O -g -o - -emit-ir | %FileCheck %s +// RUN: %target-swift-frontend -Xllvm -sil-inline-generics=true %s -O -g -o - -emit-ir | %FileCheck %s public protocol P { associatedtype DT1 func getDT() -> DT1 diff --git a/test/DebugInfo/inlinedAt.swift b/test/DebugInfo/inlinedAt.swift index d698657befc..8a207f38f65 100644 --- a/test/DebugInfo/inlinedAt.swift +++ b/test/DebugInfo/inlinedAt.swift @@ -1,6 +1,6 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests %s -O -I %t -emit-sil -emit-verbose-sil -o - \ +// RUN: %target-swift-frontend %s -O -I %t -emit-sil -emit-verbose-sil -o - \ // RUN: | %FileCheck %s --check-prefix=CHECK-SIL -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests %s -O -I %t -emit-ir -g -o - | %FileCheck %s +// RUN: %target-swift-frontend %s -O -I %t -emit-ir -g -o - | %FileCheck %s public var glob : Int = 0 @inline(never) public func hold(_ n : Int) { glob = n } diff --git a/test/DebugInfo/inlinescopes.swift b/test/DebugInfo/inlinescopes.swift index 37016670021..e8ba12beafb 100644 --- a/test/DebugInfo/inlinescopes.swift +++ b/test/DebugInfo/inlinescopes.swift @@ -1,8 +1,8 @@ // RUN: rm -rf %t // RUN: mkdir -p %t // RUN: echo "public var x = Int64()" \ -// RUN: | %target-swift-frontend -Xllvm -new-mangling-for-tests -module-name FooBar -emit-module -o %t - -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests %s -O -I %t -emit-ir -g -o %t.ll +// RUN: | %target-swift-frontend -module-name FooBar -emit-module -o %t - +// RUN: %target-swift-frontend %s -O -I %t -emit-ir -g -o %t.ll // RUN: %FileCheck %s < %t.ll // RUN: %FileCheck %s -check-prefix=TRANSPARENT-CHECK < %t.ll diff --git a/test/DebugInfo/iuo_arg.swift b/test/DebugInfo/iuo_arg.swift index 1ff594f01a6..03395782b93 100644 --- a/test/DebugInfo/iuo_arg.swift +++ b/test/DebugInfo/iuo_arg.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests %s -emit-ir -g -o - | %FileCheck %s +// RUN: %target-swift-frontend %s -emit-ir -g -o - | %FileCheck %s class CGImageRef {} class UIImage { diff --git a/test/DebugInfo/letstring.swift b/test/DebugInfo/letstring.swift index d0e72792136..d5b2f0ffb40 100644 --- a/test/DebugInfo/letstring.swift +++ b/test/DebugInfo/letstring.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests %s -emit-ir -g -o %t.ll +// RUN: %target-swift-frontend %s -emit-ir -g -o %t.ll // RUN: %FileCheck %s < %t.ll class UIWindow {} diff --git a/test/DebugInfo/linetable-cleanups.swift b/test/DebugInfo/linetable-cleanups.swift index 28afeab25e0..caa9b8acd03 100644 --- a/test/DebugInfo/linetable-cleanups.swift +++ b/test/DebugInfo/linetable-cleanups.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests %s -emit-ir -g -o - | %FileCheck %s +// RUN: %target-swift-frontend %s -emit-ir -g -o - | %FileCheck %s func markUsed(_ t: T) {} diff --git a/test/DebugInfo/linetable.swift b/test/DebugInfo/linetable.swift index b4706cb8623..33b5201f542 100644 --- a/test/DebugInfo/linetable.swift +++ b/test/DebugInfo/linetable.swift @@ -1,5 +1,5 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests %s -emit-ir -g -o - | %FileCheck %s -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests %s -S -g -o - | %FileCheck %s --check-prefix ASM-CHECK +// RUN: %target-swift-frontend %s -emit-ir -g -o - | %FileCheck %s +// RUN: %target-swift-frontend %s -S -g -o - | %FileCheck %s --check-prefix ASM-CHECK // REQUIRES: CPU=i386_or_x86_64 diff --git a/test/DebugInfo/parent-scope.swift b/test/DebugInfo/parent-scope.swift index 721c7860dba..82cfa84a836 100644 --- a/test/DebugInfo/parent-scope.swift +++ b/test/DebugInfo/parent-scope.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -g -emit-ir %s | %FileCheck %s +// RUN: %target-swift-frontend -g -emit-ir %s | %FileCheck %s public protocol P { associatedtype AT; diff --git a/test/DebugInfo/patternvars.swift b/test/DebugInfo/patternvars.swift index d43e8c9d10d..2bec719133e 100644 --- a/test/DebugInfo/patternvars.swift +++ b/test/DebugInfo/patternvars.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests %s -emit-ir -g -o - | %FileCheck %s +// RUN: %target-swift-frontend %s -emit-ir -g -o - | %FileCheck %s @_fixed_layout public struct UnicodeScalar { diff --git a/test/DebugInfo/pcomp.swift b/test/DebugInfo/pcomp.swift index 7680fe7f0c9..35f562a0e7f 100644 --- a/test/DebugInfo/pcomp.swift +++ b/test/DebugInfo/pcomp.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -primary-file %s -emit-ir -g -o - | %FileCheck %s +// RUN: %target-swift-frontend -primary-file %s -emit-ir -g -o - | %FileCheck %s func markUsed(_ t: T) {} diff --git a/test/DebugInfo/prologue.swift b/test/DebugInfo/prologue.swift index 8e7eabbf825..64745c3fee5 100644 --- a/test/DebugInfo/prologue.swift +++ b/test/DebugInfo/prologue.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -primary-file %s -S -g -o - | %FileCheck %s +// RUN: %target-swift-frontend -primary-file %s -S -g -o - | %FileCheck %s // REQUIRES: CPU=x86_64 diff --git a/test/DebugInfo/protocol-sugar.swift b/test/DebugInfo/protocol-sugar.swift index 877131c438a..babef388f24 100644 --- a/test/DebugInfo/protocol-sugar.swift +++ b/test/DebugInfo/protocol-sugar.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests %s -emit-ir -g -o - | %FileCheck %s +// RUN: %target-swift-frontend %s -emit-ir -g -o - | %FileCheck %s protocol A {} protocol B {} typealias C = B & A diff --git a/test/DebugInfo/protocol.swift b/test/DebugInfo/protocol.swift index 3739888c46f..bc8d84d0028 100644 --- a/test/DebugInfo/protocol.swift +++ b/test/DebugInfo/protocol.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests %s -emit-ir -g -o - | %FileCheck %s +// RUN: %target-swift-frontend %s -emit-ir -g -o - | %FileCheck %s protocol PointUtils { func distanceFromOrigin() -> Float diff --git a/test/DebugInfo/protocolarg.swift b/test/DebugInfo/protocolarg.swift index 0bc4a07be36..80ea0338228 100644 --- a/test/DebugInfo/protocolarg.swift +++ b/test/DebugInfo/protocolarg.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests %s -emit-ir -g -o - | %FileCheck %s +// RUN: %target-swift-frontend %s -emit-ir -g -o - | %FileCheck %s func markUsed(_ t: T) {} func use(_ t: inout T) {} diff --git a/test/DebugInfo/return.swift b/test/DebugInfo/return.swift index 04abbf19b8f..bf7057d7f32 100644 --- a/test/DebugInfo/return.swift +++ b/test/DebugInfo/return.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests %s -g -emit-ir -o - | %FileCheck %s +// RUN: %target-swift-frontend %s -g -emit-ir -o - | %FileCheck %s class X { init (i : Int64) { x = i } diff --git a/test/DebugInfo/scope-closure.swift b/test/DebugInfo/scope-closure.swift index 02cb811e801..7ea9b742dc2 100644 --- a/test/DebugInfo/scope-closure.swift +++ b/test/DebugInfo/scope-closure.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-ir -g %s -o - | %FileCheck %s +// RUN: %target-swift-frontend -emit-ir -g %s -o - | %FileCheck %s // // A top-level closure is expected to have the main module as scope and not the // top_level_code function. diff --git a/test/DebugInfo/self-nostorage.swift b/test/DebugInfo/self-nostorage.swift index 570405024b5..1f565095f37 100644 --- a/test/DebugInfo/self-nostorage.swift +++ b/test/DebugInfo/self-nostorage.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -primary-file %s -emit-ir -g -o - | %FileCheck %s +// RUN: %target-swift-frontend -primary-file %s -emit-ir -g -o - | %FileCheck %s public struct S { func f() { diff --git a/test/DebugInfo/self.swift b/test/DebugInfo/self.swift index 26b44276954..0c5b2834cd5 100644 --- a/test/DebugInfo/self.swift +++ b/test/DebugInfo/self.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -primary-file %s -emit-ir -g -o - | %FileCheck %s +// RUN: %target-swift-frontend -primary-file %s -emit-ir -g -o - | %FileCheck %s public struct stuffStruct { var a: Int64 = 6 diff --git a/test/DebugInfo/shadow_copies.swift b/test/DebugInfo/shadow_copies.swift index 615331b9b7e..044d8c88666 100644 --- a/test/DebugInfo/shadow_copies.swift +++ b/test/DebugInfo/shadow_copies.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests %s -Onone -emit-ir -g -o - | %FileCheck %s +// RUN: %target-swift-frontend %s -Onone -emit-ir -g -o - | %FileCheck %s class ClassA { diff --git a/test/DebugInfo/specialization.swift b/test/DebugInfo/specialization.swift index db466c91cd5..8e1139071de 100644 --- a/test/DebugInfo/specialization.swift +++ b/test/DebugInfo/specialization.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -O %s -disable-llvm-optzns -emit-sil -g -o - | %FileCheck %s +// RUN: %target-swift-frontend -O %s -disable-llvm-optzns -emit-sil -g -o - | %FileCheck %s // CHECK: sil shared [noinline] @_T014specialization3sumxx_xtAA5ProtoRzlFAA7AddableV_Tg5 // CHECK-SAME: $@convention(thin) (Addable, Addable) -> Addable { diff --git a/test/DebugInfo/structs.swift b/test/DebugInfo/structs.swift index 65cdd01cfb1..09ffd53bfe9 100644 --- a/test/DebugInfo/structs.swift +++ b/test/DebugInfo/structs.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -primary-file %s -emit-ir -g -o - | %FileCheck %s +// RUN: %target-swift-frontend -primary-file %s -emit-ir -g -o - | %FileCheck %s // Capture the pointer size from type Int // CHECK: %TSi = type <{ i[[PTRSIZE:[0-9]+]] }> diff --git a/test/DebugInfo/thunks.swift b/test/DebugInfo/thunks.swift index fe8ce55c8f7..b307e22f243 100644 --- a/test/DebugInfo/thunks.swift +++ b/test/DebugInfo/thunks.swift @@ -1,5 +1,5 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-ir -g %s -o - | %FileCheck %s -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-sil -emit-verbose-sil -g %s -o - | %FileCheck %s --check-prefix=SIL-CHECK +// RUN: %target-swift-frontend -emit-ir -g %s -o - | %FileCheck %s +// RUN: %target-swift-frontend -emit-sil -emit-verbose-sil -g %s -o - | %FileCheck %s --check-prefix=SIL-CHECK // REQUIRES: objc_interop import Foundation diff --git a/test/DebugInfo/value-witness-table.swift b/test/DebugInfo/value-witness-table.swift index 80f6e49b1a3..345f5e6e5d1 100644 --- a/test/DebugInfo/value-witness-table.swift +++ b/test/DebugInfo/value-witness-table.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -g -emit-ir %s | %FileCheck %s --check-prefix=CHECK-%target-ptrsize --check-prefix=CHECK +// RUN: %target-swift-frontend -g -emit-ir %s | %FileCheck %s --check-prefix=CHECK-%target-ptrsize --check-prefix=CHECK // Test that we don't generate debug info for hidden global variables. diff --git a/test/Frontend/InternalChecks.swift b/test/Frontend/InternalChecks.swift index 5081d74779f..f11284aab5f 100644 --- a/test/Frontend/InternalChecks.swift +++ b/test/Frontend/InternalChecks.swift @@ -1,5 +1,5 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -O -parse-stdlib -D INTERNAL_CHECKS_ENABLED -primary-file %s -emit-sil | %FileCheck %s --check-prefix=CHECKS -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -O -parse-stdlib -primary-file %s -emit-sil | %FileCheck %s --check-prefix=NOCHECKS +// RUN: %target-swift-frontend -O -parse-stdlib -D INTERNAL_CHECKS_ENABLED -primary-file %s -emit-sil | %FileCheck %s --check-prefix=CHECKS +// RUN: %target-swift-frontend -O -parse-stdlib -primary-file %s -emit-sil | %FileCheck %s --check-prefix=NOCHECKS import Swift diff --git a/test/Frontend/OptimizationOptions-without-stdlib-checks.swift b/test/Frontend/OptimizationOptions-without-stdlib-checks.swift index 544e25391e3..40595cd6f8f 100644 --- a/test/Frontend/OptimizationOptions-without-stdlib-checks.swift +++ b/test/Frontend/OptimizationOptions-without-stdlib-checks.swift @@ -1,7 +1,7 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -module-name OptimizationOptions -Onone -emit-sil -primary-file %s -o - | %FileCheck %s --check-prefix=DEBUG -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -module-name OptimizationOptions -O -emit-sil -primary-file %s -o - | %FileCheck %s --check-prefix=RELEASE -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -module-name OptimizationOptions -Ounchecked -emit-sil -primary-file %s -o - | %FileCheck %s --check-prefix=UNCHECKED -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -module-name OptimizationOptions -Oplayground -emit-sil -primary-file %s -o - | %FileCheck %s --check-prefix=PLAYGROUND +// RUN: %target-swift-frontend -module-name OptimizationOptions -Onone -emit-sil -primary-file %s -o - | %FileCheck %s --check-prefix=DEBUG +// RUN: %target-swift-frontend -module-name OptimizationOptions -O -emit-sil -primary-file %s -o - | %FileCheck %s --check-prefix=RELEASE +// RUN: %target-swift-frontend -module-name OptimizationOptions -Ounchecked -emit-sil -primary-file %s -o - | %FileCheck %s --check-prefix=UNCHECKED +// RUN: %target-swift-frontend -module-name OptimizationOptions -Oplayground -emit-sil -primary-file %s -o - | %FileCheck %s --check-prefix=PLAYGROUND // REQUIRES: optimized_stdlib // REQUIRES: swift_stdlib_no_asserts diff --git a/test/IDE/comment_extensions.swift b/test/IDE/comment_extensions.swift index f1c2da550cb..727bb2d8c08 100644 --- a/test/IDE/comment_extensions.swift +++ b/test/IDE/comment_extensions.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-ide-test -new-mangling-for-tests -print-comments -source-filename %S/Inputs/comment_extensions.swift -comments-xml-schema %S/../../bindings/xml/comment-xml-schema.rng | %FileCheck %s +// RUN: %target-swift-ide-test -print-comments -source-filename %S/Inputs/comment_extensions.swift -comments-xml-schema %S/../../bindings/xml/comment-xml-schema.rng | %FileCheck %s // Content is in separate file in ./Inputs due to the "requires" keyword getting // recognized by lit. diff --git a/test/IDE/comment_inherited_class.swift b/test/IDE/comment_inherited_class.swift index dbee6a04dc5..e3f817ef792 100644 --- a/test/IDE/comment_inherited_class.swift +++ b/test/IDE/comment_inherited_class.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-ide-test -new-mangling-for-tests -print-comments -source-filename %s | %FileCheck %s +// RUN: %target-swift-ide-test -print-comments -source-filename %s | %FileCheck %s // REQUIRES: no_asan class Base { diff --git a/test/IDE/comment_inherited_protocol.swift b/test/IDE/comment_inherited_protocol.swift index 9a204d4177b..db9ceb3676b 100644 --- a/test/IDE/comment_inherited_protocol.swift +++ b/test/IDE/comment_inherited_protocol.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-ide-test -new-mangling-for-tests -print-comments -source-filename %s | %FileCheck %s +// RUN: %target-swift-ide-test -print-comments -source-filename %s | %FileCheck %s protocol ParentProtocol1 { /// ParentProtocol1.onlyParent1() diff --git a/test/IDE/comment_measurement.swift b/test/IDE/comment_measurement.swift index fadec237e12..44f3d0e132d 100644 --- a/test/IDE/comment_measurement.swift +++ b/test/IDE/comment_measurement.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-ide-test -new-mangling-for-tests -print-comments -source-filename %s -comments-xml-schema %S/../../bindings/xml/comment-xml-schema.rng | %FileCheck %s +// RUN: %target-swift-ide-test -print-comments -source-filename %s -comments-xml-schema %S/../../bindings/xml/comment-xml-schema.rng | %FileCheck %s /// Brief. /// diff --git a/test/IDE/comment_to_xml.swift b/test/IDE/comment_to_xml.swift index 61e1ba102a0..0ed4bede51d 100644 --- a/test/IDE/comment_to_xml.swift +++ b/test/IDE/comment_to_xml.swift @@ -1,7 +1,7 @@ //===--- Check that we convert comments to XML correctly. -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -typecheck -verify -disable-objc-attr-requires-foundation-module %S/../Inputs/comment_to_something_conversion.swift -// RUN: %target-swift-ide-test -new-mangling-for-tests -print-comments -source-filename %S/../Inputs/comment_to_something_conversion.swift -comments-xml-schema %S/../../bindings/xml/comment-xml-schema.rng > %t.txt +// RUN: %target-swift-frontend -typecheck -verify -disable-objc-attr-requires-foundation-module %S/../Inputs/comment_to_something_conversion.swift +// RUN: %target-swift-ide-test -print-comments -source-filename %S/../Inputs/comment_to_something_conversion.swift -comments-xml-schema %S/../../bindings/xml/comment-xml-schema.rng > %t.txt // RUN: %FileCheck %S/../Inputs/comment_to_something_conversion.swift < %t.txt // RUN: %FileCheck %s -check-prefix=WRONG < %t.txt diff --git a/test/IDE/print_usrs.swift b/test/IDE/print_usrs.swift index 9051b3cd09f..289e802f481 100644 --- a/test/IDE/print_usrs.swift +++ b/test/IDE/print_usrs.swift @@ -1,5 +1,5 @@ // RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -verify -disable-objc-attr-requires-foundation-module %s -// RUN: %target-swift-ide-test(mock-sdk: %clang-importer-sdk) -new-mangling-for-tests -print-usrs -source-filename %s | %FileCheck %s -strict-whitespace +// RUN: %target-swift-ide-test(mock-sdk: %clang-importer-sdk) -print-usrs -source-filename %s | %FileCheck %s -strict-whitespace import macros diff --git a/test/IDE/print_usrs_invalid.swift b/test/IDE/print_usrs_invalid.swift index 741502f6220..2c8fb5810b8 100644 --- a/test/IDE/print_usrs_invalid.swift +++ b/test/IDE/print_usrs_invalid.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-ide-test -new-mangling-for-tests -print-usrs -source-filename %s | %FileCheck %s -strict-whitespace +// RUN: %target-swift-ide-test -print-usrs -source-filename %s | %FileCheck %s -strict-whitespace // CHECK: [[@LINE+1]]:6 s:14swift_ide_test11InvalidEnumO{{$}} enum InvalidEnum { diff --git a/test/IRGen/abitypes.swift b/test/IRGen/abitypes.swift index 5967dbf87c7..bda17a2f096 100644 --- a/test/IRGen/abitypes.swift +++ b/test/IRGen/abitypes.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -Xllvm -new-mangling-for-tests -I %S/Inputs/abi %s -emit-ir | %FileCheck -check-prefix=%target-cpu-%target-os %s +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -I %S/Inputs/abi %s -emit-ir | %FileCheck -check-prefix=%target-cpu-%target-os %s // FIXME: rdar://problem/19648117 Needs splitting objc parts out // XFAIL: linux diff --git a/test/IRGen/access_control.sil b/test/IRGen/access_control.sil index 4a15157095b..bcb81a975d1 100644 --- a/test/IRGen/access_control.sil +++ b/test/IRGen/access_control.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -assume-parsing-unqualified-ownership-sil -emit-ir %s | %FileCheck %s +// RUN: %target-swift-frontend -assume-parsing-unqualified-ownership-sil -emit-ir %s | %FileCheck %s import Builtin import Swift diff --git a/test/IRGen/alloc.sil b/test/IRGen/alloc.sil index 9807ae5b5f1..9548e9a4beb 100644 --- a/test/IRGen/alloc.sil +++ b/test/IRGen/alloc.sil @@ -1,9 +1,9 @@ -// RUN: %swift -Xllvm -new-mangling-for-tests -target x86_64-apple-macosx10.9 -module-name main %s -emit-ir -o - | %FileCheck %s -// RUN: %swift -Xllvm -new-mangling-for-tests -target i386-apple-ios7.0 %s -module-name main -emit-ir -o - | %FileCheck %s -// RUN: %swift -Xllvm -new-mangling-for-tests -target x86_64-apple-ios7.0 %s -module-name main -emit-ir -o - | %FileCheck %s -// RUN: %swift -Xllvm -new-mangling-for-tests -target armv7-apple-ios7.0 %s -module-name main -emit-ir -o - | %FileCheck %s -// RUN: %swift -Xllvm -new-mangling-for-tests -target arm64-apple-ios7.0 %s -module-name main -emit-ir -o - | %FileCheck %s -// RUN: %swift -Xllvm -new-mangling-for-tests -target x86_64-unknown-linux-gnu %s -disable-objc-interop -module-name main -emit-ir -o - | %FileCheck %s +// RUN: %swift -target x86_64-apple-macosx10.9 -module-name main %s -emit-ir -o - | %FileCheck %s +// RUN: %swift -target i386-apple-ios7.0 %s -module-name main -emit-ir -o - | %FileCheck %s +// RUN: %swift -target x86_64-apple-ios7.0 %s -module-name main -emit-ir -o - | %FileCheck %s +// RUN: %swift -target armv7-apple-ios7.0 %s -module-name main -emit-ir -o - | %FileCheck %s +// RUN: %swift -target arm64-apple-ios7.0 %s -module-name main -emit-ir -o - | %FileCheck %s +// RUN: %swift -target x86_64-unknown-linux-gnu %s -disable-objc-interop -module-name main -emit-ir -o - | %FileCheck %s // REQUIRES: CODEGENERATOR=X86 // REQUIRES: CODEGENERATOR=ARM diff --git a/test/IRGen/array_value_witnesses.sil b/test/IRGen/array_value_witnesses.sil index 1f801e88ee7..456ce12fca3 100644 --- a/test/IRGen/array_value_witnesses.sil +++ b/test/IRGen/array_value_witnesses.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -assume-parsing-unqualified-ownership-sil %s -emit-ir | %FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-%target-ptrsize +// RUN: %target-swift-frontend -assume-parsing-unqualified-ownership-sil %s -emit-ir | %FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-%target-ptrsize import Swift diff --git a/test/IRGen/associated_type_witness.swift b/test/IRGen/associated_type_witness.swift index 8c1a8378900..a8ae3d0a6f5 100644 --- a/test/IRGen/associated_type_witness.swift +++ b/test/IRGen/associated_type_witness.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -assume-parsing-unqualified-ownership-sil -primary-file %s -emit-ir > %t.ll +// RUN: %target-swift-frontend -assume-parsing-unqualified-ownership-sil -primary-file %s -emit-ir > %t.ll // RUN: %FileCheck %s -check-prefix=GLOBAL < %t.ll // RUN: %FileCheck %s < %t.ll // REQUIRES: CPU=x86_64 diff --git a/test/IRGen/associated_types.swift b/test/IRGen/associated_types.swift index 2260286687d..7de27796cc7 100644 --- a/test/IRGen/associated_types.swift +++ b/test/IRGen/associated_types.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -assume-parsing-unqualified-ownership-sil -emit-ir -primary-file %s | %FileCheck %s +// RUN: %target-swift-frontend -assume-parsing-unqualified-ownership-sil -emit-ir -primary-file %s | %FileCheck %s // REQUIRES: CPU=i386_or_x86_64 diff --git a/test/IRGen/boxed_existential.sil b/test/IRGen/boxed_existential.sil index de239b3f4a0..809e9614262 100644 --- a/test/IRGen/boxed_existential.sil +++ b/test/IRGen/boxed_existential.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -assume-parsing-unqualified-ownership-sil %s -emit-ir | %FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-%target-ptrsize --check-prefix=CHECK-%target-runtime +// RUN: %target-swift-frontend -assume-parsing-unqualified-ownership-sil %s -emit-ir | %FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-%target-ptrsize --check-prefix=CHECK-%target-runtime import Swift diff --git a/test/IRGen/builtins.swift b/test/IRGen/builtins.swift index 1da1ce02505..eea0e70d335 100644 --- a/test/IRGen/builtins.swift +++ b/test/IRGen/builtins.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -assume-parsing-unqualified-ownership-sil -parse-stdlib -primary-file %s -emit-ir -o - -disable-objc-attr-requires-foundation-module | %FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-%target-runtime +// RUN: %target-swift-frontend -assume-parsing-unqualified-ownership-sil -parse-stdlib -primary-file %s -emit-ir -o - -disable-objc-attr-requires-foundation-module | %FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-%target-runtime // REQUIRES: executable_test // REQUIRES: CPU=x86_64 diff --git a/test/IRGen/c_functions.swift b/test/IRGen/c_functions.swift index 4e072f2c866..b755af57459 100644 --- a/test/IRGen/c_functions.swift +++ b/test/IRGen/c_functions.swift @@ -1,5 +1,5 @@ // RUN: rm -rf %t && mkdir -p %t -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -assume-parsing-unqualified-ownership-sil -import-objc-header %S/Inputs/c_functions.h -primary-file %s -emit-ir | %FileCheck %s +// RUN: %target-swift-frontend -assume-parsing-unqualified-ownership-sil -import-objc-header %S/Inputs/c_functions.h -primary-file %s -emit-ir | %FileCheck %s // This is deliberately not a SIL test so that we can test SILGen too. diff --git a/test/IRGen/c_globals.swift b/test/IRGen/c_globals.swift index 4e8def1237f..e73becdb595 100644 --- a/test/IRGen/c_globals.swift +++ b/test/IRGen/c_globals.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -Xllvm -new-mangling-for-tests -I %S/Inputs/abi %s -emit-ir | %FileCheck %s +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -I %S/Inputs/abi %s -emit-ir | %FileCheck %s import c_layout diff --git a/test/IRGen/casts.sil b/test/IRGen/casts.sil index ef94f22c7b0..b373142a267 100644 --- a/test/IRGen/casts.sil +++ b/test/IRGen/casts.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -assume-parsing-unqualified-ownership-sil -Xllvm -sil-disable-pass="External Defs To Decls" %s -emit-ir -disable-objc-attr-requires-foundation-module | %FileCheck %s +// RUN: %target-swift-frontend -assume-parsing-unqualified-ownership-sil -Xllvm -sil-disable-pass="External Defs To Decls" %s -emit-ir -disable-objc-attr-requires-foundation-module | %FileCheck %s // REQUIRES: CPU=i386_or_x86_64 // XFAIL: linux diff --git a/test/IRGen/clang_inline.swift b/test/IRGen/clang_inline.swift index 58eec1588fc..37295f29c37 100644 --- a/test/IRGen/clang_inline.swift +++ b/test/IRGen/clang_inline.swift @@ -4,11 +4,11 @@ // inlineable. // RUN: rm -rf %t && mkdir -p %t -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -assume-parsing-unqualified-ownership-sil -sdk %S/Inputs -primary-file %s -Xcc -O3 -emit-ir | %FileCheck %s +// RUN: %target-swift-frontend -assume-parsing-unqualified-ownership-sil -sdk %S/Inputs -primary-file %s -Xcc -O3 -emit-ir | %FileCheck %s // RUN: mkdir -p %t/Empty.framework/Modules/Empty.swiftmodule -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -assume-parsing-unqualified-ownership-sil -emit-module-path %t/Empty.framework/Modules/Empty.swiftmodule/%target-swiftmodule-name %S/../Inputs/empty.swift -module-name Empty -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -assume-parsing-unqualified-ownership-sil -sdk %S/Inputs -primary-file %s -F %t -DIMPORT_EMPTY -Xcc -O3 -emit-ir > %t.ll +// RUN: %target-swift-frontend -assume-parsing-unqualified-ownership-sil -emit-module-path %t/Empty.framework/Modules/Empty.swiftmodule/%target-swiftmodule-name %S/../Inputs/empty.swift -module-name Empty +// RUN: %target-swift-frontend -assume-parsing-unqualified-ownership-sil -sdk %S/Inputs -primary-file %s -F %t -DIMPORT_EMPTY -Xcc -O3 -emit-ir > %t.ll // RUN: %FileCheck %s < %t.ll // RUN: %FileCheck -check-prefix=NEGATIVE %s < %t.ll diff --git a/test/IRGen/clang_inline_reverse.swift b/test/IRGen/clang_inline_reverse.swift index f0d587b6c08..af5aa09ee9f 100644 --- a/test/IRGen/clang_inline_reverse.swift +++ b/test/IRGen/clang_inline_reverse.swift @@ -1,6 +1,6 @@ // Same test as clang_inline.swift, but with the order swapped. -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -assume-parsing-unqualified-ownership-sil -sdk %S/Inputs -primary-file %s -emit-ir -module-name clang_inline | %FileCheck %s +// RUN: %target-swift-frontend -assume-parsing-unqualified-ownership-sil -sdk %S/Inputs -primary-file %s -emit-ir -module-name clang_inline | %FileCheck %s // REQUIRES: CPU=i386_or_x86_64 // XFAIL: linux diff --git a/test/IRGen/class_bounded_generics.swift b/test/IRGen/class_bounded_generics.swift index a71fa83f2d0..867b4c145ca 100644 --- a/test/IRGen/class_bounded_generics.swift +++ b/test/IRGen/class_bounded_generics.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -assume-parsing-unqualified-ownership-sil -emit-ir -primary-file %s -disable-objc-attr-requires-foundation-module | %FileCheck %s +// RUN: %target-swift-frontend -assume-parsing-unqualified-ownership-sil -emit-ir -primary-file %s -disable-objc-attr-requires-foundation-module | %FileCheck %s // REQUIRES: CPU=x86_64 // XFAIL: linux diff --git a/test/IRGen/class_constraint.sil b/test/IRGen/class_constraint.sil index 97182faa11e..e2c6ece7c96 100644 --- a/test/IRGen/class_constraint.sil +++ b/test/IRGen/class_constraint.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -assume-parsing-unqualified-ownership-sil -emit-ir -primary-file %s | %FileCheck %s +// RUN: %target-swift-frontend -assume-parsing-unqualified-ownership-sil -emit-ir -primary-file %s | %FileCheck %s protocol P {} class A : P {} diff --git a/test/IRGen/class_isa_pointers.sil b/test/IRGen/class_isa_pointers.sil index 971ac8569c3..70301d75f71 100644 --- a/test/IRGen/class_isa_pointers.sil +++ b/test/IRGen/class_isa_pointers.sil @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir -p %t // RUN: %build-irgen-test-overlays -// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -Xllvm -new-mangling-for-tests %s -emit-ir | %FileCheck %s +// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) %s -emit-ir | %FileCheck %s // REQUIRES: CPU=x86_64 // REQUIRES: objc_interop diff --git a/test/IRGen/class_resilience.swift b/test/IRGen/class_resilience.swift index 8dc1bc19c98..84099150d03 100644 --- a/test/IRGen/class_resilience.swift +++ b/test/IRGen/class_resilience.swift @@ -2,7 +2,7 @@ // RUN: %target-swift-frontend -emit-module -enable-resilience -enable-class-resilience -emit-module-path=%t/resilient_struct.swiftmodule -module-name=resilient_struct %S/../Inputs/resilient_struct.swift // RUN: %target-swift-frontend -emit-module -enable-resilience -enable-class-resilience -emit-module-path=%t/resilient_enum.swiftmodule -module-name=resilient_enum -I %t %S/../Inputs/resilient_enum.swift // RUN: %target-swift-frontend -emit-module -enable-resilience -enable-class-resilience -emit-module-path=%t/resilient_class.swiftmodule -module-name=resilient_class -I %t %S/../Inputs/resilient_class.swift -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -I %t -emit-ir -enable-resilience -enable-class-resilience %s | %FileCheck %s +// RUN: %target-swift-frontend -I %t -emit-ir -enable-resilience -enable-class-resilience %s | %FileCheck %s // RUN: %target-swift-frontend -I %t -emit-ir -enable-resilience -enable-class-resilience -O %s // CHECK: %swift.type = type { [[INT:i32|i64]] } diff --git a/test/IRGen/class_resilience_objc.swift b/test/IRGen/class_resilience_objc.swift index 08d98cccdb1..c4141044e6b 100644 --- a/test/IRGen/class_resilience_objc.swift +++ b/test/IRGen/class_resilience_objc.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -Xllvm -new-mangling-for-tests -emit-ir -o - -primary-file %s | %FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-%target-ptrsize +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -emit-ir -o - -primary-file %s | %FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-%target-ptrsize // REQUIRES: objc_interop // XFAIL: CPU=armv7k diff --git a/test/IRGen/class_stack_alloc.sil b/test/IRGen/class_stack_alloc.sil index 53fccba392b..076c13ec8f2 100644 --- a/test/IRGen/class_stack_alloc.sil +++ b/test/IRGen/class_stack_alloc.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -assume-parsing-unqualified-ownership-sil -stack-promotion-limit 48 -Onone -emit-ir %s | %FileCheck %s +// RUN: %target-swift-frontend -assume-parsing-unqualified-ownership-sil -stack-promotion-limit 48 -Onone -emit-ir %s | %FileCheck %s import Builtin import Swift diff --git a/test/IRGen/class_with_stub_initializers.swift b/test/IRGen/class_with_stub_initializers.swift index b54b80f38e3..00dca0706cf 100644 --- a/test/IRGen/class_with_stub_initializers.swift +++ b/test/IRGen/class_with_stub_initializers.swift @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir -p %t // RUN: %build-irgen-test-overlays -// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -Xllvm -new-mangling-for-tests %s -emit-ir | %FileCheck %s +// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) %s -emit-ir | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/IRGen/closure.swift b/test/IRGen/closure.swift index 666f9f2a8d9..4fe4c9b7aa9 100644 --- a/test/IRGen/closure.swift +++ b/test/IRGen/closure.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -assume-parsing-unqualified-ownership-sil -primary-file %s -emit-ir | %FileCheck %s +// RUN: %target-swift-frontend -assume-parsing-unqualified-ownership-sil -primary-file %s -emit-ir | %FileCheck %s // REQUIRES: CPU=x86_64 diff --git a/test/IRGen/concrete_inherits_generic_base.swift b/test/IRGen/concrete_inherits_generic_base.swift index 415deb6eaad..74a206ec7f5 100644 --- a/test/IRGen/concrete_inherits_generic_base.swift +++ b/test/IRGen/concrete_inherits_generic_base.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -assume-parsing-unqualified-ownership-sil -module-name foo -emit-ir %s | %FileCheck %s +// RUN: %target-swift-frontend -assume-parsing-unqualified-ownership-sil -module-name foo -emit-ir %s | %FileCheck %s // CHECK: %swift.type = type { [[INT:i32|i64]] } diff --git a/test/IRGen/coverage.swift b/test/IRGen/coverage.swift index a6d659e17d8..2d0b5ceec06 100644 --- a/test/IRGen/coverage.swift +++ b/test/IRGen/coverage.swift @@ -1,5 +1,5 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -assume-parsing-unqualified-ownership-sil %s -profile-generate -profile-coverage-mapping -emit-sil -o - | %FileCheck %s --check-prefix=SIL -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -assume-parsing-unqualified-ownership-sil %s -profile-generate -profile-coverage-mapping -emit-ir -o - | %FileCheck %s --check-prefix=IR +// RUN: %target-swift-frontend -assume-parsing-unqualified-ownership-sil %s -profile-generate -profile-coverage-mapping -emit-sil -o - | %FileCheck %s --check-prefix=SIL +// RUN: %target-swift-frontend -assume-parsing-unqualified-ownership-sil %s -profile-generate -profile-coverage-mapping -emit-ir -o - | %FileCheck %s --check-prefix=IR // IR-NOT: __llvm_coverage_names // IR-NOT: __profn diff --git a/test/IRGen/deallocate.swift b/test/IRGen/deallocate.swift index 706d2312e91..8ad4889e152 100644 --- a/test/IRGen/deallocate.swift +++ b/test/IRGen/deallocate.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -assume-parsing-unqualified-ownership-sil -emit-ir %s | %FileCheck %s +// RUN: %target-swift-frontend -assume-parsing-unqualified-ownership-sil -emit-ir %s | %FileCheck %s // REQUIRES: CPU=x86_64 // REQUIRES: objc_interop diff --git a/test/IRGen/decls.swift b/test/IRGen/decls.swift index a994822684f..890bde11ea5 100644 --- a/test/IRGen/decls.swift +++ b/test/IRGen/decls.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -assume-parsing-unqualified-ownership-sil %s -emit-ir | %FileCheck %s +// RUN: %target-swift-frontend -assume-parsing-unqualified-ownership-sil %s -emit-ir | %FileCheck %s // Check that we emit all local decls, not just the first one. func test1() { diff --git a/test/IRGen/dependent_reabstraction.swift b/test/IRGen/dependent_reabstraction.swift index aff308f5ca9..a1d9aa9a042 100644 --- a/test/IRGen/dependent_reabstraction.swift +++ b/test/IRGen/dependent_reabstraction.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -assume-parsing-unqualified-ownership-sil -emit-ir %s | %FileCheck %s +// RUN: %target-swift-frontend -assume-parsing-unqualified-ownership-sil -emit-ir %s | %FileCheck %s func markUsed(_ t: T) {} diff --git a/test/IRGen/dllexport.swift b/test/IRGen/dllexport.swift index a6f2f051f31..b0ea8e6075d 100644 --- a/test/IRGen/dllexport.swift +++ b/test/IRGen/dllexport.swift @@ -1,5 +1,5 @@ -// RUN: %swift -Xllvm -new-mangling-for-tests -target thumbv7--windows-itanium -emit-ir -parse-as-library -parse-stdlib -module-name dllexport %s -o - | %FileCheck %s -check-prefix CHECK -check-prefix CHECK-NO-OPT -// RUN: %swift -Xllvm -new-mangling-for-tests -target thumbv7--windows-itanium -O -emit-ir -parse-as-library -parse-stdlib -module-name dllexport %s -o - | %FileCheck %s -check-prefix CHECK -check-prefix CHECK-OPT +// RUN: %swift -target thumbv7--windows-itanium -emit-ir -parse-as-library -parse-stdlib -module-name dllexport %s -o - | %FileCheck %s -check-prefix CHECK -check-prefix CHECK-NO-OPT +// RUN: %swift -target thumbv7--windows-itanium -O -emit-ir -parse-as-library -parse-stdlib -module-name dllexport %s -o - | %FileCheck %s -check-prefix CHECK -check-prefix CHECK-OPT // REQUIRES: CODEGENERATOR=ARM diff --git a/test/IRGen/dynamic_cast.sil b/test/IRGen/dynamic_cast.sil index 0f00bdb77dc..ab3f75e20b0 100644 --- a/test/IRGen/dynamic_cast.sil +++ b/test/IRGen/dynamic_cast.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -assume-parsing-unqualified-ownership-sil -emit-ir %s | %FileCheck %s +// RUN: %target-swift-frontend -assume-parsing-unqualified-ownership-sil -emit-ir %s | %FileCheck %s // REQUIRES: CPU=i386_or_x86_64 diff --git a/test/IRGen/dynamic_lookup.sil b/test/IRGen/dynamic_lookup.sil index 0f58da0ac4f..33908281b98 100644 --- a/test/IRGen/dynamic_lookup.sil +++ b/test/IRGen/dynamic_lookup.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -assume-parsing-unqualified-ownership-sil -emit-ir %s | %FileCheck %s +// RUN: %target-swift-frontend -assume-parsing-unqualified-ownership-sil -emit-ir %s | %FileCheck %s // REQUIRES: CPU=i386_or_x86_64 // REQUIRES: objc_interop diff --git a/test/IRGen/enum.sil b/test/IRGen/enum.sil index 0bfebe9448c..ac579588ecb 100644 --- a/test/IRGen/enum.sil +++ b/test/IRGen/enum.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -assume-parsing-unqualified-ownership-sil %s -gnone -emit-ir -disable-objc-attr-requires-foundation-module | %FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-%target-ptrsize --check-prefix=CHECK-%target-runtime-%target-ptrsize +// RUN: %target-swift-frontend -assume-parsing-unqualified-ownership-sil %s -gnone -emit-ir -disable-objc-attr-requires-foundation-module | %FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-%target-ptrsize --check-prefix=CHECK-%target-runtime-%target-ptrsize // REQUIRES: CPU=i386_or_x86_64 diff --git a/test/IRGen/enum_derived.swift b/test/IRGen/enum_derived.swift index 1d710eedc3d..c0f9c18d9c0 100644 --- a/test/IRGen/enum_derived.swift +++ b/test/IRGen/enum_derived.swift @@ -1,8 +1,8 @@ // RUN: rm -rf %t // RUN: mkdir -p %t // RUN: %target-swift-frontend -assume-parsing-unqualified-ownership-sil -emit-module -module-name def_enum -o %t %S/Inputs/def_enum.swift -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -assume-parsing-unqualified-ownership-sil -I %t -O -primary-file %s -emit-ir | %FileCheck -check-prefix=CHECK -check-prefix=CHECK-NORMAL %s -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -assume-parsing-unqualified-ownership-sil -I %t -O -primary-file %s -enable-testing -emit-ir | %FileCheck -check-prefix=CHECK -check-prefix=CHECK-TESTABLE %s +// RUN: %target-swift-frontend -assume-parsing-unqualified-ownership-sil -I %t -O -primary-file %s -emit-ir | %FileCheck -check-prefix=CHECK -check-prefix=CHECK-NORMAL %s +// RUN: %target-swift-frontend -assume-parsing-unqualified-ownership-sil -I %t -O -primary-file %s -enable-testing -emit-ir | %FileCheck -check-prefix=CHECK -check-prefix=CHECK-TESTABLE %s import def_enum diff --git a/test/IRGen/enum_dynamic_multi_payload.sil b/test/IRGen/enum_dynamic_multi_payload.sil index 35e40911d9a..374053808ae 100644 --- a/test/IRGen/enum_dynamic_multi_payload.sil +++ b/test/IRGen/enum_dynamic_multi_payload.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -assume-parsing-unqualified-ownership-sil %s -gnone -emit-ir -I %S/Inputs | %FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-%target-ptrsize +// RUN: %target-swift-frontend -assume-parsing-unqualified-ownership-sil %s -gnone -emit-ir -I %S/Inputs | %FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-%target-ptrsize import Builtin diff --git a/test/IRGen/enum_spare_bits.sil b/test/IRGen/enum_spare_bits.sil index faf16ed9629..6cee3dc84cb 100644 --- a/test/IRGen/enum_spare_bits.sil +++ b/test/IRGen/enum_spare_bits.sil @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir -p %t // RUN: %build-irgen-test-overlays -// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -Xllvm -new-mangling-for-tests %s -emit-ir | %FileCheck --check-prefix=CHECK --check-prefix=CHECK-%target-ptrsize %s +// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) %s -emit-ir | %FileCheck --check-prefix=CHECK --check-prefix=CHECK-%target-ptrsize %s // REQUIRES: CPU=i386_or_x86_64 // REQUIRES: objc_interop diff --git a/test/IRGen/enum_value_semantics_special_cases.sil b/test/IRGen/enum_value_semantics_special_cases.sil index 17bac32fa24..e8bca4400ad 100644 --- a/test/IRGen/enum_value_semantics_special_cases.sil +++ b/test/IRGen/enum_value_semantics_special_cases.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -assume-parsing-unqualified-ownership-sil %s -emit-ir | %FileCheck %s +// RUN: %target-swift-frontend -assume-parsing-unqualified-ownership-sil %s -emit-ir | %FileCheck %s // REQUIRES: CPU=x86_64 diff --git a/test/IRGen/enum_value_semantics_special_cases_objc.sil b/test/IRGen/enum_value_semantics_special_cases_objc.sil index a5a43067854..782df755721 100644 --- a/test/IRGen/enum_value_semantics_special_cases_objc.sil +++ b/test/IRGen/enum_value_semantics_special_cases_objc.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -assume-parsing-unqualified-ownership-sil %s -emit-ir | %FileCheck %s +// RUN: %target-swift-frontend -assume-parsing-unqualified-ownership-sil %s -emit-ir | %FileCheck %s // REQUIRES: CPU=x86_64 // REQUIRES: objc_interop diff --git a/test/IRGen/expressions.swift b/test/IRGen/expressions.swift index 36e472c8f92..e113eb83bb0 100644 --- a/test/IRGen/expressions.swift +++ b/test/IRGen/expressions.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -assume-parsing-unqualified-ownership-sil -primary-file %s -emit-ir -parse-stdlib -disable-access-control | %FileCheck %s +// RUN: %target-swift-frontend -assume-parsing-unqualified-ownership-sil -primary-file %s -emit-ir -parse-stdlib -disable-access-control | %FileCheck %s // REQUIRES: CPU=x86_64 diff --git a/test/IRGen/foreign_types.sil b/test/IRGen/foreign_types.sil index c57c2b53923..b52ce5b5578 100644 --- a/test/IRGen/foreign_types.sil +++ b/test/IRGen/foreign_types.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -assume-parsing-unqualified-ownership-sil -I %S/Inputs/abi %s -emit-ir | %FileCheck %s +// RUN: %target-swift-frontend -assume-parsing-unqualified-ownership-sil -I %S/Inputs/abi %s -emit-ir | %FileCheck %s sil_stage canonical import c_layout diff --git a/test/IRGen/generic_class_anyobject.swift b/test/IRGen/generic_class_anyobject.swift index f5d9d4c26a2..d37f4f46ab2 100644 --- a/test/IRGen/generic_class_anyobject.swift +++ b/test/IRGen/generic_class_anyobject.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -assume-parsing-unqualified-ownership-sil -primary-file %s -emit-ir | %FileCheck %s +// RUN: %target-swift-frontend -assume-parsing-unqualified-ownership-sil -primary-file %s -emit-ir | %FileCheck %s // REQUIRES: CPU=i386_or_x86_64 // REQUIRES: objc_interop diff --git a/test/IRGen/generic_classes_objc.sil b/test/IRGen/generic_classes_objc.sil index e476e6fffad..087ae5b630b 100644 --- a/test/IRGen/generic_classes_objc.sil +++ b/test/IRGen/generic_classes_objc.sil @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir -p %t // RUN: %build-irgen-test-overlays -// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -Xllvm -new-mangling-for-tests %s -emit-ir | %FileCheck %s +// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) %s -emit-ir | %FileCheck %s // REQUIRES: CPU=i386_or_x86_64 // REQUIRES: objc_interop diff --git a/test/IRGen/generic_metatypes.swift b/test/IRGen/generic_metatypes.swift index 03d99fa396b..15f7095ed1d 100644 --- a/test/IRGen/generic_metatypes.swift +++ b/test/IRGen/generic_metatypes.swift @@ -1,10 +1,10 @@ -// RUN: %swift -Xllvm -new-mangling-for-tests -target x86_64-apple-macosx10.9 -emit-ir -parse-stdlib -primary-file %s | %FileCheck --check-prefix=CHECK --check-prefix=CHECK-64 %s -// RUN: %swift -Xllvm -new-mangling-for-tests -target i386-apple-ios7.0 -emit-ir -parse-stdlib -primary-file %s | %FileCheck --check-prefix=CHECK --check-prefix=CHECK-32 %s -// RUN: %swift -Xllvm -new-mangling-for-tests -target x86_64-apple-ios7.0 -emit-ir -parse-stdlib -primary-file %s | %FileCheck --check-prefix=CHECK --check-prefix=CHECK-64 %s -// RUN: %swift -Xllvm -new-mangling-for-tests -target i386-apple-tvos9.0 -emit-ir -parse-stdlib -primary-file %s | %FileCheck --check-prefix=CHECK --check-prefix=CHECK-32 %s -// RUN: %swift -Xllvm -new-mangling-for-tests -target x86_64-apple-tvos9.0 -emit-ir -parse-stdlib -primary-file %s | %FileCheck --check-prefix=CHECK --check-prefix=CHECK-64 %s -// RUN: %swift -Xllvm -new-mangling-for-tests -target i386-apple-watchos2.0 -emit-ir -parse-stdlib -primary-file %s | %FileCheck --check-prefix=CHECK --check-prefix=CHECK-32 %s -// RUN: %swift -Xllvm -new-mangling-for-tests -target x86_64-unknown-linux-gnu -disable-objc-interop -emit-ir -parse-stdlib -primary-file %s | %FileCheck --check-prefix=CHECK --check-prefix=CHECK-64 %s +// RUN: %swift -target x86_64-apple-macosx10.9 -emit-ir -parse-stdlib -primary-file %s | %FileCheck --check-prefix=CHECK --check-prefix=CHECK-64 %s +// RUN: %swift -target i386-apple-ios7.0 -emit-ir -parse-stdlib -primary-file %s | %FileCheck --check-prefix=CHECK --check-prefix=CHECK-32 %s +// RUN: %swift -target x86_64-apple-ios7.0 -emit-ir -parse-stdlib -primary-file %s | %FileCheck --check-prefix=CHECK --check-prefix=CHECK-64 %s +// RUN: %swift -target i386-apple-tvos9.0 -emit-ir -parse-stdlib -primary-file %s | %FileCheck --check-prefix=CHECK --check-prefix=CHECK-32 %s +// RUN: %swift -target x86_64-apple-tvos9.0 -emit-ir -parse-stdlib -primary-file %s | %FileCheck --check-prefix=CHECK --check-prefix=CHECK-64 %s +// RUN: %swift -target i386-apple-watchos2.0 -emit-ir -parse-stdlib -primary-file %s | %FileCheck --check-prefix=CHECK --check-prefix=CHECK-32 %s +// RUN: %swift -target x86_64-unknown-linux-gnu -disable-objc-interop -emit-ir -parse-stdlib -primary-file %s | %FileCheck --check-prefix=CHECK --check-prefix=CHECK-64 %s // REQUIRES: CODEGENERATOR=X86 diff --git a/test/IRGen/generic_metatypes_arm.swift b/test/IRGen/generic_metatypes_arm.swift index c9aab444595..91534bb1524 100644 --- a/test/IRGen/generic_metatypes_arm.swift +++ b/test/IRGen/generic_metatypes_arm.swift @@ -1,8 +1,8 @@ -// RUN: %swift -Xllvm -new-mangling-for-tests -target armv7-apple-ios7.0 -module-name generic_metatypes -emit-ir -parse-stdlib -primary-file %s | %FileCheck --check-prefix=CHECK --check-prefix=CHECK-32 %s -// RUN: %swift -Xllvm -new-mangling-for-tests -target arm64-apple-ios7.0 -emit-ir -module-name generic_metatypes -parse-stdlib -primary-file %s | %FileCheck --check-prefix=CHECK --check-prefix=CHECK-64 %s -// RUN: %swift -Xllvm -new-mangling-for-tests -target armv7-apple-tvos9.0 -emit-ir -module-name generic_metatypes -parse-stdlib -primary-file %s | %FileCheck --check-prefix=CHECK --check-prefix=CHECK-32 %s -// RUN: %swift -Xllvm -new-mangling-for-tests -target arm64-apple-tvos9.0 -emit-ir -module-name generic_metatypes -parse-stdlib -primary-file %s | %FileCheck --check-prefix=CHECK --check-prefix=CHECK-64 %s -// RUN: %swift -Xllvm -new-mangling-for-tests -target armv7k-apple-watchos2.0 -emit-ir -module-name generic_metatypes -parse-stdlib -primary-file %s | %FileCheck --check-prefix=CHECK --check-prefix=CHECK-32 %s +// RUN: %swift -target armv7-apple-ios7.0 -module-name generic_metatypes -emit-ir -parse-stdlib -primary-file %s | %FileCheck --check-prefix=CHECK --check-prefix=CHECK-32 %s +// RUN: %swift -target arm64-apple-ios7.0 -emit-ir -module-name generic_metatypes -parse-stdlib -primary-file %s | %FileCheck --check-prefix=CHECK --check-prefix=CHECK-64 %s +// RUN: %swift -target armv7-apple-tvos9.0 -emit-ir -module-name generic_metatypes -parse-stdlib -primary-file %s | %FileCheck --check-prefix=CHECK --check-prefix=CHECK-32 %s +// RUN: %swift -target arm64-apple-tvos9.0 -emit-ir -module-name generic_metatypes -parse-stdlib -primary-file %s | %FileCheck --check-prefix=CHECK --check-prefix=CHECK-64 %s +// RUN: %swift -target armv7k-apple-watchos2.0 -emit-ir -module-name generic_metatypes -parse-stdlib -primary-file %s | %FileCheck --check-prefix=CHECK --check-prefix=CHECK-32 %s // REQUIRES: CODEGENERATOR=ARM diff --git a/test/IRGen/generic_structs.sil b/test/IRGen/generic_structs.sil index 58b3b8204d0..71182c52489 100644 --- a/test/IRGen/generic_structs.sil +++ b/test/IRGen/generic_structs.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -assume-parsing-unqualified-ownership-sil %s -emit-ir | %FileCheck %s +// RUN: %target-swift-frontend -assume-parsing-unqualified-ownership-sil %s -emit-ir | %FileCheck %s // REQUIRES: CPU=x86_64 diff --git a/test/IRGen/generic_ternary.swift b/test/IRGen/generic_ternary.swift index ed7c99dfd76..e97d90d8cd1 100644 --- a/test/IRGen/generic_ternary.swift +++ b/test/IRGen/generic_ternary.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -assume-parsing-unqualified-ownership-sil -primary-file %s -emit-ir | %FileCheck %s +// RUN: %target-swift-frontend -assume-parsing-unqualified-ownership-sil -primary-file %s -emit-ir | %FileCheck %s // REQUIRES: CPU=i386_or_x86_64 diff --git a/test/IRGen/global_resilience.sil b/test/IRGen/global_resilience.sil index 41eaa8b91cf..33552660c0a 100644 --- a/test/IRGen/global_resilience.sil +++ b/test/IRGen/global_resilience.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -assume-parsing-unqualified-ownership-sil -I %S/../Inputs -enable-source-import -emit-ir -enable-resilience %s | %FileCheck %s +// RUN: %target-swift-frontend -assume-parsing-unqualified-ownership-sil -I %S/../Inputs -enable-source-import -emit-ir -enable-resilience %s | %FileCheck %s // RUN: %target-swift-frontend -assume-parsing-unqualified-ownership-sil -I %S/../Inputs -enable-source-import -emit-ir -enable-resilience -O %s // CHECK: %swift.type = type { [[INT:i32|i64]] } diff --git a/test/IRGen/globals.swift b/test/IRGen/globals.swift index a2e4bd05463..de9c770c445 100644 --- a/test/IRGen/globals.swift +++ b/test/IRGen/globals.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -assume-parsing-unqualified-ownership-sil -primary-file %s -emit-ir | %FileCheck %s +// RUN: %target-swift-frontend -assume-parsing-unqualified-ownership-sil -primary-file %s -emit-ir | %FileCheck %s // REQUIRES: CPU=x86_64 diff --git a/test/IRGen/indirect_return.swift b/test/IRGen/indirect_return.swift index 8d0957fbdb4..089ac106466 100644 --- a/test/IRGen/indirect_return.swift +++ b/test/IRGen/indirect_return.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -assume-parsing-unqualified-ownership-sil -primary-file %s -emit-ir | %FileCheck %s +// RUN: %target-swift-frontend -assume-parsing-unqualified-ownership-sil -primary-file %s -emit-ir | %FileCheck %s // REQUIRES: CPU=i386_or_x86_64 diff --git a/test/IRGen/infinite_archetype.swift b/test/IRGen/infinite_archetype.swift index f6b503d51e7..384a6a02cca 100644 --- a/test/IRGen/infinite_archetype.swift +++ b/test/IRGen/infinite_archetype.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -assume-parsing-unqualified-ownership-sil -primary-file %s -emit-ir | %FileCheck %s +// RUN: %target-swift-frontend -assume-parsing-unqualified-ownership-sil -primary-file %s -emit-ir | %FileCheck %s // REQUIRES: CPU=i386_or_x86_64 diff --git a/test/IRGen/lazy_globals.swift b/test/IRGen/lazy_globals.swift index 00811f4aa24..afcfea325e9 100644 --- a/test/IRGen/lazy_globals.swift +++ b/test/IRGen/lazy_globals.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -assume-parsing-unqualified-ownership-sil -parse-as-library -emit-ir -primary-file %s | %FileCheck %s +// RUN: %target-swift-frontend -assume-parsing-unqualified-ownership-sil -parse-as-library -emit-ir -primary-file %s | %FileCheck %s // REQUIRES: CPU=x86_64 diff --git a/test/IRGen/lazy_metadata.swift b/test/IRGen/lazy_metadata.swift index 869f46a24e6..fcfbe9b315a 100644 --- a/test/IRGen/lazy_metadata.swift +++ b/test/IRGen/lazy_metadata.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -parse-as-library -Xllvm -new-mangling-for-tests -module-name=test -O %s -emit-ir > %t.ll +// RUN: %target-swift-frontend -parse-as-library -module-name=test -O %s -emit-ir > %t.ll // RUN: %FileCheck %s < %t.ll // RUN: %FileCheck -check-prefix=CHECK-DEAD %s < %t.ll diff --git a/test/IRGen/lazy_multi_file.swift b/test/IRGen/lazy_multi_file.swift index fd343b2fee3..e921b69ca4d 100644 --- a/test/IRGen/lazy_multi_file.swift +++ b/test/IRGen/lazy_multi_file.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -assume-parsing-unqualified-ownership-sil -primary-file %s %S/Inputs/lazy_multi_file_helper.swift -emit-ir | %FileCheck %s +// RUN: %target-swift-frontend -assume-parsing-unqualified-ownership-sil -primary-file %s %S/Inputs/lazy_multi_file_helper.swift -emit-ir | %FileCheck %s // REQUIRES: CPU=i386_or_x86_64 diff --git a/test/IRGen/local_types.swift b/test/IRGen/local_types.swift index a565d02395e..92d21be0b8a 100644 --- a/test/IRGen/local_types.swift +++ b/test/IRGen/local_types.swift @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir -p %t -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -assume-parsing-unqualified-ownership-sil -emit-module %S/Inputs/local_types_helper.swift -o %t -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -assume-parsing-unqualified-ownership-sil -emit-ir -parse-as-library %s -I %t > %t.ll +// RUN: %target-swift-frontend -assume-parsing-unqualified-ownership-sil -emit-module %S/Inputs/local_types_helper.swift -o %t +// RUN: %target-swift-frontend -assume-parsing-unqualified-ownership-sil -emit-ir -parse-as-library %s -I %t > %t.ll // RUN: %FileCheck %s < %t.ll // RUN: %FileCheck -check-prefix=NEGATIVE %s < %t.ll diff --git a/test/IRGen/mangle-anonclosure.swift b/test/IRGen/mangle-anonclosure.swift index ec841a251e6..1d64b24daf2 100644 --- a/test/IRGen/mangle-anonclosure.swift +++ b/test/IRGen/mangle-anonclosure.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -assume-parsing-unqualified-ownership-sil -emit-ir %s -o - | %FileCheck %s +// RUN: %target-swift-frontend -assume-parsing-unqualified-ownership-sil -emit-ir %s -o - | %FileCheck %s func someValidPointer() -> UnsafeMutablePointer { fatalError() } diff --git a/test/IRGen/meta_meta_type.swift b/test/IRGen/meta_meta_type.swift index da061161fb9..908cf2a7316 100644 --- a/test/IRGen/meta_meta_type.swift +++ b/test/IRGen/meta_meta_type.swift @@ -1,7 +1,7 @@ // RUN: rm -rf %t && mkdir -p %t // RUN: %target-build-swift %s -o %t/a.out // RUN: %target-run %t/a.out | %FileCheck %s -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -assume-parsing-unqualified-ownership-sil -primary-file %s -emit-ir | %FileCheck -check-prefix=CHECKIR %s +// RUN: %target-swift-frontend -assume-parsing-unqualified-ownership-sil -primary-file %s -emit-ir | %FileCheck -check-prefix=CHECKIR %s // REQUIRES: executable_test protocol Proto { diff --git a/test/IRGen/metatype_casts.sil b/test/IRGen/metatype_casts.sil index 598440a4057..d6a878e78ca 100644 --- a/test/IRGen/metatype_casts.sil +++ b/test/IRGen/metatype_casts.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -assume-parsing-unqualified-ownership-sil %s -emit-ir | %FileCheck %s +// RUN: %target-swift-frontend -assume-parsing-unqualified-ownership-sil %s -emit-ir | %FileCheck %s // REQUIRES: CPU=i386_or_x86_64 // XFAIL: linux diff --git a/test/IRGen/method_linkage.swift b/test/IRGen/method_linkage.swift index 1692a1892c0..ed520a31972 100644 --- a/test/IRGen/method_linkage.swift +++ b/test/IRGen/method_linkage.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -assume-parsing-unqualified-ownership-sil -primary-file %s -emit-ir | %FileCheck %s +// RUN: %target-swift-frontend -assume-parsing-unqualified-ownership-sil -primary-file %s -emit-ir | %FileCheck %s // Test if all methods which go into a vtable have at least the visibility of its class. // Reason: Derived classes from "outside" still have to put the less visible base members diff --git a/test/IRGen/nested_types.sil b/test/IRGen/nested_types.sil index cfd8797eddc..2647c819631 100644 --- a/test/IRGen/nested_types.sil +++ b/test/IRGen/nested_types.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -assume-parsing-unqualified-ownership-sil -emit-ir %s | %FileCheck %s +// RUN: %target-swift-frontend -assume-parsing-unqualified-ownership-sil -emit-ir %s | %FileCheck %s sil_stage canonical diff --git a/test/IRGen/newtype.swift b/test/IRGen/newtype.swift index 3cb32d52016..16bceae4628 100644 --- a/test/IRGen/newtype.swift +++ b/test/IRGen/newtype.swift @@ -1,8 +1,8 @@ // RUN: rm -rf %t // RUN: mkdir -p %t // RUN: %build-irgen-test-overlays -// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t -I %S/../IDE/Inputs/custom-modules) -Xllvm -new-mangling-for-tests %s -emit-ir | %FileCheck %s -// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t -I %S/../IDE/Inputs/custom-modules) -Xllvm -new-mangling-for-tests %s -emit-ir -O | %FileCheck %s -check-prefix=OPT +// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t -I %S/../IDE/Inputs/custom-modules) %s -emit-ir | %FileCheck %s +// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t -I %S/../IDE/Inputs/custom-modules) %s -emit-ir -O | %FileCheck %s -check-prefix=OPT import CoreFoundation import Foundation import Newtype diff --git a/test/IRGen/nominal-type-section.swift b/test/IRGen/nominal-type-section.swift index 991d845d8d7..b1bbc5fd9c9 100644 --- a/test/IRGen/nominal-type-section.swift +++ b/test/IRGen/nominal-type-section.swift @@ -1,6 +1,6 @@ -// RUN: %swift -Xllvm -new-mangling-for-tests -target x86_64-apple-macosx10.10 -emit-ir -parse-stdlib -primary-file %s -module-name main -o - | %FileCheck %s -check-prefix CHECK-MACHO -// RUN: %swift -Xllvm -new-mangling-for-tests -target x86_64-unknown-linux-gnu -emit-ir -parse-stdlib -primary-file %s -module-name main -o - | %FileCheck %s -check-prefix CHECK-ELF -// RUN: %swift -Xllvm -new-mangling-for-tests -target x86_64-unknown-windows-itanium -emit-ir -parse-stdlib -primary-file %s -module-name main -o - | %FileCheck %s -check-prefix CHECK-COFF +// RUN: %swift -target x86_64-apple-macosx10.10 -emit-ir -parse-stdlib -primary-file %s -module-name main -o - | %FileCheck %s -check-prefix CHECK-MACHO +// RUN: %swift -target x86_64-unknown-linux-gnu -emit-ir -parse-stdlib -primary-file %s -module-name main -o - | %FileCheck %s -check-prefix CHECK-ELF +// RUN: %swift -target x86_64-unknown-windows-itanium -emit-ir -parse-stdlib -primary-file %s -module-name main -o - | %FileCheck %s -check-prefix CHECK-COFF // CHECK-MACHO: @_T04main1sVMn = constant {{.*}}, section "__TEXT,__const" // CHECK-ELF: @_T04main1sVMn = {{.*}}constant {{.*}}, section ".rodata" diff --git a/test/IRGen/objc.swift b/test/IRGen/objc.swift index 5403e0ee247..9a846fb481e 100644 --- a/test/IRGen/objc.swift +++ b/test/IRGen/objc.swift @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir -p %t // RUN: %build-irgen-test-overlays -// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -Xllvm -new-mangling-for-tests -primary-file %s -emit-ir -disable-objc-attr-requires-foundation-module | %FileCheck %s +// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -primary-file %s -emit-ir -disable-objc-attr-requires-foundation-module | %FileCheck %s // REQUIRES: CPU=x86_64 // REQUIRES: objc_interop diff --git a/test/IRGen/objc_alloc.sil b/test/IRGen/objc_alloc.sil index 2d958096f27..4d4ea6852b8 100644 --- a/test/IRGen/objc_alloc.sil +++ b/test/IRGen/objc_alloc.sil @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir -p %t // RUN: %build-irgen-test-overlays -// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -Xllvm -new-mangling-for-tests -assume-parsing-unqualified-ownership-sil %s -emit-ir | %FileCheck %s +// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -assume-parsing-unqualified-ownership-sil %s -emit-ir | %FileCheck %s // REQUIRES: CPU=i386_or_x86_64 // REQUIRES: objc_interop diff --git a/test/IRGen/objc_bridge.swift b/test/IRGen/objc_bridge.swift index 60b2cbdae3e..32c05d499a4 100644 --- a/test/IRGen/objc_bridge.swift +++ b/test/IRGen/objc_bridge.swift @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir -p %t // RUN: %build-irgen-test-overlays -// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -Xllvm -new-mangling-for-tests -emit-ir -primary-file %s | %FileCheck %s +// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -emit-ir -primary-file %s | %FileCheck %s // REQUIRES: CPU=x86_64 // REQUIRES: objc_interop diff --git a/test/IRGen/objc_dealloc.sil b/test/IRGen/objc_dealloc.sil index a60bd90b508..4448c4117ed 100644 --- a/test/IRGen/objc_dealloc.sil +++ b/test/IRGen/objc_dealloc.sil @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir -p %t // RUN: %build-irgen-test-overlays -// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -Xllvm -new-mangling-for-tests -assume-parsing-unqualified-ownership-sil %s -emit-ir | %FileCheck %s +// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -assume-parsing-unqualified-ownership-sil %s -emit-ir | %FileCheck %s // REQUIRES: CPU=x86_64 // REQUIRES: objc_interop diff --git a/test/IRGen/objc_enum_multi_file.swift b/test/IRGen/objc_enum_multi_file.swift index f6d7606a133..c9c071b17b6 100644 --- a/test/IRGen/objc_enum_multi_file.swift +++ b/test/IRGen/objc_enum_multi_file.swift @@ -1,8 +1,8 @@ // RUN: rm -rf %t && mkdir -p %t -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -assume-parsing-unqualified-ownership-sil -module-name main -primary-file %s %S/Inputs/objc_enum_multi_file_helper.swift -emit-ir | %FileCheck %s +// RUN: %target-swift-frontend -assume-parsing-unqualified-ownership-sil -module-name main -primary-file %s %S/Inputs/objc_enum_multi_file_helper.swift -emit-ir | %FileCheck %s // RUN: %target-swift-frontend -assume-parsing-unqualified-ownership-sil -disable-objc-attr-requires-foundation-module -emit-module %S/Inputs/objc_enum_multi_file_helper.swift -o %t -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -assume-parsing-unqualified-ownership-sil -module-name main -primary-file %s -I %t -DIMPORT -emit-ir | %FileCheck %s +// RUN: %target-swift-frontend -assume-parsing-unqualified-ownership-sil -module-name main -primary-file %s -I %t -DIMPORT -emit-ir | %FileCheck %s #if IMPORT import objc_enum_multi_file_helper diff --git a/test/IRGen/objc_extensions.swift b/test/IRGen/objc_extensions.swift index 731ae3debff..576de76265b 100644 --- a/test/IRGen/objc_extensions.swift +++ b/test/IRGen/objc_extensions.swift @@ -1,7 +1,7 @@ // RUN: rm -rf %t && mkdir -p %t // RUN: %build-irgen-test-overlays // RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -disable-objc-attr-requires-foundation-module -emit-module %S/Inputs/objc_extension_base.swift -o %t -// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -Xllvm -new-mangling-for-tests -primary-file %s -emit-ir | %FileCheck %s +// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -primary-file %s -emit-ir | %FileCheck %s // REQUIRES: CPU=x86_64 // REQUIRES: objc_interop diff --git a/test/IRGen/objc_generic_protocol_conformance.swift b/test/IRGen/objc_generic_protocol_conformance.swift index 93fe9c7fba3..0c4054421b5 100644 --- a/test/IRGen/objc_generic_protocol_conformance.swift +++ b/test/IRGen/objc_generic_protocol_conformance.swift @@ -1,5 +1,5 @@ -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -Xllvm -new-mangling-for-tests -emit-silgen -primary-file %s -import-objc-header %S/Inputs/objc_generic_protocol_conformance.h | %FileCheck --check-prefix=SIL %s -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -Xllvm -new-mangling-for-tests -emit-ir -primary-file %s -import-objc-header %S/Inputs/objc_generic_protocol_conformance.h | %FileCheck --check-prefix=IR %s +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -emit-silgen -primary-file %s -import-objc-header %S/Inputs/objc_generic_protocol_conformance.h | %FileCheck --check-prefix=SIL %s +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -emit-ir -primary-file %s -import-objc-header %S/Inputs/objc_generic_protocol_conformance.h | %FileCheck --check-prefix=IR %s // REQUIRES: objc_interop diff --git a/test/IRGen/objc_implicit_with.sil b/test/IRGen/objc_implicit_with.sil index 06d8dc318f7..fe009f6ed3e 100644 --- a/test/IRGen/objc_implicit_with.sil +++ b/test/IRGen/objc_implicit_with.sil @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir -p %t // RUN: %build-irgen-test-overlays -// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -Xllvm -new-mangling-for-tests %s -emit-ir | %FileCheck %s +// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) %s -emit-ir | %FileCheck %s // REQUIRES: CPU=x86_64 // REQUIRES: objc_interop diff --git a/test/IRGen/objc_int_encoding.sil b/test/IRGen/objc_int_encoding.sil index 8e058fde546..0f2cfdf4972 100644 --- a/test/IRGen/objc_int_encoding.sil +++ b/test/IRGen/objc_int_encoding.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -Xllvm -new-mangling-for-tests %s -emit-ir | %FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-%target-ptrsize +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) %s -emit-ir | %FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-%target-ptrsize // REQUIRES: objc_interop // CHECK: [[SELECTOR:@.*]] = private global {{.*}} c"fooWithX:\00" diff --git a/test/IRGen/objc_local.swift b/test/IRGen/objc_local.swift index 7e2a13cddff..ce81506f429 100644 --- a/test/IRGen/objc_local.swift +++ b/test/IRGen/objc_local.swift @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir -p %t // RUN: %build-irgen-test-overlays -// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -Xllvm -new-mangling-for-tests %s -emit-ir | %FileCheck %s +// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) %s -emit-ir | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/IRGen/objc_methods.swift b/test/IRGen/objc_methods.swift index a046f3885c2..c5c987b66c9 100644 --- a/test/IRGen/objc_methods.swift +++ b/test/IRGen/objc_methods.swift @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir -p %t // RUN: %build-irgen-test-overlays -// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -Xllvm -new-mangling-for-tests -primary-file %s -emit-ir | %FileCheck --check-prefix=CHECK --check-prefix=CHECK-%target-os %s +// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -primary-file %s -emit-ir | %FileCheck --check-prefix=CHECK --check-prefix=CHECK-%target-os %s // REQUIRES: CPU=x86_64 // REQUIRES: objc_interop diff --git a/test/IRGen/objc_ns_enum.swift b/test/IRGen/objc_ns_enum.swift index 9552c640ebc..ab1caf0bc69 100644 --- a/test/IRGen/objc_ns_enum.swift +++ b/test/IRGen/objc_ns_enum.swift @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir -p %t // RUN: %build-irgen-test-overlays -// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -Xllvm -new-mangling-for-tests -primary-file %s -emit-ir | %FileCheck %s +// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -primary-file %s -emit-ir | %FileCheck %s // REQUIRES: CPU=x86_64 // REQUIRES: objc_interop diff --git a/test/IRGen/objc_pointers.swift b/test/IRGen/objc_pointers.swift index a332fcb4699..9ef90504866 100644 --- a/test/IRGen/objc_pointers.swift +++ b/test/IRGen/objc_pointers.swift @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir -p %t // RUN: %build-irgen-test-overlays -// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -Xllvm -new-mangling-for-tests -primary-file %s -emit-ir | %FileCheck %s +// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -primary-file %s -emit-ir | %FileCheck %s // REQUIRES: CPU=x86_64 // REQUIRES: objc_interop diff --git a/test/IRGen/objc_properties.swift b/test/IRGen/objc_properties.swift index 0f386bbdca6..98066deca6e 100644 --- a/test/IRGen/objc_properties.swift +++ b/test/IRGen/objc_properties.swift @@ -1,7 +1,7 @@ // This file is also used by objc_properties_ios.swift. -// RUN: %swift -Xllvm -new-mangling-for-tests -target x86_64-apple-macosx10.11 %s -disable-target-os-checking -emit-ir -disable-objc-attr-requires-foundation-module | %FileCheck -check-prefix=CHECK -check-prefix=CHECK-NEW %s -// RUN: %swift -Xllvm -new-mangling-for-tests -target x86_64-apple-macosx10.10 %s -disable-target-os-checking -emit-ir -disable-objc-attr-requires-foundation-module | %FileCheck -check-prefix=CHECK -check-prefix=CHECK-OLD %s +// RUN: %swift -target x86_64-apple-macosx10.11 %s -disable-target-os-checking -emit-ir -disable-objc-attr-requires-foundation-module | %FileCheck -check-prefix=CHECK -check-prefix=CHECK-NEW %s +// RUN: %swift -target x86_64-apple-macosx10.10 %s -disable-target-os-checking -emit-ir -disable-objc-attr-requires-foundation-module | %FileCheck -check-prefix=CHECK -check-prefix=CHECK-OLD %s // REQUIRES: OS=macosx // REQUIRES: objc_interop diff --git a/test/IRGen/objc_properties_imported.swift b/test/IRGen/objc_properties_imported.swift index f4a8d084649..91a9f406aa1 100644 --- a/test/IRGen/objc_properties_imported.swift +++ b/test/IRGen/objc_properties_imported.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -Xllvm -new-mangling-for-tests -enable-source-import -emit-ir -o - -primary-file %s | %FileCheck %s +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -enable-source-import -emit-ir -o - -primary-file %s | %FileCheck %s // REQUIRES: CPU=x86_64 // REQUIRES: objc_interop diff --git a/test/IRGen/objc_properties_ios.swift b/test/IRGen/objc_properties_ios.swift index b93155ca14a..33fa41ee0ba 100644 --- a/test/IRGen/objc_properties_ios.swift +++ b/test/IRGen/objc_properties_ios.swift @@ -1,5 +1,5 @@ -// RUN: %swift -Xllvm -new-mangling-for-tests -target x86_64-apple-ios9 %S/objc_properties.swift -disable-target-os-checking -emit-ir -disable-objc-attr-requires-foundation-module | %FileCheck -check-prefix=CHECK -check-prefix=CHECK-NEW %S/objc_properties.swift -// RUN: %swift -Xllvm -new-mangling-for-tests -target x86_64-apple-ios8 %S/objc_properties.swift -disable-target-os-checking -emit-ir -disable-objc-attr-requires-foundation-module | %FileCheck -check-prefix=CHECK -check-prefix=CHECK-OLD %S/objc_properties.swift +// RUN: %swift -target x86_64-apple-ios9 %S/objc_properties.swift -disable-target-os-checking -emit-ir -disable-objc-attr-requires-foundation-module | %FileCheck -check-prefix=CHECK -check-prefix=CHECK-NEW %S/objc_properties.swift +// RUN: %swift -target x86_64-apple-ios8 %S/objc_properties.swift -disable-target-os-checking -emit-ir -disable-objc-attr-requires-foundation-module | %FileCheck -check-prefix=CHECK -check-prefix=CHECK-OLD %S/objc_properties.swift // REQUIRES: OS=ios // REQUIRES: CPU=x86_64 diff --git a/test/IRGen/objc_protocol_multi_file.swift b/test/IRGen/objc_protocol_multi_file.swift index 86235ddded8..9f46bc80051 100644 --- a/test/IRGen/objc_protocol_multi_file.swift +++ b/test/IRGen/objc_protocol_multi_file.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -assume-parsing-unqualified-ownership-sil -primary-file %s %S/Inputs/objc_protocol_multi_file_helper.swift -g -emit-ir | %FileCheck %s +// RUN: %target-swift-frontend -assume-parsing-unqualified-ownership-sil -primary-file %s %S/Inputs/objc_protocol_multi_file_helper.swift -g -emit-ir | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/IRGen/objc_protocols.swift b/test/IRGen/objc_protocols.swift index 0b1a6d49add..2dbe076b1d6 100644 --- a/test/IRGen/objc_protocols.swift +++ b/test/IRGen/objc_protocols.swift @@ -1,7 +1,7 @@ // RUN: rm -rf %t && mkdir -p %t // RUN: %build-irgen-test-overlays // RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -emit-module -o %t %S/Inputs/objc_protocols_Bas.swift -// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -Xllvm -new-mangling-for-tests -primary-file %s -emit-ir -disable-objc-attr-requires-foundation-module | %FileCheck %s +// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -primary-file %s -emit-ir -disable-objc-attr-requires-foundation-module | %FileCheck %s // REQUIRES: CPU=x86_64 // REQUIRES: objc_interop diff --git a/test/IRGen/objc_structs.swift b/test/IRGen/objc_structs.swift index b5d8801b81a..ea84b2e67d0 100644 --- a/test/IRGen/objc_structs.swift +++ b/test/IRGen/objc_structs.swift @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir -p %t // RUN: %build-irgen-test-overlays -// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -Xllvm -new-mangling-for-tests -primary-file %s -emit-ir | %FileCheck %s +// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -primary-file %s -emit-ir | %FileCheck %s // REQUIRES: CPU=x86_64 // REQUIRES: objc_interop diff --git a/test/IRGen/objc_subclass.swift b/test/IRGen/objc_subclass.swift index 7be44abac41..6ada946e23a 100644 --- a/test/IRGen/objc_subclass.swift +++ b/test/IRGen/objc_subclass.swift @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir -p %t // RUN: %build-irgen-test-overlays -// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -Xllvm -new-mangling-for-tests -primary-file %s -emit-ir | %FileCheck --check-prefix=CHECK --check-prefix=CHECK-%target-ptrsize %s +// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -primary-file %s -emit-ir | %FileCheck --check-prefix=CHECK --check-prefix=CHECK-%target-ptrsize %s // REQUIRES: objc_interop diff --git a/test/IRGen/objc_subscripts.swift b/test/IRGen/objc_subscripts.swift index 0961420208d..6352501b3b9 100644 --- a/test/IRGen/objc_subscripts.swift +++ b/test/IRGen/objc_subscripts.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -assume-parsing-unqualified-ownership-sil -primary-file %s -emit-ir -disable-objc-attr-requires-foundation-module | %FileCheck %s +// RUN: %target-swift-frontend -assume-parsing-unqualified-ownership-sil -primary-file %s -emit-ir -disable-objc-attr-requires-foundation-module | %FileCheck %s // REQUIRES: CPU=x86_64 // REQUIRES: objc_interop diff --git a/test/IRGen/objc_super.swift b/test/IRGen/objc_super.swift index 014d32c6fc9..3d184e9a755 100644 --- a/test/IRGen/objc_super.swift +++ b/test/IRGen/objc_super.swift @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir -p %t // RUN: %build-irgen-test-overlays -// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -Xllvm -new-mangling-for-tests %s -emit-ir | %FileCheck %s +// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) %s -emit-ir | %FileCheck %s // REQUIRES: CPU=x86_64 // REQUIRES: objc_interop diff --git a/test/IRGen/partial_apply_generic.swift b/test/IRGen/partial_apply_generic.swift index 4c9a5835a1a..39fca280f98 100644 --- a/test/IRGen/partial_apply_generic.swift +++ b/test/IRGen/partial_apply_generic.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -assume-parsing-unqualified-ownership-sil %s -emit-ir | %FileCheck %s +// RUN: %target-swift-frontend -assume-parsing-unqualified-ownership-sil %s -emit-ir | %FileCheck %s // REQUIRES: CPU=x86_64 diff --git a/test/IRGen/pic.swift b/test/IRGen/pic.swift index 6629374b1f9..1c8f76bcf5a 100644 --- a/test/IRGen/pic.swift +++ b/test/IRGen/pic.swift @@ -1,7 +1,7 @@ // Check that we always use PIC relocations on all // platforms. -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -assume-parsing-unqualified-ownership-sil %s -module-name main -S -o - | %FileCheck -check-prefix=%target-cpu %s +// RUN: %target-swift-frontend -assume-parsing-unqualified-ownership-sil %s -module-name main -S -o - | %FileCheck -check-prefix=%target-cpu %s // XFAIL: linux diff --git a/test/IRGen/playground.swift b/test/IRGen/playground.swift index ae307da69b1..1609aa35e08 100644 --- a/test/IRGen/playground.swift +++ b/test/IRGen/playground.swift @@ -1,5 +1,5 @@ // RUN: rm -rf %t -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -assume-parsing-unqualified-ownership-sil -use-jit -playground -parse-stdlib %s -emit-ir -disable-objc-attr-requires-foundation-module | %FileCheck %s +// RUN: %target-swift-frontend -assume-parsing-unqualified-ownership-sil -use-jit -playground -parse-stdlib %s -emit-ir -disable-objc-attr-requires-foundation-module | %FileCheck %s // REQUIRES: OS=macosx // REQUIRES: CPU=x86_64 diff --git a/test/IRGen/protocol_conformance_records_objc.swift b/test/IRGen/protocol_conformance_records_objc.swift index f900b4d4f4d..368064dee05 100644 --- a/test/IRGen/protocol_conformance_records_objc.swift +++ b/test/IRGen/protocol_conformance_records_objc.swift @@ -1,8 +1,8 @@ // RUN: rm -rf %t && mkdir -p %t // RUN: %build-irgen-test-overlays // RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -emit-module -o %t %S/Inputs/objc_protocols_Bas.swift -// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -Xllvm -new-mangling-for-tests -primary-file %s -emit-ir | %FileCheck %s -// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -Xllvm -new-mangling-for-tests %s -emit-ir -num-threads 8 | %FileCheck %s +// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -primary-file %s -emit-ir | %FileCheck %s +// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) %s -emit-ir -num-threads 8 | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/IRGen/protocol_extensions_constrain.swift b/test/IRGen/protocol_extensions_constrain.swift index da4351012b5..03455db1a68 100644 --- a/test/IRGen/protocol_extensions_constrain.swift +++ b/test/IRGen/protocol_extensions_constrain.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -assume-parsing-unqualified-ownership-sil -emit-ir %s | %FileCheck %s +// RUN: %target-swift-frontend -assume-parsing-unqualified-ownership-sil -emit-ir %s | %FileCheck %s // rdar://20532214 -- Wrong code for witness method lookup lets executable crash diff --git a/test/IRGen/protocol_metadata.swift b/test/IRGen/protocol_metadata.swift index 742f37d9d5f..6fe23db128a 100644 --- a/test/IRGen/protocol_metadata.swift +++ b/test/IRGen/protocol_metadata.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -assume-parsing-unqualified-ownership-sil -primary-file %s -emit-ir -disable-objc-attr-requires-foundation-module | %FileCheck %s +// RUN: %target-swift-frontend -assume-parsing-unqualified-ownership-sil -primary-file %s -emit-ir -disable-objc-attr-requires-foundation-module | %FileCheck %s // REQUIRES: CPU=x86_64 // REQUIRES: objc_interop diff --git a/test/IRGen/protocol_resilience.sil b/test/IRGen/protocol_resilience.sil index 5582a80071b..14a1664cd76 100644 --- a/test/IRGen/protocol_resilience.sil +++ b/test/IRGen/protocol_resilience.sil @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir %t // RUN: %target-swift-frontend -emit-module -enable-resilience -emit-module-path=%t/resilient_protocol.swiftmodule -module-name=resilient_protocol %S/../Inputs/resilient_protocol.swift -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -I %t -emit-ir -enable-resilience -assume-parsing-unqualified-ownership-sil %s | %FileCheck %s +// RUN: %target-swift-frontend -I %t -emit-ir -enable-resilience -assume-parsing-unqualified-ownership-sil %s | %FileCheck %s // RUN: %target-swift-frontend -I %t -emit-ir -enable-resilience -O -assume-parsing-unqualified-ownership-sil %s sil_stage canonical diff --git a/test/IRGen/rdar15304329.swift b/test/IRGen/rdar15304329.swift index c478773c358..b419bfcec5d 100644 --- a/test/IRGen/rdar15304329.swift +++ b/test/IRGen/rdar15304329.swift @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir -p %t // RUN: %build-irgen-test-overlays -// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -Xllvm -new-mangling-for-tests %s -emit-ir | %FileCheck %s +// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) %s -emit-ir | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/IRGen/reflection_metadata.swift b/test/IRGen/reflection_metadata.swift index d6d64207feb..03e87e173fb 100644 --- a/test/IRGen/reflection_metadata.swift +++ b/test/IRGen/reflection_metadata.swift @@ -1,6 +1,6 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -assume-parsing-unqualified-ownership-sil -emit-ir %s | %FileCheck %s -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -assume-parsing-unqualified-ownership-sil -disable-reflection-names -emit-ir %s | %FileCheck %s --check-prefix=STRIP_REFLECTION_NAMES -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -assume-parsing-unqualified-ownership-sil -disable-reflection-metadata -emit-ir %s | %FileCheck %s --check-prefix=STRIP_REFLECTION_METADATA +// RUN: %target-swift-frontend -assume-parsing-unqualified-ownership-sil -emit-ir %s | %FileCheck %s +// RUN: %target-swift-frontend -assume-parsing-unqualified-ownership-sil -disable-reflection-names -emit-ir %s | %FileCheck %s --check-prefix=STRIP_REFLECTION_NAMES +// RUN: %target-swift-frontend -assume-parsing-unqualified-ownership-sil -disable-reflection-metadata -emit-ir %s | %FileCheck %s --check-prefix=STRIP_REFLECTION_METADATA // STRIP_REFLECTION_NAMES_DAG: {{.*}}swift3_reflect // STRIP_REFLECTION_NAMES_DAG: {{.*}}swift3_fieldmd diff --git a/test/IRGen/reflection_metadata_imported.swift b/test/IRGen/reflection_metadata_imported.swift index d4c13b79eb3..cfcba865816 100644 --- a/test/IRGen/reflection_metadata_imported.swift +++ b/test/IRGen/reflection_metadata_imported.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -Xllvm -new-mangling-for-tests -I %S/Inputs/abi %s -emit-ir -parse-as-library | %FileCheck %s +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -I %S/Inputs/abi %s -emit-ir -parse-as-library | %FileCheck %s import c_layout diff --git a/test/IRGen/runtime_calling_conventions.swift b/test/IRGen/runtime_calling_conventions.swift index 415b4fd02df..b33c9cf31ac 100644 --- a/test/IRGen/runtime_calling_conventions.swift +++ b/test/IRGen/runtime_calling_conventions.swift @@ -1,5 +1,5 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -assume-parsing-unqualified-ownership-sil -parse-as-library -emit-ir %s | %FileCheck %s -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -assume-parsing-unqualified-ownership-sil -parse-as-library -O -emit-ir %s | %FileCheck --check-prefix=OPT-CHECK %s +// RUN: %target-swift-frontend -assume-parsing-unqualified-ownership-sil -parse-as-library -emit-ir %s | %FileCheck %s +// RUN: %target-swift-frontend -assume-parsing-unqualified-ownership-sil -parse-as-library -O -emit-ir %s | %FileCheck --check-prefix=OPT-CHECK %s // Test that runtime functions are invoked using the new calling convention. // Test that wrappers are used to invoked them. diff --git a/test/IRGen/same_type_constraints.swift b/test/IRGen/same_type_constraints.swift index ee8d027778d..01312ca4b03 100644 --- a/test/IRGen/same_type_constraints.swift +++ b/test/IRGen/same_type_constraints.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -assume-parsing-unqualified-ownership-sil -emit-ir -primary-file %s -disable-objc-attr-requires-foundation-module | %FileCheck %s +// RUN: %target-swift-frontend -assume-parsing-unqualified-ownership-sil -emit-ir -primary-file %s -disable-objc-attr-requires-foundation-module | %FileCheck %s // IRGen crash with protocol extension involving same-type constraint to X public struct DefaultFoo { diff --git a/test/IRGen/sil_generic_witness_methods.swift b/test/IRGen/sil_generic_witness_methods.swift index 157ef764f26..8318d92d96b 100644 --- a/test/IRGen/sil_generic_witness_methods.swift +++ b/test/IRGen/sil_generic_witness_methods.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -assume-parsing-unqualified-ownership-sil -primary-file %s -emit-ir | %FileCheck %s +// RUN: %target-swift-frontend -assume-parsing-unqualified-ownership-sil -primary-file %s -emit-ir | %FileCheck %s // REQUIRES: CPU=x86_64 diff --git a/test/IRGen/sil_generic_witness_methods_objc.swift b/test/IRGen/sil_generic_witness_methods_objc.swift index 53cb0762aec..d0f9f13a5c7 100644 --- a/test/IRGen/sil_generic_witness_methods_objc.swift +++ b/test/IRGen/sil_generic_witness_methods_objc.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -assume-parsing-unqualified-ownership-sil -primary-file %s -emit-ir -disable-objc-attr-requires-foundation-module | %FileCheck %s +// RUN: %target-swift-frontend -assume-parsing-unqualified-ownership-sil -primary-file %s -emit-ir -disable-objc-attr-requires-foundation-module | %FileCheck %s // REQUIRES: CPU=x86_64 // REQUIRES: objc_interop diff --git a/test/IRGen/sil_witness_tables.swift b/test/IRGen/sil_witness_tables.swift index 68cf2e2519c..42c6c1ae852 100644 --- a/test/IRGen/sil_witness_tables.swift +++ b/test/IRGen/sil_witness_tables.swift @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir -p %t // RUN: %target-swift-frontend -assume-parsing-unqualified-ownership-sil -emit-module -o %t %S/sil_witness_tables_external_conformance.swift -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -assume-parsing-unqualified-ownership-sil -I %t -primary-file %s -emit-ir | %FileCheck %s +// RUN: %target-swift-frontend -assume-parsing-unqualified-ownership-sil -I %t -primary-file %s -emit-ir | %FileCheck %s // REQUIRES: CPU=x86_64 diff --git a/test/IRGen/sil_witness_tables_inherited_conformance.swift b/test/IRGen/sil_witness_tables_inherited_conformance.swift index fd670697aeb..622d9173a67 100644 --- a/test/IRGen/sil_witness_tables_inherited_conformance.swift +++ b/test/IRGen/sil_witness_tables_inherited_conformance.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -assume-parsing-unqualified-ownership-sil %s -emit-ir | %FileCheck %s +// RUN: %target-swift-frontend -assume-parsing-unqualified-ownership-sil %s -emit-ir | %FileCheck %s // rdar://problem/20628295 diff --git a/test/IRGen/struct_layout.sil b/test/IRGen/struct_layout.sil index e78e9f661cd..a25f4322ada 100644 --- a/test/IRGen/struct_layout.sil +++ b/test/IRGen/struct_layout.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -assume-parsing-unqualified-ownership-sil %s -module-name main -emit-ir -o - | %FileCheck -check-prefix=%target-ptrsize %s +// RUN: %target-swift-frontend -assume-parsing-unqualified-ownership-sil %s -module-name main -emit-ir -o - | %FileCheck -check-prefix=%target-ptrsize %s import Builtin import Swift diff --git a/test/IRGen/super.sil b/test/IRGen/super.sil index c2343a13b12..7c3f6485b74 100644 --- a/test/IRGen/super.sil +++ b/test/IRGen/super.sil @@ -2,7 +2,7 @@ // RUN: mkdir -p %t // RUN: %target-swift-frontend -assume-parsing-unqualified-ownership-sil -emit-module -enable-resilience -I %t -module-name resilient_struct -o %t %S/../Inputs/resilient_struct.swift // RUN: %target-swift-frontend -assume-parsing-unqualified-ownership-sil -emit-module -enable-resilience -I %t -module-name resilient_class -o %t %S/../Inputs/resilient_class.swift -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -assume-parsing-unqualified-ownership-sil -enable-resilience -parse-sil -parse-as-library -emit-ir -I %t %s | %FileCheck %s +// RUN: %target-swift-frontend -assume-parsing-unqualified-ownership-sil -enable-resilience -parse-sil -parse-as-library -emit-ir -I %t %s | %FileCheck %s sil_stage canonical diff --git a/test/IRGen/superclass_constraint.swift b/test/IRGen/superclass_constraint.swift index fefad071a0c..620b1e799a9 100644 --- a/test/IRGen/superclass_constraint.swift +++ b/test/IRGen/superclass_constraint.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -assume-parsing-unqualified-ownership-sil %s -emit-ir | %FileCheck %s +// RUN: %target-swift-frontend -assume-parsing-unqualified-ownership-sil %s -emit-ir | %FileCheck %s public protocol A {} diff --git a/test/IRGen/swift_native_objc_runtime_base.sil b/test/IRGen/swift_native_objc_runtime_base.sil index 61fcf6c26e3..bdcff963e2c 100644 --- a/test/IRGen/swift_native_objc_runtime_base.sil +++ b/test/IRGen/swift_native_objc_runtime_base.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -assume-parsing-unqualified-ownership-sil -emit-ir %s | %FileCheck %s +// RUN: %target-swift-frontend -assume-parsing-unqualified-ownership-sil -emit-ir %s | %FileCheck %s // REQUIRES: objc_interop // CHECK-LABEL: @_T030swift_native_objc_runtime_base1CCMm = hidden global %objc_class { diff --git a/test/IRGen/tail_alloc.sil b/test/IRGen/tail_alloc.sil index 5fc81597cc0..4c5ad1c7678 100644 --- a/test/IRGen/tail_alloc.sil +++ b/test/IRGen/tail_alloc.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -assume-parsing-unqualified-ownership-sil -stack-promotion-limit 48 -Onone -emit-ir %s | %FileCheck %s +// RUN: %target-swift-frontend -assume-parsing-unqualified-ownership-sil -stack-promotion-limit 48 -Onone -emit-ir %s | %FileCheck %s // // REQUIRES: CPU=x86_64 diff --git a/test/IRGen/tsan_instrumentation.sil b/test/IRGen/tsan_instrumentation.sil index c292cf39537..690033af31d 100644 --- a/test/IRGen/tsan_instrumentation.sil +++ b/test/IRGen/tsan_instrumentation.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -assume-parsing-unqualified-ownership-sil %s -emit-ir | %FileCheck %s +// RUN: %target-swift-frontend -assume-parsing-unqualified-ownership-sil %s -emit-ir | %FileCheck %s sil_stage canonical diff --git a/test/IRGen/typed_boxes.sil b/test/IRGen/typed_boxes.sil index 72ec2322195..ceb3288ee1b 100644 --- a/test/IRGen/typed_boxes.sil +++ b/test/IRGen/typed_boxes.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -assume-parsing-unqualified-ownership-sil -emit-ir %s | %FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-%target-ptrsize +// RUN: %target-swift-frontend -assume-parsing-unqualified-ownership-sil -emit-ir %s | %FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-%target-ptrsize sil_stage canonical import Builtin diff --git a/test/IRGen/typemetadata.sil b/test/IRGen/typemetadata.sil index fdcd2cdd118..1f5ce0cbeb5 100644 --- a/test/IRGen/typemetadata.sil +++ b/test/IRGen/typemetadata.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -assume-parsing-unqualified-ownership-sil -emit-ir %s | %FileCheck %s +// RUN: %target-swift-frontend -assume-parsing-unqualified-ownership-sil -emit-ir %s | %FileCheck %s // REQUIRES: CPU=x86_64 // XFAIL: linux diff --git a/test/IRGen/unconditional_checked_cast.sil b/test/IRGen/unconditional_checked_cast.sil index f1c10450387..eae4f49610b 100644 --- a/test/IRGen/unconditional_checked_cast.sil +++ b/test/IRGen/unconditional_checked_cast.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -assume-parsing-unqualified-ownership-sil %s -emit-ir | %FileCheck %s +// RUN: %target-swift-frontend -assume-parsing-unqualified-ownership-sil %s -emit-ir | %FileCheck %s // REQUIRES: CPU=x86_64 diff --git a/test/IRGen/unowned.sil b/test/IRGen/unowned.sil index fe79fc8f072..65a21b566e8 100644 --- a/test/IRGen/unowned.sil +++ b/test/IRGen/unowned.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -assume-parsing-unqualified-ownership-sil -disable-objc-interop -emit-ir %s | %FileCheck %s +// RUN: %target-swift-frontend -assume-parsing-unqualified-ownership-sil -disable-objc-interop -emit-ir %s | %FileCheck %s // REQUIRES: CPU=x86_64 diff --git a/test/IRGen/unowned_objc.sil b/test/IRGen/unowned_objc.sil index eb9397b6f19..2abf376df48 100644 --- a/test/IRGen/unowned_objc.sil +++ b/test/IRGen/unowned_objc.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -assume-parsing-unqualified-ownership-sil -emit-ir %s | %FileCheck %s +// RUN: %target-swift-frontend -assume-parsing-unqualified-ownership-sil -emit-ir %s | %FileCheck %s // REQUIRES: CPU=x86_64 // XFAIL: linux diff --git a/test/IRGen/unusedtype.swift b/test/IRGen/unusedtype.swift index 98dc036c76c..ef573216118 100644 --- a/test/IRGen/unusedtype.swift +++ b/test/IRGen/unusedtype.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -parse-as-library -Xllvm -new-mangling-for-tests -O %s -emit-ir > %t.ll +// RUN: %target-swift-frontend -parse-as-library -O %s -emit-ir > %t.ll // RUN: %FileCheck %s < %t.ll // RUN: %FileCheck -check-prefix=CHECK-REFLECTION %s < %t.ll diff --git a/test/IRGen/vtable_multi_file.swift b/test/IRGen/vtable_multi_file.swift index c8063d0510d..5eaa245772b 100644 --- a/test/IRGen/vtable_multi_file.swift +++ b/test/IRGen/vtable_multi_file.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -assume-parsing-unqualified-ownership-sil -primary-file %s %S/Inputs/vtable_multi_file_helper.swift -emit-ir | %FileCheck %s +// RUN: %target-swift-frontend -assume-parsing-unqualified-ownership-sil -primary-file %s %S/Inputs/vtable_multi_file_helper.swift -emit-ir | %FileCheck %s // REQUIRES: CPU=x86_64 diff --git a/test/IRGen/weak.sil b/test/IRGen/weak.sil index 17075346f09..69c79fe52d6 100644 --- a/test/IRGen/weak.sil +++ b/test/IRGen/weak.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -assume-parsing-unqualified-ownership-sil -emit-ir %s | %FileCheck %s +// RUN: %target-swift-frontend -assume-parsing-unqualified-ownership-sil -emit-ir %s | %FileCheck %s // REQUIRES: CPU=x86_64 // XFAIL: linux diff --git a/test/IRGen/weak_value_witnesses.sil b/test/IRGen/weak_value_witnesses.sil index 83caa5adf59..9385f96c061 100644 --- a/test/IRGen/weak_value_witnesses.sil +++ b/test/IRGen/weak_value_witnesses.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -assume-parsing-unqualified-ownership-sil %s -emit-ir | %FileCheck %s +// RUN: %target-swift-frontend -assume-parsing-unqualified-ownership-sil %s -emit-ir | %FileCheck %s // REQUIRES: CPU=x86_64 diff --git a/test/IRGen/witness_method.sil b/test/IRGen/witness_method.sil index 9aff54096df..3a939c076bf 100644 --- a/test/IRGen/witness_method.sil +++ b/test/IRGen/witness_method.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -assume-parsing-unqualified-ownership-sil %s -emit-ir | %FileCheck --check-prefix=CHECK --check-prefix=CHECK-%target-cpu %s +// RUN: %target-swift-frontend -assume-parsing-unqualified-ownership-sil %s -emit-ir | %FileCheck --check-prefix=CHECK --check-prefix=CHECK-%target-cpu %s // REQUIRES: CPU=i386_or_x86_64 diff --git a/test/IRGen/witness_table_indirect_conformances.swift b/test/IRGen/witness_table_indirect_conformances.swift index e74c2b86b25..3bfd2741455 100644 --- a/test/IRGen/witness_table_indirect_conformances.swift +++ b/test/IRGen/witness_table_indirect_conformances.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -assume-parsing-unqualified-ownership-sil -primary-file %s -emit-ir -disable-objc-attr-requires-foundation-module -swift-version 4 | %FileCheck %s +// RUN: %target-swift-frontend -assume-parsing-unqualified-ownership-sil -primary-file %s -emit-ir -disable-objc-attr-requires-foundation-module -swift-version 4 | %FileCheck %s protocol P1 { associatedtype AssocP1 diff --git a/test/IRGen/witness_table_multifile.swift b/test/IRGen/witness_table_multifile.swift index f5a9b4b58a3..f8043f2c153 100644 --- a/test/IRGen/witness_table_multifile.swift +++ b/test/IRGen/witness_table_multifile.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -assume-parsing-unqualified-ownership-sil -primary-file %s %S/Inputs/witness_table_multifile_2.swift -emit-ir -disable-objc-attr-requires-foundation-module | %FileCheck %s +// RUN: %target-swift-frontend -assume-parsing-unqualified-ownership-sil -primary-file %s %S/Inputs/witness_table_multifile_2.swift -emit-ir -disable-objc-attr-requires-foundation-module | %FileCheck %s // CHECK: [[P_WITNESS_TABLE:%[A-Za-z0-9_]+]] = type { [{{24|12}} x i8], %swift.type*, i8** } diff --git a/test/IRGen/witness_table_objc_associated_type.swift b/test/IRGen/witness_table_objc_associated_type.swift index eaee86c19ae..e9eba6dd9ed 100644 --- a/test/IRGen/witness_table_objc_associated_type.swift +++ b/test/IRGen/witness_table_objc_associated_type.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -assume-parsing-unqualified-ownership-sil -primary-file %s -emit-ir -disable-objc-attr-requires-foundation-module | %FileCheck %s +// RUN: %target-swift-frontend -assume-parsing-unqualified-ownership-sil -primary-file %s -emit-ir -disable-objc-attr-requires-foundation-module | %FileCheck %s protocol A {} diff --git a/test/IRGen/zombies.swift b/test/IRGen/zombies.swift index 6fdc6cd83b9..98576ec9fae 100644 --- a/test/IRGen/zombies.swift +++ b/test/IRGen/zombies.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -assume-parsing-unqualified-ownership-sil -primary-file %s -O -emit-ir | %FileCheck %s +// RUN: %target-swift-frontend -assume-parsing-unqualified-ownership-sil -primary-file %s -O -emit-ir | %FileCheck %s // rdar://24121475 // Ideally, these wouldn't be in the v-table at all; but as long as they diff --git a/test/Index/kinds.swift b/test/Index/kinds.swift index 98fd06d3a64..d12654ed7b6 100644 --- a/test/Index/kinds.swift +++ b/test/Index/kinds.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-ide-test -new-mangling-for-tests -print-indexed-symbols -source-filename %s | %FileCheck %s +// RUN: %target-swift-ide-test -print-indexed-symbols -source-filename %s | %FileCheck %s // Enum enum AnEnumeration { diff --git a/test/SIL/Parser/generic_signature_with_depth.swift b/test/SIL/Parser/generic_signature_with_depth.swift index 901e37f512a..dd285e82cd0 100644 --- a/test/SIL/Parser/generic_signature_with_depth.swift +++ b/test/SIL/Parser/generic_signature_with_depth.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests %s -emit-silgen | %target-sil-opt | %FileCheck %s +// RUN: %target-swift-frontend %s -emit-silgen | %target-sil-opt | %FileCheck %s protocol mmGeneratorType { associatedtype Element diff --git a/test/SIL/Serialization/deserialize_generic.sil b/test/SIL/Serialization/deserialize_generic.sil index c2b02263aad..2b6a95b2594 100644 --- a/test/SIL/Serialization/deserialize_generic.sil +++ b/test/SIL/Serialization/deserialize_generic.sil @@ -1,7 +1,7 @@ // RUN: rm -rf %t // RUN: mkdir -p %t -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-module -sil-serialize-all -o %t %S/Inputs/def_generic.swift -// RUN: %target-sil-opt -new-mangling-for-tests -assume-parsing-unqualified-ownership-sil -linker -I %t %s | %FileCheck %s +// RUN: %target-swift-frontend -emit-module -sil-serialize-all -o %t %S/Inputs/def_generic.swift +// RUN: %target-sil-opt -assume-parsing-unqualified-ownership-sil -linker -I %t %s | %FileCheck %s // Make sure that SILFunctionType with GenericSignature can match up with // SILFunctionType deserialized from module. diff --git a/test/SIL/Serialization/deserialize_generic_marker.sil b/test/SIL/Serialization/deserialize_generic_marker.sil index 1c470568b2f..07ad5dd5ebe 100644 --- a/test/SIL/Serialization/deserialize_generic_marker.sil +++ b/test/SIL/Serialization/deserialize_generic_marker.sil @@ -1,7 +1,7 @@ // RUN: rm -rf %t // RUN: mkdir -p %t -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-module -sil-serialize-all -o %t %S/Inputs/def_generic_marker.swift -// RUN: %target-sil-opt -new-mangling-for-tests -assume-parsing-unqualified-ownership-sil -linker -I %t %s | %FileCheck %s +// RUN: %target-swift-frontend -emit-module -sil-serialize-all -o %t %S/Inputs/def_generic_marker.swift +// RUN: %target-sil-opt -assume-parsing-unqualified-ownership-sil -linker -I %t %s | %FileCheck %s // Make sure that SILFunctionType with GenericSignature can match up with // SILFunctionType deserialized from module. diff --git a/test/SIL/whole_module_optimization.swift b/test/SIL/whole_module_optimization.swift index aeaf88fec0f..717973a60c9 100644 --- a/test/SIL/whole_module_optimization.swift +++ b/test/SIL/whole_module_optimization.swift @@ -1,11 +1,11 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-sil -O %s %S/Inputs/whole_module_optimization_helper.swift -o %t.sil -module-name main +// RUN: %target-swift-frontend -emit-sil -O %s %S/Inputs/whole_module_optimization_helper.swift -o %t.sil -module-name main // RUN: %FileCheck %s < %t.sil // RUN: %FileCheck %s -check-prefix=NEGATIVE < %t.sil -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-sil -O -primary-file %s %S/Inputs/whole_module_optimization_helper.swift -o %t.unopt.sil -module-name main +// RUN: %target-swift-frontend -emit-sil -O -primary-file %s %S/Inputs/whole_module_optimization_helper.swift -o %t.unopt.sil -module-name main // RUN: %FileCheck %s -check-prefix=CHECK-SINGLE-FILE < %t.unopt.sil -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-sil -O -enable-testing %s %S/Inputs/whole_module_optimization_helper.swift -o %t.testing.sil -module-name main +// RUN: %target-swift-frontend -emit-sil -O -enable-testing %s %S/Inputs/whole_module_optimization_helper.swift -o %t.testing.sil -module-name main // RUN: %FileCheck %s < %t.testing.sil // RUN: %FileCheck %s -check-prefix=NEGATIVE-TESTABLE < %t.testing.sil diff --git a/test/SILGen/accessibility_warnings.swift b/test/SILGen/accessibility_warnings.swift index cc40d1710c5..5c8431a18da 100644 --- a/test/SILGen/accessibility_warnings.swift +++ b/test/SILGen/accessibility_warnings.swift @@ -1,5 +1,5 @@ // RUN: %target-typecheck-verify-swift -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen %s | %FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s // This file tests that the AST produced after fixing accessibility warnings // is valid according to SILGen and the verifiers. diff --git a/test/SILGen/accessors.swift b/test/SILGen/accessors.swift index aca6f1f99a7..b436c2ca45c 100644 --- a/test/SILGen/accessors.swift +++ b/test/SILGen/accessors.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -Xllvm -sil-full-demangle -emit-silgen %s | %FileCheck %s +// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -emit-silgen %s | %FileCheck %s // Hold a reference to do to magically become non-POD. class Reference {} diff --git a/test/SILGen/address_only_types.swift b/test/SILGen/address_only_types.swift index 970c04dbf13..bc38beed3c9 100644 --- a/test/SILGen/address_only_types.swift +++ b/test/SILGen/address_only_types.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -parse-as-library -parse-stdlib -emit-silgen %s | %FileCheck %s +// RUN: %target-swift-frontend -parse-as-library -parse-stdlib -emit-silgen %s | %FileCheck %s precedencegroup AssignmentPrecedence { assignment: true } diff --git a/test/SILGen/addressors.swift b/test/SILGen/addressors.swift index c99c8af6b26..65e800a9463 100644 --- a/test/SILGen/addressors.swift +++ b/test/SILGen/addressors.swift @@ -1,5 +1,5 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -parse-stdlib -emit-sil %s | %FileCheck %s -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -parse-stdlib -emit-silgen %s | %FileCheck %s -check-prefix=SILGEN +// RUN: %target-swift-frontend -parse-stdlib -emit-sil %s | %FileCheck %s +// RUN: %target-swift-frontend -parse-stdlib -emit-silgen %s | %FileCheck %s -check-prefix=SILGEN import Swift diff --git a/test/SILGen/apply_abstraction_nested.swift b/test/SILGen/apply_abstraction_nested.swift index 9ba0506a25e..54c93a2e412 100644 --- a/test/SILGen/apply_abstraction_nested.swift +++ b/test/SILGen/apply_abstraction_nested.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen %s | %FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s infix operator ~> { precedence 255 associativity left } diff --git a/test/SILGen/argument_labels.swift b/test/SILGen/argument_labels.swift index 613202badea..3824dfdce32 100644 --- a/test/SILGen/argument_labels.swift +++ b/test/SILGen/argument_labels.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen %s | %FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s public struct X { } public struct Y { } diff --git a/test/SILGen/argument_shuffle_swift3.swift b/test/SILGen/argument_shuffle_swift3.swift index 16477afb7cd..87186ea8803 100644 --- a/test/SILGen/argument_shuffle_swift3.swift +++ b/test/SILGen/argument_shuffle_swift3.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen %s -swift-version 3 | %FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s -swift-version 3 | %FileCheck %s func fn(_: Any) {} diff --git a/test/SILGen/array_literal_abstraction.swift b/test/SILGen/array_literal_abstraction.swift index 83ccb290462..7cb61173e62 100644 --- a/test/SILGen/array_literal_abstraction.swift +++ b/test/SILGen/array_literal_abstraction.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen %s | %FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s // Verify that reabstraction happens when forming container literals. // diff --git a/test/SILGen/assignment.swift b/test/SILGen/assignment.swift index bbed5de6fe5..d5beda9bd66 100644 --- a/test/SILGen/assignment.swift +++ b/test/SILGen/assignment.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen %s | %FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s class C {} diff --git a/test/SILGen/auto_closures.swift b/test/SILGen/auto_closures.swift index 9c073c64386..0527db4e0dd 100644 --- a/test/SILGen/auto_closures.swift +++ b/test/SILGen/auto_closures.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -parse-stdlib -emit-silgen %s | %FileCheck %s +// RUN: %target-swift-frontend -parse-stdlib -emit-silgen %s | %FileCheck %s struct Bool {} var false_ = Bool() diff --git a/test/SILGen/auto_generated_super_init_call.swift b/test/SILGen/auto_generated_super_init_call.swift index 1d27ae3ef25..2e389db3fbd 100644 --- a/test/SILGen/auto_generated_super_init_call.swift +++ b/test/SILGen/auto_generated_super_init_call.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen %s | %FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s // Test that we emit a call to super.init at the end of the initializer, when none has been previously added. diff --git a/test/SILGen/borrow.swift b/test/SILGen/borrow.swift index 87abf50ac6c..6c90b4c385e 100644 --- a/test/SILGen/borrow.swift +++ b/test/SILGen/borrow.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -parse-stdlib -emit-silgen %s | %FileCheck %s +// RUN: %target-swift-frontend -parse-stdlib -emit-silgen %s | %FileCheck %s import Swift diff --git a/test/SILGen/boxed_existentials.swift b/test/SILGen/boxed_existentials.swift index d94652cfc4f..c698853e83f 100644 --- a/test/SILGen/boxed_existentials.swift +++ b/test/SILGen/boxed_existentials.swift @@ -1,5 +1,5 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -Xllvm -sil-full-demangle -emit-silgen %s | %FileCheck %s -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -Xllvm -sil-full-demangle -emit-silgen %s | %FileCheck %s --check-prefix=GUARANTEED +// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -emit-silgen %s | %FileCheck %s +// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -emit-silgen %s | %FileCheck %s --check-prefix=GUARANTEED func test_type_lowering(_ x: Error) { } // CHECK-LABEL: sil hidden @_T018boxed_existentials18test_type_loweringys5Error_pF : $@convention(thin) (@owned Error) -> () { diff --git a/test/SILGen/builtins.swift b/test/SILGen/builtins.swift index e72ae96c070..cc4ac51aed4 100644 --- a/test/SILGen/builtins.swift +++ b/test/SILGen/builtins.swift @@ -1,5 +1,5 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen -parse-stdlib %s -disable-objc-attr-requires-foundation-module | %FileCheck %s -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-sil -Onone -parse-stdlib %s -disable-objc-attr-requires-foundation-module | %FileCheck -check-prefix=CANONICAL %s +// RUN: %target-swift-frontend -emit-silgen -parse-stdlib %s -disable-objc-attr-requires-foundation-module | %FileCheck %s +// RUN: %target-swift-frontend -emit-sil -Onone -parse-stdlib %s -disable-objc-attr-requires-foundation-module | %FileCheck -check-prefix=CANONICAL %s import Swift diff --git a/test/SILGen/c_function_pointers.swift b/test/SILGen/c_function_pointers.swift index e7c6e8c5fe0..371363a163d 100644 --- a/test/SILGen/c_function_pointers.swift +++ b/test/SILGen/c_function_pointers.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen -verify %s | %FileCheck %s +// RUN: %target-swift-frontend -emit-silgen -verify %s | %FileCheck %s func values(_ arg: @escaping @convention(c) (Int) -> Int) -> @convention(c) (Int) -> Int { return arg diff --git a/test/SILGen/c_materializeForSet_linkage.swift b/test/SILGen/c_materializeForSet_linkage.swift index 3d9b221a0a3..9c36401c376 100644 --- a/test/SILGen/c_materializeForSet_linkage.swift +++ b/test/SILGen/c_materializeForSet_linkage.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -sdk %S/Inputs -I %S/Inputs -enable-source-import %s -emit-silgen | %FileCheck %s +// RUN: %target-swift-frontend -sdk %S/Inputs -I %S/Inputs -enable-source-import %s -emit-silgen | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/SILGen/call_chain_reabstraction.swift b/test/SILGen/call_chain_reabstraction.swift index 5f9fc4bb38f..576775e44b0 100644 --- a/test/SILGen/call_chain_reabstraction.swift +++ b/test/SILGen/call_chain_reabstraction.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen %s | %FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s struct A { func g(_ recur: (A, U) -> U) -> (A, U) -> U { diff --git a/test/SILGen/capture_inout.swift b/test/SILGen/capture_inout.swift index eaa30ac219b..a0a855807b5 100644 --- a/test/SILGen/capture_inout.swift +++ b/test/SILGen/capture_inout.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -parse-stdlib -emit-silgen %s | %FileCheck %s +// RUN: %target-swift-frontend -parse-stdlib -emit-silgen %s | %FileCheck %s typealias Int = Builtin.Int64 diff --git a/test/SILGen/capture_typealias.swift b/test/SILGen/capture_typealias.swift index f5f5b8b938a..e0cf13d626e 100644 --- a/test/SILGen/capture_typealias.swift +++ b/test/SILGen/capture_typealias.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -parse-stdlib -emit-silgen %s | %FileCheck %s +// RUN: %target-swift-frontend -parse-stdlib -emit-silgen %s | %FileCheck %s typealias Int = Builtin.Int64 diff --git a/test/SILGen/capture_typed_boxes.swift b/test/SILGen/capture_typed_boxes.swift index e1c8a817165..194d211b2ed 100644 --- a/test/SILGen/capture_typed_boxes.swift +++ b/test/SILGen/capture_typed_boxes.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen %s | %FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s func foo(_ x: Int) -> () -> Int { var x = x diff --git a/test/SILGen/casts.swift b/test/SILGen/casts.swift index e493c453137..f6b3859a9d9 100644 --- a/test/SILGen/casts.swift +++ b/test/SILGen/casts.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen %s | %FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s class B { } class D : B { } diff --git a/test/SILGen/cdecl.swift b/test/SILGen/cdecl.swift index 508cb96bb09..fb3b0c8efc8 100644 --- a/test/SILGen/cdecl.swift +++ b/test/SILGen/cdecl.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen %s | %FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s // CHECK-LABEL: sil hidden [thunk] @pear : $@convention(c) // CHECK: function_ref @_T05cdecl5apple{{[_0-9a-zA-Z]*}}F diff --git a/test/SILGen/cf.swift b/test/SILGen/cf.swift index 8f2ad107d42..95482c97f6f 100644 --- a/test/SILGen/cf.swift +++ b/test/SILGen/cf.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -import-cf-types -sdk %S/Inputs %s -emit-silgen -o - | %FileCheck %s +// RUN: %target-swift-frontend -import-cf-types -sdk %S/Inputs %s -emit-silgen -o - | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/SILGen/cf_members.swift b/test/SILGen/cf_members.swift index a0c018c632a..a291546cbd6 100644 --- a/test/SILGen/cf_members.swift +++ b/test/SILGen/cf_members.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen -I %S/../IDE/Inputs/custom-modules %s | %FileCheck %s +// RUN: %target-swift-frontend -emit-silgen -I %S/../IDE/Inputs/custom-modules %s | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/SILGen/class_bound_protocols.swift b/test/SILGen/class_bound_protocols.swift index 93d92c6f3b3..b247d96e336 100644 --- a/test/SILGen/class_bound_protocols.swift +++ b/test/SILGen/class_bound_protocols.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -parse-stdlib -parse-as-library -emit-silgen %s | %FileCheck %s +// RUN: %target-swift-frontend -parse-stdlib -parse-as-library -emit-silgen %s | %FileCheck %s // -- Class-bound archetypes and existentials are *not* address-only and can // be manipulated using normal reference type value semantics. diff --git a/test/SILGen/class_resilience.swift b/test/SILGen/class_resilience.swift index 0c4bd1b2887..77b3592841a 100644 --- a/test/SILGen/class_resilience.swift +++ b/test/SILGen/class_resilience.swift @@ -1,7 +1,7 @@ // RUN: rm -rf %t && mkdir %t // RUN: %target-swift-frontend -emit-module -enable-resilience -emit-module-path=%t/resilient_struct.swiftmodule -module-name=resilient_struct %S/../Inputs/resilient_struct.swift // RUN: %target-swift-frontend -emit-module -enable-resilience -emit-module-path=%t/resilient_class.swiftmodule -module-name=resilient_class -I %t %S/../Inputs/resilient_class.swift -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -I %t -emit-silgen -enable-resilience %s | %FileCheck %s +// RUN: %target-swift-frontend -I %t -emit-silgen -enable-resilience %s | %FileCheck %s import resilient_class diff --git a/test/SILGen/closure_inline_initializer.swift b/test/SILGen/closure_inline_initializer.swift index 2c830ab45c4..b3c1e615b9e 100644 --- a/test/SILGen/closure_inline_initializer.swift +++ b/test/SILGen/closure_inline_initializer.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen %s | %FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s // CHECK-LABEL: sil shared @_T026closure_inline_initializer3FooV3fooSivfiSiycfU_ diff --git a/test/SILGen/closure_script_global_escape.swift b/test/SILGen/closure_script_global_escape.swift index 80ab2719779..ad6710c019d 100644 --- a/test/SILGen/closure_script_global_escape.swift +++ b/test/SILGen/closure_script_global_escape.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -module-name foo -emit-silgen %s | %FileCheck %s +// RUN: %target-swift-frontend -module-name foo -emit-silgen %s | %FileCheck %s // RUN: %target-swift-frontend -module-name foo -emit-sil -verify %s // CHECK-LABEL: sil @main diff --git a/test/SILGen/closure_self_recursion.swift b/test/SILGen/closure_self_recursion.swift index d76a8e2b8df..dee5ce2db0b 100644 --- a/test/SILGen/closure_self_recursion.swift +++ b/test/SILGen/closure_self_recursion.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -module-name foo -emit-silgen %s | %FileCheck %s +// RUN: %target-swift-frontend -module-name foo -emit-silgen %s | %FileCheck %s // RUN: %target-swift-frontend -module-name foo -emit-sil -verify %s // CHECK-LABEL: sil @main diff --git a/test/SILGen/complete_object_init.swift b/test/SILGen/complete_object_init.swift index 25bba5111cd..f234e28f0af 100644 --- a/test/SILGen/complete_object_init.swift +++ b/test/SILGen/complete_object_init.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests %s -emit-silgen | %FileCheck %s +// RUN: %target-swift-frontend %s -emit-silgen | %FileCheck %s struct X { } diff --git a/test/SILGen/concrete_subclass.swift b/test/SILGen/concrete_subclass.swift index ed08629eebb..8541ae0d283 100644 --- a/test/SILGen/concrete_subclass.swift +++ b/test/SILGen/concrete_subclass.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -Xllvm -sil-full-demangle -emit-silgen %s +// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -emit-silgen %s class BaseClass { func inAndOut(_ t: T) -> T { return t } diff --git a/test/SILGen/conditionally_unreachable.swift b/test/SILGen/conditionally_unreachable.swift index bedfe944e2b..23ccc96dbb9 100644 --- a/test/SILGen/conditionally_unreachable.swift +++ b/test/SILGen/conditionally_unreachable.swift @@ -1,8 +1,8 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen -parse-stdlib -primary-file %s | %FileCheck %s -check-prefix=RAW -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-sil -assert-config Debug -parse-stdlib -primary-file %s | %FileCheck -check-prefix=DEBUG %s -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-sil -O -assert-config Debug -parse-stdlib -primary-file %s | %FileCheck -check-prefix=DEBUG %s -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-sil -assert-config Release -parse-stdlib -primary-file %s | %FileCheck -check-prefix=RELEASE %s -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-sil -O -assert-config Release -parse-stdlib -primary-file %s | %FileCheck -check-prefix=RELEASE %s +// RUN: %target-swift-frontend -emit-silgen -parse-stdlib -primary-file %s | %FileCheck %s -check-prefix=RAW +// RUN: %target-swift-frontend -emit-sil -assert-config Debug -parse-stdlib -primary-file %s | %FileCheck -check-prefix=DEBUG %s +// RUN: %target-swift-frontend -emit-sil -O -assert-config Debug -parse-stdlib -primary-file %s | %FileCheck -check-prefix=DEBUG %s +// RUN: %target-swift-frontend -emit-sil -assert-config Release -parse-stdlib -primary-file %s | %FileCheck -check-prefix=RELEASE %s +// RUN: %target-swift-frontend -emit-sil -O -assert-config Release -parse-stdlib -primary-file %s | %FileCheck -check-prefix=RELEASE %s import Swift diff --git a/test/SILGen/constrained_extensions.swift b/test/SILGen/constrained_extensions.swift index 4178b9377c4..18a10af6690 100644 --- a/test/SILGen/constrained_extensions.swift +++ b/test/SILGen/constrained_extensions.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen %s | %FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s // RUN: %target-swift-frontend -emit-ir %s // RUN: %target-swift-frontend -emit-ir -O %s diff --git a/test/SILGen/copy_lvalue_peepholes.swift b/test/SILGen/copy_lvalue_peepholes.swift index f9632127e6f..16dda512ee1 100644 --- a/test/SILGen/copy_lvalue_peepholes.swift +++ b/test/SILGen/copy_lvalue_peepholes.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -parse-stdlib -parse-as-library -emit-silgen %s | %FileCheck %s +// RUN: %target-swift-frontend -parse-stdlib -parse-as-library -emit-silgen %s | %FileCheck %s precedencegroup AssignmentPrecedence { assignment: true } diff --git a/test/SILGen/coverage_exceptions.swift b/test/SILGen/coverage_exceptions.swift index 63e97f1ca56..e0c68fb5ad7 100644 --- a/test/SILGen/coverage_exceptions.swift +++ b/test/SILGen/coverage_exceptions.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -Xllvm -sil-full-demangle -profile-generate -profile-coverage-mapping -emit-sorted-sil -emit-sil -module-name coverage_catch %s | %FileCheck %s +// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -profile-generate -profile-coverage-mapping -emit-sorted-sil -emit-sil -module-name coverage_catch %s | %FileCheck %s enum SomeErr : Error { case Err1 diff --git a/test/SILGen/coverage_ternary.swift b/test/SILGen/coverage_ternary.swift index 3c12238088d..56432311cf5 100644 --- a/test/SILGen/coverage_ternary.swift +++ b/test/SILGen/coverage_ternary.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -Xllvm -sil-full-demangle -profile-generate -profile-coverage-mapping -emit-sorted-sil -emit-sil -module-name coverage_ternary %s | %FileCheck %s +// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -profile-generate -profile-coverage-mapping -emit-sorted-sil -emit-sil -module-name coverage_ternary %s | %FileCheck %s // rdar://problem/23256795 - Avoid crash if an if_expr has no parent // CHECK-LABEL: sil_coverage_map {{.*}}// coverage_ternary.bar.__allocating_init diff --git a/test/SILGen/decls.swift b/test/SILGen/decls.swift index 638ec474907..83c2e30cce7 100644 --- a/test/SILGen/decls.swift +++ b/test/SILGen/decls.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -Xllvm -sil-full-demangle -parse-as-library -emit-silgen %s | %FileCheck %s +// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -parse-as-library -emit-silgen %s | %FileCheck %s // CHECK-LABEL: sil hidden @_T05decls11void_returnyyF // CHECK: = tuple diff --git a/test/SILGen/default_arguments_generic.swift b/test/SILGen/default_arguments_generic.swift index 42e6d8b5c0c..f311f89ee59 100644 --- a/test/SILGen/default_arguments_generic.swift +++ b/test/SILGen/default_arguments_generic.swift @@ -1,5 +1,5 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen -swift-version 3 %s | %FileCheck %s -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen -swift-version 4 %s | %FileCheck %s +// RUN: %target-swift-frontend -emit-silgen -swift-version 3 %s | %FileCheck %s +// RUN: %target-swift-frontend -emit-silgen -swift-version 4 %s | %FileCheck %s func foo(_: T.Type, x: T = 0) { } diff --git a/test/SILGen/default_arguments_inherited.swift b/test/SILGen/default_arguments_inherited.swift index 3f201157abd..ebe3e7b130e 100644 --- a/test/SILGen/default_arguments_inherited.swift +++ b/test/SILGen/default_arguments_inherited.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen %s | %FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s // When we synthesize an inherited designated initializer, the default // arguments are still conceptually rooted on the base declaration. diff --git a/test/SILGen/dependent_member_lowering.swift b/test/SILGen/dependent_member_lowering.swift index eab8a40235b..7a4e1f6f521 100644 --- a/test/SILGen/dependent_member_lowering.swift +++ b/test/SILGen/dependent_member_lowering.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen %s | %FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s protocol P { associatedtype A diff --git a/test/SILGen/downcast_reabstraction.swift b/test/SILGen/downcast_reabstraction.swift index f8f941d2585..d1fd8825043 100644 --- a/test/SILGen/downcast_reabstraction.swift +++ b/test/SILGen/downcast_reabstraction.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen %s | %FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s // CHECK-LABEL: sil hidden @_T022downcast_reabstraction19condFunctionFromAnyyypF // CHECK: checked_cast_addr_br take_always Any in [[IN:%.*]] : $*Any to () -> () in [[OUT:%.*]] : $*@callee_owned (@in ()) -> @out (), [[YES:bb[0-9]+]], [[NO:bb[0-9]+]] diff --git a/test/SILGen/dso_handle.swift b/test/SILGen/dso_handle.swift index a2ef3202aba..37b734023bc 100644 --- a/test/SILGen/dso_handle.swift +++ b/test/SILGen/dso_handle.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -Xllvm -sil-full-demangle -emit-silgen %s | %FileCheck %s +// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -emit-silgen %s | %FileCheck %s // CHECK: sil_global hidden_external [[DSO:@__dso_handle]] : $Builtin.RawPointer diff --git a/test/SILGen/dynamic.swift b/test/SILGen/dynamic.swift index 31b025a3446..450bc75fffb 100644 --- a/test/SILGen/dynamic.swift +++ b/test/SILGen/dynamic.swift @@ -1,7 +1,7 @@ // RUN: rm -rf %t && mkdir -p %t // RUN: %build-silgen-test-overlays -// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -Xllvm -new-mangling-for-tests -Xllvm -sil-full-demangle -primary-file %s %S/Inputs/dynamic_other.swift -emit-silgen | %FileCheck %s +// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -Xllvm -sil-full-demangle -primary-file %s %S/Inputs/dynamic_other.swift -emit-silgen | %FileCheck %s // RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -Xllvm -sil-full-demangle -primary-file %s %S/Inputs/dynamic_other.swift -emit-sil -verify // REQUIRES: objc_interop diff --git a/test/SILGen/dynamic_init.swift b/test/SILGen/dynamic_init.swift index 5b331fd9f30..ee491675b77 100644 --- a/test/SILGen/dynamic_init.swift +++ b/test/SILGen/dynamic_init.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen %s | %FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s class C { required init() { } diff --git a/test/SILGen/dynamic_lookup.swift b/test/SILGen/dynamic_lookup.swift index cfe3a781f1b..109253a76e9 100644 --- a/test/SILGen/dynamic_lookup.swift +++ b/test/SILGen/dynamic_lookup.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -parse-as-library -emit-silgen -disable-objc-attr-requires-foundation-module %s | %FileCheck %s +// RUN: %target-swift-frontend -parse-as-library -emit-silgen -disable-objc-attr-requires-foundation-module %s | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/SILGen/dynamic_lookup_throws.swift b/test/SILGen/dynamic_lookup_throws.swift index 48799c8fa33..d07ebce1bbb 100644 --- a/test/SILGen/dynamic_lookup_throws.swift +++ b/test/SILGen/dynamic_lookup_throws.swift @@ -1,7 +1,7 @@ // RUN: rm -rf %t && mkdir -p %t // RUN: %build-clang-importer-objc-overlays -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk-nosource -I %t) -Xllvm -new-mangling-for-tests -emit-silgen -parse-as-library %s | %FileCheck %s +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk-nosource -I %t) -emit-silgen -parse-as-library %s | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/SILGen/dynamic_self.swift b/test/SILGen/dynamic_self.swift index c29a556ff4a..a9839c2f731 100644 --- a/test/SILGen/dynamic_self.swift +++ b/test/SILGen/dynamic_self.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen %s -disable-objc-attr-requires-foundation-module | %FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s -disable-objc-attr-requires-foundation-module | %FileCheck %s protocol P { func f() -> Self diff --git a/test/SILGen/dynamic_self_reference_storage.swift b/test/SILGen/dynamic_self_reference_storage.swift index b14f29ea7a6..4bb0c9a9755 100644 --- a/test/SILGen/dynamic_self_reference_storage.swift +++ b/test/SILGen/dynamic_self_reference_storage.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen %s | %FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s class Foo { // CHECK-LABEL: sil hidden @_T030dynamic_self_reference_storage3FooC0A4Self{{[_0-9a-zA-Z]*}}F diff --git a/test/SILGen/enum_generic_raw_value.swift b/test/SILGen/enum_generic_raw_value.swift index 1fd67c8b9fd..deee9e41d36 100644 --- a/test/SILGen/enum_generic_raw_value.swift +++ b/test/SILGen/enum_generic_raw_value.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen %s | %FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s // CHECK-LABEL: sil hidden @_T022enum_generic_raw_value1EO enum E: Int { diff --git a/test/SILGen/enum_resilience.swift b/test/SILGen/enum_resilience.swift index 3e1242b4bd0..90177d3aecd 100644 --- a/test/SILGen/enum_resilience.swift +++ b/test/SILGen/enum_resilience.swift @@ -1,7 +1,7 @@ // RUN: rm -rf %t && mkdir %t // RUN: %target-swift-frontend -emit-module -enable-resilience -emit-module-path=%t/resilient_struct.swiftmodule -module-name=resilient_struct %S/../Inputs/resilient_struct.swift // RUN: %target-swift-frontend -emit-module -enable-resilience -emit-module-path=%t/resilient_enum.swiftmodule -module-name=resilient_enum -I %t %S/../Inputs/resilient_enum.swift -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -I %t -emit-silgen -enable-resilience %s | %FileCheck %s +// RUN: %target-swift-frontend -I %t -emit-silgen -enable-resilience %s | %FileCheck %s import resilient_enum diff --git a/test/SILGen/erasure_reabstraction.swift b/test/SILGen/erasure_reabstraction.swift index a4801278644..63a86cbef74 100644 --- a/test/SILGen/erasure_reabstraction.swift +++ b/test/SILGen/erasure_reabstraction.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen %s | %FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s struct Foo {} class Bar {} diff --git a/test/SILGen/existential_erasure.swift b/test/SILGen/existential_erasure.swift index 90460435876..91ee3841b3c 100644 --- a/test/SILGen/existential_erasure.swift +++ b/test/SILGen/existential_erasure.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen %s | %FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s protocol P { func downgrade(_ m68k: Bool) -> Self diff --git a/test/SILGen/existential_metatypes.swift b/test/SILGen/existential_metatypes.swift index 39b2a38aca7..9e765850ded 100644 --- a/test/SILGen/existential_metatypes.swift +++ b/test/SILGen/existential_metatypes.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen -parse-stdlib %s | %FileCheck %s +// RUN: %target-swift-frontend -emit-silgen -parse-stdlib %s | %FileCheck %s protocol P { init() diff --git a/test/SILGen/expressions.swift b/test/SILGen/expressions.swift index 23aeb8579f6..3828a774956 100644 --- a/test/SILGen/expressions.swift +++ b/test/SILGen/expressions.swift @@ -1,7 +1,7 @@ // RUN: rm -rf %t // RUN: mkdir -p %t // RUN: echo "public var x = Int()" | %target-swift-frontend -module-name FooBar -emit-module -o %t - -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -parse-stdlib -emit-silgen %s -I%t -disable-access-control | %FileCheck %s +// RUN: %target-swift-frontend -parse-stdlib -emit-silgen %s -I%t -disable-access-control | %FileCheck %s import Swift import FooBar diff --git a/test/SILGen/extensions_multifile.swift b/test/SILGen/extensions_multifile.swift index 223642b6fea..842caed7825 100644 --- a/test/SILGen/extensions_multifile.swift +++ b/test/SILGen/extensions_multifile.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen -primary-file %s %S/Inputs/struct_with_initializer.swift -module-name extensions_multifile | %FileCheck %s +// RUN: %target-swift-frontend -emit-silgen -primary-file %s %S/Inputs/struct_with_initializer.swift -module-name extensions_multifile | %FileCheck %s // CHECK-LABEL: sil hidden @_T020extensions_multifile12HasInitValueVACSi1z_tcfC : $@convention(method) (Int, @thin HasInitValue.Type) -> @owned HasInitValue { // CHECK: function_ref @_T020extensions_multifile12HasInitValueV1xSivfi : $@convention(thin) () -> Int diff --git a/test/SILGen/extensions_objc.swift b/test/SILGen/extensions_objc.swift index 2830ce1f92b..2db2570bd0d 100644 --- a/test/SILGen/extensions_objc.swift +++ b/test/SILGen/extensions_objc.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -sdk %S/Inputs %s -I %S/Inputs -enable-source-import -emit-silgen | %FileCheck %s +// RUN: %target-swift-frontend -sdk %S/Inputs %s -I %S/Inputs -enable-source-import -emit-silgen | %FileCheck %s // // REQUIRES: objc_interop diff --git a/test/SILGen/external_definitions.swift b/test/SILGen/external_definitions.swift index 2952c19dafa..baf40fc9f16 100644 --- a/test/SILGen/external_definitions.swift +++ b/test/SILGen/external_definitions.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -sdk %S/Inputs %s -emit-silgen | %FileCheck %s +// RUN: %target-swift-frontend -sdk %S/Inputs %s -emit-silgen | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/SILGen/final.swift b/test/SILGen/final.swift index 30d7168ab19..ee343d32e9c 100644 --- a/test/SILGen/final.swift +++ b/test/SILGen/final.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen %s | %FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s class TestClass { diff --git a/test/SILGen/force_cast_chained_optional.swift b/test/SILGen/force_cast_chained_optional.swift index c49c4b4a9c1..1080ea69061 100644 --- a/test/SILGen/force_cast_chained_optional.swift +++ b/test/SILGen/force_cast_chained_optional.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen %s | %FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s class Foo { var bar: Bar! diff --git a/test/SILGen/foreach.swift b/test/SILGen/foreach.swift index 2e2cc44c22a..6404e5c5044 100644 --- a/test/SILGen/foreach.swift +++ b/test/SILGen/foreach.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen %s | %FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s ////////////////// // Declarations // diff --git a/test/SILGen/fragile_globals.swift b/test/SILGen/fragile_globals.swift index f01be3bbe59..82bafa15e97 100644 --- a/test/SILGen/fragile_globals.swift +++ b/test/SILGen/fragile_globals.swift @@ -1,8 +1,8 @@ // RUN: rm -rf %t // RUN: mkdir -p %t -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-module -parse-as-library -sil-serialize-all -o %t %S/Inputs/ModuleA.swift -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-module -parse-as-library -sil-serialize-all -o %t %S/Inputs/ModuleB.swift -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -parse-as-library -I%t %s -Xllvm -sil-disable-pass="SIL Global Optimization" -O -emit-sil | %FileCheck %s +// RUN: %target-swift-frontend -emit-module -parse-as-library -sil-serialize-all -o %t %S/Inputs/ModuleA.swift +// RUN: %target-swift-frontend -emit-module -parse-as-library -sil-serialize-all -o %t %S/Inputs/ModuleB.swift +// RUN: %target-swift-frontend -parse-as-library -I%t %s -Xllvm -sil-disable-pass="SIL Global Optimization" -O -emit-sil | %FileCheck %s import ModuleA import ModuleB diff --git a/test/SILGen/function_conversion.swift b/test/SILGen/function_conversion.swift index 049186de869..6d2c6880f21 100644 --- a/test/SILGen/function_conversion.swift +++ b/test/SILGen/function_conversion.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen %s | %FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s // Check SILGen against various FunctionConversionExprs emitted by Sema. diff --git a/test/SILGen/function_conversion_objc.swift b/test/SILGen/function_conversion_objc.swift index 7f4162e3fbd..4878c9ff43b 100644 --- a/test/SILGen/function_conversion_objc.swift +++ b/test/SILGen/function_conversion_objc.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -sdk %S/Inputs %s -I %S/Inputs -enable-source-import -emit-silgen -verify | %FileCheck %s +// RUN: %target-swift-frontend -sdk %S/Inputs %s -I %S/Inputs -enable-source-import -emit-silgen -verify | %FileCheck %s import Foundation diff --git a/test/SILGen/functions.swift b/test/SILGen/functions.swift index 109da7226c4..11e734be084 100644 --- a/test/SILGen/functions.swift +++ b/test/SILGen/functions.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -Xllvm -sil-full-demangle -parse-stdlib -parse-as-library -emit-silgen %s | %FileCheck %s +// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -parse-stdlib -parse-as-library -emit-silgen %s | %FileCheck %s import Swift // just for Optional diff --git a/test/SILGen/generic_closures.swift b/test/SILGen/generic_closures.swift index 91a92429589..b84b6254ab0 100644 --- a/test/SILGen/generic_closures.swift +++ b/test/SILGen/generic_closures.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -parse-stdlib -emit-silgen %s | %FileCheck %s +// RUN: %target-swift-frontend -parse-stdlib -emit-silgen %s | %FileCheck %s import Swift diff --git a/test/SILGen/generic_literals.swift b/test/SILGen/generic_literals.swift index 90af7f74bed..502bc455457 100644 --- a/test/SILGen/generic_literals.swift +++ b/test/SILGen/generic_literals.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen %s | %FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s // CHECK-LABEL: sil hidden @_T016generic_literals0A14IntegerLiteralyx1x_ts013ExpressibleBycD0RzlF func genericIntegerLiteral(x: T) { diff --git a/test/SILGen/generic_local_property.swift b/test/SILGen/generic_local_property.swift index 134ecc3b37f..798f2989c18 100644 --- a/test/SILGen/generic_local_property.swift +++ b/test/SILGen/generic_local_property.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen %s | %FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s func use(_: T) {} diff --git a/test/SILGen/generic_objc_block_bridge.swift b/test/SILGen/generic_objc_block_bridge.swift index cdec11d6c5c..425b6dce0b6 100644 --- a/test/SILGen/generic_objc_block_bridge.swift +++ b/test/SILGen/generic_objc_block_bridge.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen -sdk %S/Inputs -I %S/Inputs -enable-source-import %s | %FileCheck %s +// RUN: %target-swift-frontend -emit-silgen -sdk %S/Inputs -I %S/Inputs -enable-source-import %s | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/SILGen/generic_property_base_lifetime.swift b/test/SILGen/generic_property_base_lifetime.swift index dda99dbce4d..292021b7626 100644 --- a/test/SILGen/generic_property_base_lifetime.swift +++ b/test/SILGen/generic_property_base_lifetime.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen %s -disable-objc-attr-requires-foundation-module | %FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s -disable-objc-attr-requires-foundation-module | %FileCheck %s protocol ProtocolA: class { var intProp: Int { get set } diff --git a/test/SILGen/generic_tuples.swift b/test/SILGen/generic_tuples.swift index 690bc5c00ef..889ef44f0c0 100644 --- a/test/SILGen/generic_tuples.swift +++ b/test/SILGen/generic_tuples.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen -parse-as-library %s | %FileCheck %s +// RUN: %target-swift-frontend -emit-silgen -parse-as-library %s | %FileCheck %s func dup(_ x: T) -> (T, T) { return (x,x) } diff --git a/test/SILGen/generic_witness.swift b/test/SILGen/generic_witness.swift index a0800f47e4b..80e6a7e4668 100644 --- a/test/SILGen/generic_witness.swift +++ b/test/SILGen/generic_witness.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen %s | %FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s // RUN: %target-swift-frontend -emit-ir %s protocol Runcible { diff --git a/test/SILGen/global_init_attribute.swift b/test/SILGen/global_init_attribute.swift index fa1e4645699..ab4d9d0a383 100644 --- a/test/SILGen/global_init_attribute.swift +++ b/test/SILGen/global_init_attribute.swift @@ -1,7 +1,7 @@ // RUN: rm -rf %t // RUN: mkdir -p %t // RUN: %target-swift-frontend -Xllvm -sil-full-demangle -emit-module -o %t %S/Inputs/def_global.swift -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -Xllvm -sil-full-demangle -parse-as-library -emit-silgen -I %t %s | %FileCheck %s +// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -parse-as-library -emit-silgen -I %t %s | %FileCheck %s // // Test that SILGen uses the "global_init" attribute for all global // variable addressors. diff --git a/test/SILGen/global_resilience.swift b/test/SILGen/global_resilience.swift index b4048e3736d..4eae5481be6 100644 --- a/test/SILGen/global_resilience.swift +++ b/test/SILGen/global_resilience.swift @@ -1,7 +1,7 @@ // RUN: rm -rf %t && mkdir %t // RUN: %target-swift-frontend -emit-module -enable-resilience -emit-module-path=%t/resilient_global.swiftmodule -module-name=resilient_global %S/../Inputs/resilient_global.swift -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -I %t -emit-silgen -enable-resilience -parse-as-library %s | %FileCheck %s -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -I %t -emit-sil -O -enable-resilience -parse-as-library %s | %FileCheck --check-prefix=CHECK-OPT %s +// RUN: %target-swift-frontend -I %t -emit-silgen -enable-resilience -parse-as-library %s | %FileCheck %s +// RUN: %target-swift-frontend -I %t -emit-sil -O -enable-resilience -parse-as-library %s | %FileCheck --check-prefix=CHECK-OPT %s import resilient_global diff --git a/test/SILGen/guaranteed_closure_context.swift b/test/SILGen/guaranteed_closure_context.swift index 2625a06ef4d..1321abc6c02 100644 --- a/test/SILGen/guaranteed_closure_context.swift +++ b/test/SILGen/guaranteed_closure_context.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -parse-as-library -emit-silgen -enable-guaranteed-closure-contexts %s | %FileCheck %s +// RUN: %target-swift-frontend -parse-as-library -emit-silgen -enable-guaranteed-closure-contexts %s | %FileCheck %s func use(_: T) {} diff --git a/test/SILGen/guaranteed_self.swift b/test/SILGen/guaranteed_self.swift index a04374dd926..74f8ae08e9f 100644 --- a/test/SILGen/guaranteed_self.swift +++ b/test/SILGen/guaranteed_self.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -Xllvm -sil-full-demangle -emit-silgen %s -disable-objc-attr-requires-foundation-module | %FileCheck %s +// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -emit-silgen %s -disable-objc-attr-requires-foundation-module | %FileCheck %s protocol Fooable { init() diff --git a/test/SILGen/if_expr.swift b/test/SILGen/if_expr.swift index 4dbf32c8ebd..28c36bedd11 100644 --- a/test/SILGen/if_expr.swift +++ b/test/SILGen/if_expr.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen %s | %FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s func fizzbuzz(i: Int) -> String { return i % 3 == 0 diff --git a/test/SILGen/if_while_binding.swift b/test/SILGen/if_while_binding.swift index 93d81597dcf..bc17429cb09 100644 --- a/test/SILGen/if_while_binding.swift +++ b/test/SILGen/if_while_binding.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -Xllvm -sil-full-demangle -emit-silgen %s | %FileCheck %s +// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -emit-silgen %s | %FileCheck %s func foo() -> String? { return "" } func bar() -> String? { return "" } diff --git a/test/SILGen/implicitly_unwrapped_optional.swift b/test/SILGen/implicitly_unwrapped_optional.swift index 1ecd204d2b9..cea0159326b 100644 --- a/test/SILGen/implicitly_unwrapped_optional.swift +++ b/test/SILGen/implicitly_unwrapped_optional.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen %s | %FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s func foo(f f: (() -> ())!) { var f: (() -> ())! = f diff --git a/test/SILGen/import_as_member.swift b/test/SILGen/import_as_member.swift index 6b560e003a1..e215333394f 100644 --- a/test/SILGen/import_as_member.swift +++ b/test/SILGen/import_as_member.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen -I %S/../IDE/Inputs/custom-modules %s 2>&1 | %FileCheck --check-prefix=SIL %s +// RUN: %target-swift-frontend -emit-silgen -I %S/../IDE/Inputs/custom-modules %s 2>&1 | %FileCheck --check-prefix=SIL %s // REQUIRES: objc_interop import ImportAsMember.A import ImportAsMember.Class diff --git a/test/SILGen/imported_struct_array_field.swift b/test/SILGen/imported_struct_array_field.swift index 05422f73bbf..7e78dc1e900 100644 --- a/test/SILGen/imported_struct_array_field.swift +++ b/test/SILGen/imported_struct_array_field.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen -import-objc-header %S/Inputs/array_typedef.h %s | %FileCheck %s +// RUN: %target-swift-frontend -emit-silgen -import-objc-header %S/Inputs/array_typedef.h %s | %FileCheck %s // CHECK-LABEL: sil shared [transparent] [fragile] @_T0SC4NameV{{[_0-9a-zA-Z]*}}fC : $@convention(method) (UInt8, UInt8, UInt8, UInt8, @thin Name.Type) -> Name func useImportedArrayTypedefInit() -> Name { diff --git a/test/SILGen/indirect_enum.swift b/test/SILGen/indirect_enum.swift index 9927e3becf3..4f5262d578d 100644 --- a/test/SILGen/indirect_enum.swift +++ b/test/SILGen/indirect_enum.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen %s | %FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s indirect enum TreeA { case Nil diff --git a/test/SILGen/inherited_protocol_conformance_multi_file_2.swift b/test/SILGen/inherited_protocol_conformance_multi_file_2.swift index b1d54f38556..f95b218d478 100644 --- a/test/SILGen/inherited_protocol_conformance_multi_file_2.swift +++ b/test/SILGen/inherited_protocol_conformance_multi_file_2.swift @@ -1,46 +1,46 @@ // -- Try all the permutations of file order possible. // Abc -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen -primary-file %s %S/Inputs/inherited_protocol_conformance_other_file_2_b.swift %S/Inputs/inherited_protocol_conformance_other_file_2_c.swift -module-name main | %FileCheck %s --check-prefix=FILE_A +// RUN: %target-swift-frontend -emit-silgen -primary-file %s %S/Inputs/inherited_protocol_conformance_other_file_2_b.swift %S/Inputs/inherited_protocol_conformance_other_file_2_c.swift -module-name main | %FileCheck %s --check-prefix=FILE_A // aBc -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen %s -primary-file %S/Inputs/inherited_protocol_conformance_other_file_2_b.swift %S/Inputs/inherited_protocol_conformance_other_file_2_c.swift -module-name main | %FileCheck %s --check-prefix=FILE_B +// RUN: %target-swift-frontend -emit-silgen %s -primary-file %S/Inputs/inherited_protocol_conformance_other_file_2_b.swift %S/Inputs/inherited_protocol_conformance_other_file_2_c.swift -module-name main | %FileCheck %s --check-prefix=FILE_B // abC -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen %s %S/Inputs/inherited_protocol_conformance_other_file_2_b.swift -primary-file %S/Inputs/inherited_protocol_conformance_other_file_2_c.swift -module-name main | %FileCheck %s --check-prefix=FILE_C +// RUN: %target-swift-frontend -emit-silgen %s %S/Inputs/inherited_protocol_conformance_other_file_2_b.swift -primary-file %S/Inputs/inherited_protocol_conformance_other_file_2_c.swift -module-name main | %FileCheck %s --check-prefix=FILE_C // Bac -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen -primary-file %S/Inputs/inherited_protocol_conformance_other_file_2_b.swift %s %S/Inputs/inherited_protocol_conformance_other_file_2_c.swift -module-name main | %FileCheck %s --check-prefix=FILE_B +// RUN: %target-swift-frontend -emit-silgen -primary-file %S/Inputs/inherited_protocol_conformance_other_file_2_b.swift %s %S/Inputs/inherited_protocol_conformance_other_file_2_c.swift -module-name main | %FileCheck %s --check-prefix=FILE_B // bAc -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen %S/Inputs/inherited_protocol_conformance_other_file_2_b.swift -primary-file %s %S/Inputs/inherited_protocol_conformance_other_file_2_c.swift -module-name main | %FileCheck %s --check-prefix=FILE_A +// RUN: %target-swift-frontend -emit-silgen %S/Inputs/inherited_protocol_conformance_other_file_2_b.swift -primary-file %s %S/Inputs/inherited_protocol_conformance_other_file_2_c.swift -module-name main | %FileCheck %s --check-prefix=FILE_A // baC -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen %S/Inputs/inherited_protocol_conformance_other_file_2_b.swift %s -primary-file %S/Inputs/inherited_protocol_conformance_other_file_2_c.swift -module-name main | %FileCheck %s --check-prefix=FILE_C +// RUN: %target-swift-frontend -emit-silgen %S/Inputs/inherited_protocol_conformance_other_file_2_b.swift %s -primary-file %S/Inputs/inherited_protocol_conformance_other_file_2_c.swift -module-name main | %FileCheck %s --check-prefix=FILE_C // OS X 10.9 -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen -primary-file %S/Inputs/inherited_protocol_conformance_other_file_2_c.swift %s %S/Inputs/inherited_protocol_conformance_other_file_2_b.swift -module-name main | %FileCheck %s --check-prefix=FILE_C +// RUN: %target-swift-frontend -emit-silgen -primary-file %S/Inputs/inherited_protocol_conformance_other_file_2_c.swift %s %S/Inputs/inherited_protocol_conformance_other_file_2_b.swift -module-name main | %FileCheck %s --check-prefix=FILE_C // cAb -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen %S/Inputs/inherited_protocol_conformance_other_file_2_c.swift -primary-file %s %S/Inputs/inherited_protocol_conformance_other_file_2_b.swift -module-name main | %FileCheck %s --check-prefix=FILE_A +// RUN: %target-swift-frontend -emit-silgen %S/Inputs/inherited_protocol_conformance_other_file_2_c.swift -primary-file %s %S/Inputs/inherited_protocol_conformance_other_file_2_b.swift -module-name main | %FileCheck %s --check-prefix=FILE_A // caB -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen %S/Inputs/inherited_protocol_conformance_other_file_2_c.swift %s -primary-file %S/Inputs/inherited_protocol_conformance_other_file_2_b.swift -module-name main | %FileCheck %s --check-prefix=FILE_B +// RUN: %target-swift-frontend -emit-silgen %S/Inputs/inherited_protocol_conformance_other_file_2_c.swift %s -primary-file %S/Inputs/inherited_protocol_conformance_other_file_2_b.swift -module-name main | %FileCheck %s --check-prefix=FILE_B // Acb -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen -primary-file %s %S/Inputs/inherited_protocol_conformance_other_file_2_c.swift %S/Inputs/inherited_protocol_conformance_other_file_2_b.swift -module-name main | %FileCheck %s --check-prefix=FILE_A +// RUN: %target-swift-frontend -emit-silgen -primary-file %s %S/Inputs/inherited_protocol_conformance_other_file_2_c.swift %S/Inputs/inherited_protocol_conformance_other_file_2_b.swift -module-name main | %FileCheck %s --check-prefix=FILE_A // aCb -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen %s -primary-file %S/Inputs/inherited_protocol_conformance_other_file_2_c.swift %S/Inputs/inherited_protocol_conformance_other_file_2_b.swift -module-name main | %FileCheck %s --check-prefix=FILE_C +// RUN: %target-swift-frontend -emit-silgen %s -primary-file %S/Inputs/inherited_protocol_conformance_other_file_2_c.swift %S/Inputs/inherited_protocol_conformance_other_file_2_b.swift -module-name main | %FileCheck %s --check-prefix=FILE_C // abC -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen %s %S/Inputs/inherited_protocol_conformance_other_file_2_c.swift -primary-file %S/Inputs/inherited_protocol_conformance_other_file_2_b.swift -module-name main | %FileCheck %s --check-prefix=FILE_B +// RUN: %target-swift-frontend -emit-silgen %s %S/Inputs/inherited_protocol_conformance_other_file_2_c.swift -primary-file %S/Inputs/inherited_protocol_conformance_other_file_2_b.swift -module-name main | %FileCheck %s --check-prefix=FILE_B // Bca -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen -primary-file %S/Inputs/inherited_protocol_conformance_other_file_2_b.swift %S/Inputs/inherited_protocol_conformance_other_file_2_c.swift %s -module-name main | %FileCheck %s --check-prefix=FILE_B +// RUN: %target-swift-frontend -emit-silgen -primary-file %S/Inputs/inherited_protocol_conformance_other_file_2_b.swift %S/Inputs/inherited_protocol_conformance_other_file_2_c.swift %s -module-name main | %FileCheck %s --check-prefix=FILE_B // bCa -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen %S/Inputs/inherited_protocol_conformance_other_file_2_b.swift -primary-file %S/Inputs/inherited_protocol_conformance_other_file_2_c.swift %s -module-name main | %FileCheck %s --check-prefix=FILE_C +// RUN: %target-swift-frontend -emit-silgen %S/Inputs/inherited_protocol_conformance_other_file_2_b.swift -primary-file %S/Inputs/inherited_protocol_conformance_other_file_2_c.swift %s -module-name main | %FileCheck %s --check-prefix=FILE_C // bcA -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen %S/Inputs/inherited_protocol_conformance_other_file_2_b.swift %S/Inputs/inherited_protocol_conformance_other_file_2_c.swift -primary-file %s -module-name main | %FileCheck %s --check-prefix=FILE_A +// RUN: %target-swift-frontend -emit-silgen %S/Inputs/inherited_protocol_conformance_other_file_2_b.swift %S/Inputs/inherited_protocol_conformance_other_file_2_c.swift -primary-file %s -module-name main | %FileCheck %s --check-prefix=FILE_A // Cba -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen -primary-file %S/Inputs/inherited_protocol_conformance_other_file_2_c.swift %S/Inputs/inherited_protocol_conformance_other_file_2_b.swift %s -module-name main | %FileCheck %s --check-prefix=FILE_C +// RUN: %target-swift-frontend -emit-silgen -primary-file %S/Inputs/inherited_protocol_conformance_other_file_2_c.swift %S/Inputs/inherited_protocol_conformance_other_file_2_b.swift %s -module-name main | %FileCheck %s --check-prefix=FILE_C // cBa -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen %S/Inputs/inherited_protocol_conformance_other_file_2_c.swift -primary-file %S/Inputs/inherited_protocol_conformance_other_file_2_b.swift %s -module-name main | %FileCheck %s --check-prefix=FILE_B +// RUN: %target-swift-frontend -emit-silgen %S/Inputs/inherited_protocol_conformance_other_file_2_c.swift -primary-file %S/Inputs/inherited_protocol_conformance_other_file_2_b.swift %s -module-name main | %FileCheck %s --check-prefix=FILE_B // cbA -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen %S/Inputs/inherited_protocol_conformance_other_file_2_c.swift %S/Inputs/inherited_protocol_conformance_other_file_2_b.swift -primary-file %s -module-name main | %FileCheck %s --check-prefix=FILE_A +// RUN: %target-swift-frontend -emit-silgen %S/Inputs/inherited_protocol_conformance_other_file_2_c.swift %S/Inputs/inherited_protocol_conformance_other_file_2_b.swift -primary-file %s -module-name main | %FileCheck %s --check-prefix=FILE_A // FILE_A-NOT: sil [transparent] [thunk] @_T04main5ThingVs9EquatableAAsADP2eeoi{{[_0-9a-zA-Z]*}}FZTW // FILE_A-NOT: sil [transparent] [thunk] @_T04main5ThingVs8HashableAAsADP9hashValueSifgTW diff --git a/test/SILGen/init_ref_delegation.swift b/test/SILGen/init_ref_delegation.swift index 755a6d144dd..975581f2e64 100644 --- a/test/SILGen/init_ref_delegation.swift +++ b/test/SILGen/init_ref_delegation.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen %s -disable-objc-attr-requires-foundation-module | %FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s -disable-objc-attr-requires-foundation-module | %FileCheck %s struct X { } diff --git a/test/SILGen/initializers.swift b/test/SILGen/initializers.swift index 846e516d962..20ea76e38ca 100644 --- a/test/SILGen/initializers.swift +++ b/test/SILGen/initializers.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen -disable-objc-attr-requires-foundation-module %s -module-name failable_initializers | %FileCheck %s +// RUN: %target-swift-frontend -emit-silgen -disable-objc-attr-requires-foundation-module %s -module-name failable_initializers | %FileCheck %s // High-level tests that silgen properly emits code for failable and thorwing // initializers. diff --git a/test/SILGen/inlineable_attribute.swift b/test/SILGen/inlineable_attribute.swift index 9183b50a853..adf03f8ff6f 100644 --- a/test/SILGen/inlineable_attribute.swift +++ b/test/SILGen/inlineable_attribute.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen -emit-verbose-sil %s | %FileCheck %s +// RUN: %target-swift-frontend -emit-silgen -emit-verbose-sil %s | %FileCheck %s // CHECK-LABEL: sil [fragile] @_T020inlineable_attribute15fragileFunctionyyF : $@convention(thin) () -> () @_inlineable public func fragileFunction() { diff --git a/test/SILGen/interface_type_mangling.swift b/test/SILGen/interface_type_mangling.swift index 7d5aced7c49..d1b0cdbf9b5 100644 --- a/test/SILGen/interface_type_mangling.swift +++ b/test/SILGen/interface_type_mangling.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -Xllvm -sil-full-demangle %s -emit-silgen | %FileCheck %s +// RUN: %target-swift-frontend -Xllvm -sil-full-demangle %s -emit-silgen | %FileCheck %s protocol P { associatedtype Assoc1 diff --git a/test/SILGen/ivar_destroyer.swift b/test/SILGen/ivar_destroyer.swift index 2221736f3e1..41c95a42f16 100644 --- a/test/SILGen/ivar_destroyer.swift +++ b/test/SILGen/ivar_destroyer.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -parse-as-library -emit-silgen %s | %FileCheck %s +// RUN: %target-swift-frontend -parse-as-library -emit-silgen %s | %FileCheck %s // Only derived classes with non-trivial ivars need an ivar destroyer. diff --git a/test/SILGen/lazy_global_access.swift b/test/SILGen/lazy_global_access.swift index e4a6cc168a5..93756e7a884 100644 --- a/test/SILGen/lazy_global_access.swift +++ b/test/SILGen/lazy_global_access.swift @@ -1,5 +1,5 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen %s | %FileCheck %s -check-prefix=MAIN -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -parse-as-library -emit-silgen %s | %FileCheck %s -check-prefix=LIBRARY +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s -check-prefix=MAIN +// RUN: %target-swift-frontend -parse-as-library -emit-silgen %s | %FileCheck %s -check-prefix=LIBRARY // The following code is valid as a library or as a main source file. Script // variables should be accessed directly, whereas library global variables diff --git a/test/SILGen/lazy_globals.swift b/test/SILGen/lazy_globals.swift index 053624967b2..a1678ebf175 100644 --- a/test/SILGen/lazy_globals.swift +++ b/test/SILGen/lazy_globals.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -parse-as-library -emit-silgen %s | %FileCheck %s +// RUN: %target-swift-frontend -parse-as-library -emit-silgen %s | %FileCheck %s // CHECK: sil private @globalinit_[[T:.*]]_func0 : $@convention(thin) () -> () { // CHECK: alloc_global @_T012lazy_globals1xSiv diff --git a/test/SILGen/lazy_globals_multiple_vars.swift b/test/SILGen/lazy_globals_multiple_vars.swift index e18873e049e..061e50ed5a0 100644 --- a/test/SILGen/lazy_globals_multiple_vars.swift +++ b/test/SILGen/lazy_globals_multiple_vars.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -parse-as-library -emit-silgen %s | %FileCheck %s +// RUN: %target-swift-frontend -parse-as-library -emit-silgen %s | %FileCheck %s // CHECK: sil private [[INIT_A_B:@globalinit_.*]] : // CHECK: alloc_global @_T026lazy_globals_multiple_vars1aSiv diff --git a/test/SILGen/let_decls.swift b/test/SILGen/let_decls.swift index 6c40fb23494..fe4f6231b8d 100644 --- a/test/SILGen/let_decls.swift +++ b/test/SILGen/let_decls.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -Xllvm -sil-full-demangle -emit-silgen %s | %FileCheck %s +// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -emit-silgen %s | %FileCheck %s func takeClosure(_ a : () -> Int) {} diff --git a/test/SILGen/lifetime.swift b/test/SILGen/lifetime.swift index 6eff46f353c..8314ce0ed3e 100644 --- a/test/SILGen/lifetime.swift +++ b/test/SILGen/lifetime.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -Xllvm -sil-full-demangle -parse-as-library -emit-silgen -primary-file %s | %FileCheck %s +// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -parse-as-library -emit-silgen -primary-file %s | %FileCheck %s struct Buh { var x: Int { diff --git a/test/SILGen/lifetime_unions.swift b/test/SILGen/lifetime_unions.swift index 5016db2e68a..1cdf86117ee 100644 --- a/test/SILGen/lifetime_unions.swift +++ b/test/SILGen/lifetime_unions.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -parse-as-library -emit-silgen %s | %FileCheck %s +// RUN: %target-swift-frontend -parse-as-library -emit-silgen %s | %FileCheck %s enum TrivialUnion { case Foo diff --git a/test/SILGen/local_captures.swift b/test/SILGen/local_captures.swift index 6338cf6832e..f1bf4a1bd08 100644 --- a/test/SILGen/local_captures.swift +++ b/test/SILGen/local_captures.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -parse-as-library -emit-silgen %s | %FileCheck %s +// RUN: %target-swift-frontend -parse-as-library -emit-silgen %s | %FileCheck %s // Check that we don't crash if a local function references another local // function without captures. diff --git a/test/SILGen/local_recursion.swift b/test/SILGen/local_recursion.swift index ca7da7d3f1d..756010e135e 100644 --- a/test/SILGen/local_recursion.swift +++ b/test/SILGen/local_recursion.swift @@ -1,5 +1,5 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -parse-as-library -emit-silgen %s | %FileCheck %s -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -enable-astscope-lookup -parse-as-library -emit-silgen %s | %FileCheck %s +// RUN: %target-swift-frontend -parse-as-library -emit-silgen %s | %FileCheck %s +// RUN: %target-swift-frontend -enable-astscope-lookup -parse-as-library -emit-silgen %s | %FileCheck %s // CHECK-LABEL: sil hidden @_T015local_recursionAAySi_Si1ytF : $@convention(thin) (Int, Int) -> () { // CHECK: bb0([[X:%0]] : $Int, [[Y:%1]] : $Int): diff --git a/test/SILGen/lying_about_optional_return.swift b/test/SILGen/lying_about_optional_return.swift index 8b48d2a3c86..fa8198d2924 100644 --- a/test/SILGen/lying_about_optional_return.swift +++ b/test/SILGen/lying_about_optional_return.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -import-objc-header %S/Inputs/c_function_pointer_in_c_struct.h -emit-silgen %s | %FileCheck %s +// RUN: %target-swift-frontend -import-objc-header %S/Inputs/c_function_pointer_in_c_struct.h -emit-silgen %s | %FileCheck %s // CHECK-LABEL: sil hidden @_T027lying_about_optional_return0C37ChainingForeignFunctionTypeProperties{{[_0-9a-zA-Z]*}}F func optionalChainingForeignFunctionTypeProperties(a: SomeCallbacks?) { diff --git a/test/SILGen/lying_about_optional_return_objc.swift b/test/SILGen/lying_about_optional_return_objc.swift index fd23f428ffd..4b2d1f39ef3 100644 --- a/test/SILGen/lying_about_optional_return_objc.swift +++ b/test/SILGen/lying_about_optional_return_objc.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -Xllvm -new-mangling-for-tests -import-objc-header %S/Inputs/block_property_in_objc_class.h -emit-silgen %s | %FileCheck %s +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -import-objc-header %S/Inputs/block_property_in_objc_class.h -emit-silgen %s | %FileCheck %s // REQUIRES: objc_interop // CHECK-LABEL: sil hidden @_T032lying_about_optional_return_objc0C37ChainingForeignFunctionTypeProperties{{[_0-9a-zA-Z]*}}F diff --git a/test/SILGen/mangling.swift b/test/SILGen/mangling.swift index 97d8153b50a..c065206feb6 100644 --- a/test/SILGen/mangling.swift +++ b/test/SILGen/mangling.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -Xllvm -sil-full-demangle -sdk %S/Inputs -I %S/Inputs -enable-source-import %s -emit-silgen | %FileCheck %s +// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -sdk %S/Inputs -I %S/Inputs -enable-source-import %s -emit-silgen | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/SILGen/mangling_ext_structA.swift b/test/SILGen/mangling_ext_structA.swift index 1079e5bcf3a..7f3dd131dfe 100644 --- a/test/SILGen/mangling_ext_structA.swift +++ b/test/SILGen/mangling_ext_structA.swift @@ -1,7 +1,7 @@ // RUN: rm -rf %t // RUN: mkdir -p %t // RUN: %target-swift-frontend -emit-module -o %t %S/Inputs/def_structA.swift -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen -module-name ext_structA -I %t %s | %FileCheck %s +// RUN: %target-swift-frontend -emit-silgen -module-name ext_structA -I %t %s | %FileCheck %s // Ensure that members of extensions of types from another module are mangled // correctly. diff --git a/test/SILGen/mangling_generic_extensions.swift b/test/SILGen/mangling_generic_extensions.swift index 0da19ef51ba..f19ac2faf48 100644 --- a/test/SILGen/mangling_generic_extensions.swift +++ b/test/SILGen/mangling_generic_extensions.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen %s | %FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s struct Foo { } diff --git a/test/SILGen/mangling_private.swift b/test/SILGen/mangling_private.swift index ccf8e7da441..aa789045039 100644 --- a/test/SILGen/mangling_private.swift +++ b/test/SILGen/mangling_private.swift @@ -1,14 +1,14 @@ // RUN: rm -rf %t && mkdir -p %t // RUN: %target-swift-frontend -emit-module -o %t %S/Inputs/mangling_private_helper.swift -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen %S/Inputs/mangling_private_helper.swift | %FileCheck %s -check-prefix=CHECK-BASE +// RUN: %target-swift-frontend -emit-silgen %S/Inputs/mangling_private_helper.swift | %FileCheck %s -check-prefix=CHECK-BASE -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests %s -I %t -emit-silgen | %FileCheck %s +// RUN: %target-swift-frontend %s -I %t -emit-silgen | %FileCheck %s // RUN: cp %s %t -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests %t/mangling_private.swift -I %t -emit-silgen | %FileCheck %s +// RUN: %target-swift-frontend %t/mangling_private.swift -I %t -emit-silgen | %FileCheck %s // RUN: cp %s %t/other_name.swift -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests %t/other_name.swift -I %t -emit-silgen -module-name mangling_private | %FileCheck %s -check-prefix=OTHER-NAME +// RUN: %target-swift-frontend %t/other_name.swift -I %t -emit-silgen -module-name mangling_private | %FileCheck %s -check-prefix=OTHER-NAME import mangling_private_helper diff --git a/test/SILGen/materializeForSet.swift b/test/SILGen/materializeForSet.swift index 42f1585e3df..f3125d2bd31 100644 --- a/test/SILGen/materializeForSet.swift +++ b/test/SILGen/materializeForSet.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen %s | %FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s class Base { var stored: Int = 0 diff --git a/test/SILGen/metatype_casts.swift b/test/SILGen/metatype_casts.swift index 845185c4ed0..89af4d24efa 100644 --- a/test/SILGen/metatype_casts.swift +++ b/test/SILGen/metatype_casts.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen %s | %FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s // CHECK-LABEL: sil hidden @_T014metatype_casts6t_is_u{{[_0-9a-zA-Z]*}}F // CHECK: checked_cast_br {{.*}} $@thick T.Type to $@thick U.Type diff --git a/test/SILGen/metatype_object_conversion.swift b/test/SILGen/metatype_object_conversion.swift index 6b54024e927..3f6eb8f03b8 100644 --- a/test/SILGen/metatype_object_conversion.swift +++ b/test/SILGen/metatype_object_conversion.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen -sdk %S/Inputs -I %S/Inputs -enable-source-import %s | %FileCheck %s +// RUN: %target-swift-frontend -emit-silgen -sdk %S/Inputs -I %S/Inputs -enable-source-import %s | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/SILGen/metatypes.swift b/test/SILGen/metatypes.swift index 95cb2ef0a40..ed49b60e06b 100644 --- a/test/SILGen/metatypes.swift +++ b/test/SILGen/metatypes.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -parse-stdlib -emit-silgen %s | %FileCheck %s +// RUN: %target-swift-frontend -parse-stdlib -emit-silgen %s | %FileCheck %s import Swift diff --git a/test/SILGen/multi_file.swift b/test/SILGen/multi_file.swift index b5168b5a241..6e62e41df75 100644 --- a/test/SILGen/multi_file.swift +++ b/test/SILGen/multi_file.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen -primary-file %s %S/Inputs/multi_file_helper.swift | %FileCheck %s +// RUN: %target-swift-frontend -emit-silgen -primary-file %s %S/Inputs/multi_file_helper.swift | %FileCheck %s func markUsed(_ t: T) {} diff --git a/test/SILGen/nested-function-fragility.swift b/test/SILGen/nested-function-fragility.swift index d161e39fd06..94aef04a191 100644 --- a/test/SILGen/nested-function-fragility.swift +++ b/test/SILGen/nested-function-fragility.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen -module-name main %s | %FileCheck %s +// RUN: %target-swift-frontend -emit-silgen -module-name main %s | %FileCheck %s internal func internalFunc() {} // CHECK-LABEL: sil @_T04main3fooyyF diff --git a/test/SILGen/nested_generics.swift b/test/SILGen/nested_generics.swift index 911fffa9029..b56b1ad7200 100644 --- a/test/SILGen/nested_generics.swift +++ b/test/SILGen/nested_generics.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -Xllvm -sil-full-demangle -emit-silgen -parse-as-library %s | %FileCheck %s +// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -emit-silgen -parse-as-library %s | %FileCheck %s // RUN: %target-swift-frontend -Xllvm -sil-full-demangle -emit-sil -parse-as-library %s > /dev/null // RUN: %target-swift-frontend -Xllvm -sil-full-demangle -emit-sil -O -parse-as-library %s > /dev/null // RUN: %target-swift-frontend -Xllvm -sil-full-demangle -emit-ir -parse-as-library %s > /dev/null diff --git a/test/SILGen/nested_types_referencing_nested_functions.swift b/test/SILGen/nested_types_referencing_nested_functions.swift index 1e9c1542397..cc13137b54e 100644 --- a/test/SILGen/nested_types_referencing_nested_functions.swift +++ b/test/SILGen/nested_types_referencing_nested_functions.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen %s | %FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s do { func foo() { bar(2) } diff --git a/test/SILGen/newtype.swift b/test/SILGen/newtype.swift index f94d00bc8be..4b8e6d8c724 100644 --- a/test/SILGen/newtype.swift +++ b/test/SILGen/newtype.swift @@ -1,6 +1,6 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen -sdk %S/Inputs -I %S/Inputs -enable-source-import %s | %FileCheck %s -check-prefix=CHECK-RAW +// RUN: %target-swift-frontend -emit-silgen -sdk %S/Inputs -I %S/Inputs -enable-source-import %s | %FileCheck %s -check-prefix=CHECK-RAW -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-sil -sdk %S/Inputs -I %S/Inputs -enable-source-import %s | %FileCheck %s -check-prefix=CHECK-CANONICAL +// RUN: %target-swift-frontend -emit-sil -sdk %S/Inputs -I %S/Inputs -enable-source-import %s | %FileCheck %s -check-prefix=CHECK-CANONICAL // REQUIRES: objc_interop diff --git a/test/SILGen/noescape_reabstraction.swift b/test/SILGen/noescape_reabstraction.swift index de128d84d84..dba6678cd40 100644 --- a/test/SILGen/noescape_reabstraction.swift +++ b/test/SILGen/noescape_reabstraction.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen %s | %FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s struct S {} diff --git a/test/SILGen/nsmanaged-witness.swift b/test/SILGen/nsmanaged-witness.swift index b6b053a6007..0e6de8dc313 100644 --- a/test/SILGen/nsmanaged-witness.swift +++ b/test/SILGen/nsmanaged-witness.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -sdk %S/Inputs %s -I %S/Inputs -enable-source-import -emit-silgen | %FileCheck %s +// RUN: %target-swift-frontend -sdk %S/Inputs %s -I %S/Inputs -enable-source-import -emit-silgen | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/SILGen/objc_attr_NSManaged.swift b/test/SILGen/objc_attr_NSManaged.swift index 0a2290bdd8a..db01a30bf7e 100644 --- a/test/SILGen/objc_attr_NSManaged.swift +++ b/test/SILGen/objc_attr_NSManaged.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -sdk %S/Inputs %s -I %S/Inputs -enable-source-import -emit-silgen | %FileCheck %s +// RUN: %target-swift-frontend -sdk %S/Inputs %s -I %S/Inputs -enable-source-import -emit-silgen | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/SILGen/objc_attr_NSManaged_multi.swift b/test/SILGen/objc_attr_NSManaged_multi.swift index 05396766461..c70c3fcc470 100644 --- a/test/SILGen/objc_attr_NSManaged_multi.swift +++ b/test/SILGen/objc_attr_NSManaged_multi.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -sdk %S/Inputs -primary-file %s %S/objc_attr_NSManaged.swift -I %S/Inputs -enable-source-import -emit-silgen | %FileCheck %s +// RUN: %target-swift-frontend -sdk %S/Inputs -primary-file %s %S/objc_attr_NSManaged.swift -I %S/Inputs -enable-source-import -emit-silgen | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/SILGen/objc_blocks_bridging.swift b/test/SILGen/objc_blocks_bridging.swift index f677a9799e0..d59b8a6ab56 100644 --- a/test/SILGen/objc_blocks_bridging.swift +++ b/test/SILGen/objc_blocks_bridging.swift @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir -p %t // RUN: %build-silgen-test-overlays -// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -Xllvm -new-mangling-for-tests -verify -emit-silgen -I %S/Inputs -disable-objc-attr-requires-foundation-module %s | %FileCheck %s +// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -verify -emit-silgen -I %S/Inputs -disable-objc-attr-requires-foundation-module %s | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/SILGen/objc_bridged_results.swift b/test/SILGen/objc_bridged_results.swift index 345a91b8a8c..dabb3c88b47 100644 --- a/test/SILGen/objc_bridged_results.swift +++ b/test/SILGen/objc_bridged_results.swift @@ -1,7 +1,7 @@ // RUN: rm -rf %t && mkdir -p %t // RUN: %build-silgen-test-overlays -// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -Xllvm -new-mangling-for-tests -emit-silgen %s -import-objc-header %S/Inputs/objc_bridged_results.h | %FileCheck %s +// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -emit-silgen %s -import-objc-header %S/Inputs/objc_bridged_results.h | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/SILGen/objc_bridged_using_protocol_extension_impl.swift b/test/SILGen/objc_bridged_using_protocol_extension_impl.swift index 1caa6bfb080..53172a85ba5 100644 --- a/test/SILGen/objc_bridged_using_protocol_extension_impl.swift +++ b/test/SILGen/objc_bridged_using_protocol_extension_impl.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -Xllvm -new-mangling-for-tests -emit-silgen %s | %FileCheck %s +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -emit-silgen %s | %FileCheck %s // REQUIRES: objc_interop import Foundation diff --git a/test/SILGen/objc_currying.swift b/test/SILGen/objc_currying.swift index 8923e022334..83568d227cb 100644 --- a/test/SILGen/objc_currying.swift +++ b/test/SILGen/objc_currying.swift @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir -p %t // RUN: %build-silgen-test-overlays -// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -Xllvm -new-mangling-for-tests -emit-silgen %s | %FileCheck %s +// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -emit-silgen %s | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/SILGen/objc_dealloc.swift b/test/SILGen/objc_dealloc.swift index e6b156f75ff..3062ed266c0 100644 --- a/test/SILGen/objc_dealloc.swift +++ b/test/SILGen/objc_dealloc.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -sdk %S/Inputs -I %S/Inputs -enable-source-import %s -emit-silgen | %FileCheck %s +// RUN: %target-swift-frontend -sdk %S/Inputs -I %S/Inputs -enable-source-import %s -emit-silgen | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/SILGen/objc_dictionary_bridging.swift b/test/SILGen/objc_dictionary_bridging.swift index e7375ddf5dc..ee7e2b82de7 100644 --- a/test/SILGen/objc_dictionary_bridging.swift +++ b/test/SILGen/objc_dictionary_bridging.swift @@ -1,7 +1,7 @@ // RUN: rm -rf %t && mkdir -p %t // RUN: %build-silgen-test-overlays -// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -Xllvm -new-mangling-for-tests -emit-silgen %s | %FileCheck %s +// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -emit-silgen %s | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/SILGen/objc_enum.swift b/test/SILGen/objc_enum.swift index 2ab48fc3f40..01e867b05ec 100644 --- a/test/SILGen/objc_enum.swift +++ b/test/SILGen/objc_enum.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -sdk %S/Inputs -I %S/Inputs -enable-source-import %s -emit-silgen > %t.out +// RUN: %target-swift-frontend -sdk %S/Inputs -I %S/Inputs -enable-source-import %s -emit-silgen > %t.out // RUN: %FileCheck -check-prefix=CHECK -check-prefix=CHECK-%target-ptrsize %s < %t.out // RUN: %FileCheck -check-prefix=NEGATIVE %s < %t.out diff --git a/test/SILGen/objc_error.swift b/test/SILGen/objc_error.swift index 95c235ac1d5..513dec8f980 100644 --- a/test/SILGen/objc_error.swift +++ b/test/SILGen/objc_error.swift @@ -1,7 +1,7 @@ // RUN: rm -rf %t && mkdir -p %t // RUN: %build-clang-importer-objc-overlays -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk-nosource -I %t) -Xllvm -new-mangling-for-tests -emit-silgen %s | %FileCheck %s +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk-nosource -I %t) -emit-silgen %s | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/SILGen/objc_extensions.swift b/test/SILGen/objc_extensions.swift index 78b798cbfd0..2db53b98ca5 100644 --- a/test/SILGen/objc_extensions.swift +++ b/test/SILGen/objc_extensions.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen -sdk %S/Inputs/ -I %S/Inputs -enable-source-import %s | %FileCheck %s +// RUN: %target-swift-frontend -emit-silgen -sdk %S/Inputs/ -I %S/Inputs -enable-source-import %s | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/SILGen/objc_final.swift b/test/SILGen/objc_final.swift index 636e8fd92eb..f5a6ac1dbc8 100644 --- a/test/SILGen/objc_final.swift +++ b/test/SILGen/objc_final.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -sdk %S/Inputs -I %S/Inputs -enable-source-import %s -emit-silgen -emit-verbose-sil | %FileCheck %s +// RUN: %target-swift-frontend -sdk %S/Inputs -I %S/Inputs -enable-source-import %s -emit-silgen -emit-verbose-sil | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/SILGen/objc_generic_class.swift b/test/SILGen/objc_generic_class.swift index 1493d9b753b..5045fa0dc45 100644 --- a/test/SILGen/objc_generic_class.swift +++ b/test/SILGen/objc_generic_class.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -sdk %S/Inputs -I %S/Inputs -enable-source-import %s -emit-silgen | %FileCheck %s +// RUN: %target-swift-frontend -sdk %S/Inputs -I %S/Inputs -enable-source-import %s -emit-silgen | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/SILGen/objc_implicitly_unwrapped_optional.swift b/test/SILGen/objc_implicitly_unwrapped_optional.swift index af8942fc986..9b7f7e82dae 100644 --- a/test/SILGen/objc_implicitly_unwrapped_optional.swift +++ b/test/SILGen/objc_implicitly_unwrapped_optional.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -Xllvm -new-mangling-for-tests -emit-sil -assert-config Release %s | %FileCheck %s +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -emit-sil -assert-config Release %s | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/SILGen/objc_imported_init.swift b/test/SILGen/objc_imported_init.swift index 068dd73086f..f7203bcfbe5 100644 --- a/test/SILGen/objc_imported_init.swift +++ b/test/SILGen/objc_imported_init.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -verify -emit-silgen -sdk %S/Inputs -I %S/Inputs -enable-source-import %s | %FileCheck %s +// RUN: %target-swift-frontend -verify -emit-silgen -sdk %S/Inputs -I %S/Inputs -enable-source-import %s | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/SILGen/objc_init_ref_delegation.swift b/test/SILGen/objc_init_ref_delegation.swift index 2765e1b8c2c..d7456da2461 100644 --- a/test/SILGen/objc_init_ref_delegation.swift +++ b/test/SILGen/objc_init_ref_delegation.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -sdk %S/Inputs -I %S/Inputs -enable-source-import %s -emit-silgen | %FileCheck %s +// RUN: %target-swift-frontend -sdk %S/Inputs -I %S/Inputs -enable-source-import %s -emit-silgen | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/SILGen/objc_keypath.swift b/test/SILGen/objc_keypath.swift index b0b45d7dbb4..59a6a39b146 100644 --- a/test/SILGen/objc_keypath.swift +++ b/test/SILGen/objc_keypath.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-sil -sdk %S/Inputs -I %S/Inputs -enable-source-import %s | %FileCheck %s +// RUN: %target-swift-frontend -emit-sil -sdk %S/Inputs -I %S/Inputs -enable-source-import %s | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/SILGen/objc_local.swift b/test/SILGen/objc_local.swift index e304c74f1a1..10988b65987 100644 --- a/test/SILGen/objc_local.swift +++ b/test/SILGen/objc_local.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen -sdk %S/Inputs -I %S/Inputs -enable-source-import %s | %FileCheck %s +// RUN: %target-swift-frontend -emit-silgen -sdk %S/Inputs -I %S/Inputs -enable-source-import %s | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/SILGen/objc_metatypes.swift b/test/SILGen/objc_metatypes.swift index 258e53eb854..59763cf6296 100644 --- a/test/SILGen/objc_metatypes.swift +++ b/test/SILGen/objc_metatypes.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -sdk %S/Inputs -I %S/Inputs -enable-source-import %s -emit-silgen -disable-objc-attr-requires-foundation-module | %FileCheck %s +// RUN: %target-swift-frontend -sdk %S/Inputs -I %S/Inputs -enable-source-import %s -emit-silgen -disable-objc-attr-requires-foundation-module | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/SILGen/objc_ownership_conventions.swift b/test/SILGen/objc_ownership_conventions.swift index 59fbde2e88b..ddd3ba741f3 100644 --- a/test/SILGen/objc_ownership_conventions.swift +++ b/test/SILGen/objc_ownership_conventions.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -sdk %S/Inputs -I %S/Inputs -enable-source-import %s -emit-silgen | %FileCheck %s +// RUN: %target-swift-frontend -sdk %S/Inputs -I %S/Inputs -enable-source-import %s -emit-silgen | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/SILGen/objc_properties.swift b/test/SILGen/objc_properties.swift index f7b7835ef80..54787ad2bcb 100644 --- a/test/SILGen/objc_properties.swift +++ b/test/SILGen/objc_properties.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests %s -emit-silgen -emit-verbose-sil -sdk %S/Inputs -I %S/Inputs -enable-source-import | %FileCheck %s +// RUN: %target-swift-frontend %s -emit-silgen -emit-verbose-sil -sdk %S/Inputs -I %S/Inputs -enable-source-import | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/SILGen/objc_protocols.swift b/test/SILGen/objc_protocols.swift index a654e171e4c..7999fb35fec 100644 --- a/test/SILGen/objc_protocols.swift +++ b/test/SILGen/objc_protocols.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -sdk %S/Inputs -I %S/Inputs -enable-source-import %s -emit-silgen -disable-objc-attr-requires-foundation-module | %FileCheck %s +// RUN: %target-swift-frontend -sdk %S/Inputs -I %S/Inputs -enable-source-import %s -emit-silgen -disable-objc-attr-requires-foundation-module | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/SILGen/objc_selector.swift b/test/SILGen/objc_selector.swift index d339f73ccf6..5aaed942d39 100644 --- a/test/SILGen/objc_selector.swift +++ b/test/SILGen/objc_selector.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-sil -sdk %S/Inputs -I %S/Inputs -enable-source-import %s | %FileCheck %s +// RUN: %target-swift-frontend -emit-sil -sdk %S/Inputs -I %S/Inputs -enable-source-import %s | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/SILGen/objc_set_bridging.swift b/test/SILGen/objc_set_bridging.swift index a980645484e..132e70a68bc 100644 --- a/test/SILGen/objc_set_bridging.swift +++ b/test/SILGen/objc_set_bridging.swift @@ -1,7 +1,7 @@ // RUN: rm -rf %t && mkdir -p %t // RUN: %build-silgen-test-overlays -// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -Xllvm -new-mangling-for-tests -emit-silgen %s | %FileCheck %s +// RUN: %target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -emit-silgen %s | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/SILGen/objc_subscript.swift b/test/SILGen/objc_subscript.swift index cb9bed31941..8169dceac81 100644 --- a/test/SILGen/objc_subscript.swift +++ b/test/SILGen/objc_subscript.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests %s -emit-silgen -emit-verbose-sil -disable-objc-attr-requires-foundation-module | %FileCheck %s +// RUN: %target-swift-frontend %s -emit-silgen -emit-verbose-sil -disable-objc-attr-requires-foundation-module | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/SILGen/objc_super.swift b/test/SILGen/objc_super.swift index 16c2279f575..6ef75c339f7 100644 --- a/test/SILGen/objc_super.swift +++ b/test/SILGen/objc_super.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -sdk %S/Inputs -I %S/Inputs -enable-source-import %s -emit-silgen | %FileCheck %s +// RUN: %target-swift-frontend -sdk %S/Inputs -I %S/Inputs -enable-source-import %s -emit-silgen | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/SILGen/objc_witnesses.swift b/test/SILGen/objc_witnesses.swift index 5d0730fc042..cb95a4cf1ee 100644 --- a/test/SILGen/objc_witnesses.swift +++ b/test/SILGen/objc_witnesses.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen -sdk %S/Inputs -I %S/Inputs -enable-source-import %s | %FileCheck %s +// RUN: %target-swift-frontend -emit-silgen -sdk %S/Inputs -I %S/Inputs -enable-source-import %s | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/SILGen/opaque_values_silgen.swift b/test/SILGen/opaque_values_silgen.swift index 440c9e1f73f..f4f9c490f86 100644 --- a/test/SILGen/opaque_values_silgen.swift +++ b/test/SILGen/opaque_values_silgen.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -enable-sil-opaque-values -emit-sorted-sil -Xllvm -new-mangling-for-tests -Xllvm -sil-full-demangle -emit-silgen %s | %FileCheck %s +// RUN: %target-swift-frontend -enable-sil-opaque-values -emit-sorted-sil -Xllvm -sil-full-demangle -emit-silgen %s | %FileCheck %s // UNSUPPORTED: resilient_stdlib diff --git a/test/SILGen/opaque_values_silgen_lib.swift b/test/SILGen/opaque_values_silgen_lib.swift index 14d78f750ea..e1be8ee0741 100644 --- a/test/SILGen/opaque_values_silgen_lib.swift +++ b/test/SILGen/opaque_values_silgen_lib.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -enable-sil-opaque-values -emit-sorted-sil -Xllvm -new-mangling-for-tests -Xllvm -sil-full-demangle -parse-stdlib -parse-as-library -emit-silgen -module-name Swift %s | %FileCheck %s +// RUN: %target-swift-frontend -enable-sil-opaque-values -emit-sorted-sil -Xllvm -sil-full-demangle -parse-stdlib -parse-as-library -emit-silgen -module-name Swift %s | %FileCheck %s // UNSUPPORTED: resilient_stdlib precedencegroup AssignmentPrecedence { assignment: true } diff --git a/test/SILGen/optional-cast.swift b/test/SILGen/optional-cast.swift index e2ed3eb3361..3f016a761c4 100644 --- a/test/SILGen/optional-cast.swift +++ b/test/SILGen/optional-cast.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen %s | %FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s class A {} class B : A {} diff --git a/test/SILGen/optional.swift b/test/SILGen/optional.swift index df11647f3c9..b07580b0fe1 100644 --- a/test/SILGen/optional.swift +++ b/test/SILGen/optional.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen %s | %FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s func testCall(_ f: (() -> ())?) { f?() diff --git a/test/SILGen/optional_to_bool.swift b/test/SILGen/optional_to_bool.swift index f21cda04478..84de69a90ec 100644 --- a/test/SILGen/optional_to_bool.swift +++ b/test/SILGen/optional_to_bool.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen %s | %FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-%target-runtime +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-%target-runtime public protocol P {} extension Int: P {} diff --git a/test/SILGen/partial_apply_generic.swift b/test/SILGen/partial_apply_generic.swift index f45e0c426b5..ac24d4d1270 100644 --- a/test/SILGen/partial_apply_generic.swift +++ b/test/SILGen/partial_apply_generic.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen %s | %FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s protocol Foo { static func staticFunc() diff --git a/test/SILGen/partial_apply_init.swift b/test/SILGen/partial_apply_init.swift index 5b9545dddf4..ef4f253e92a 100644 --- a/test/SILGen/partial_apply_init.swift +++ b/test/SILGen/partial_apply_init.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen %s | %FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s class C { init(x: Int) {} diff --git a/test/SILGen/partial_apply_protocol.swift b/test/SILGen/partial_apply_protocol.swift index 7d51024b6ee..10b12629e28 100644 --- a/test/SILGen/partial_apply_protocol.swift +++ b/test/SILGen/partial_apply_protocol.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen %s | %FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s protocol Clonable { func clone() -> Self diff --git a/test/SILGen/partial_apply_protocol_class_refinement_method.swift b/test/SILGen/partial_apply_protocol_class_refinement_method.swift index fd5c7e78bbc..04b9e350c8c 100644 --- a/test/SILGen/partial_apply_protocol_class_refinement_method.swift +++ b/test/SILGen/partial_apply_protocol_class_refinement_method.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen %s | %FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s protocol P { func foo() } protocol Q: class, P {} diff --git a/test/SILGen/partial_apply_super.swift b/test/SILGen/partial_apply_super.swift index 9d20e24ea9a..2784489ab76 100644 --- a/test/SILGen/partial_apply_super.swift +++ b/test/SILGen/partial_apply_super.swift @@ -2,7 +2,7 @@ // RUN: mkdir -p %t // RUN: %target-swift-frontend -I %t -emit-module -emit-module-path=%t/resilient_struct.swiftmodule -module-name resilient_struct %S/../Inputs/resilient_struct.swift // RUN: %target-swift-frontend -I %t -emit-module -emit-module-path=%t/resilient_class.swiftmodule -module-name resilient_class %S/../Inputs/resilient_class.swift -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -enable-resilience -emit-silgen -parse-as-library -I %t %s | %FileCheck %s +// RUN: %target-swift-frontend -enable-resilience -emit-silgen -parse-as-library -I %t %s | %FileCheck %s import resilient_class diff --git a/test/SILGen/properties.swift b/test/SILGen/properties.swift index 135ddb147e5..7a541bccf10 100644 --- a/test/SILGen/properties.swift +++ b/test/SILGen/properties.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -Xllvm -sil-full-demangle -parse-as-library -emit-silgen -disable-objc-attr-requires-foundation-module %s | %FileCheck %s +// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -parse-as-library -emit-silgen -disable-objc-attr-requires-foundation-module %s | %FileCheck %s var zero: Int = 0 diff --git a/test/SILGen/property_abstraction.swift b/test/SILGen/property_abstraction.swift index 130babcfdc7..26142fb99cc 100644 --- a/test/SILGen/property_abstraction.swift +++ b/test/SILGen/property_abstraction.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen %s | %FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s struct Int { mutating func foo() {} diff --git a/test/SILGen/property_behavior_init.swift b/test/SILGen/property_behavior_init.swift index 22178c1d870..47eafd2f230 100644 --- a/test/SILGen/property_behavior_init.swift +++ b/test/SILGen/property_behavior_init.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -enable-experimental-property-behaviors -emit-silgen %s | %FileCheck %s +// RUN: %target-swift-frontend -enable-experimental-property-behaviors -emit-silgen %s | %FileCheck %s protocol diBehavior { associatedtype Value var storage: Value { get set } diff --git a/test/SILGen/protocol_class_refinement.swift b/test/SILGen/protocol_class_refinement.swift index 16f79e4f52a..b39fc713435 100644 --- a/test/SILGen/protocol_class_refinement.swift +++ b/test/SILGen/protocol_class_refinement.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen %s | %FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s protocol UID { func uid() -> Int diff --git a/test/SILGen/protocol_extensions.swift b/test/SILGen/protocol_extensions.swift index 4d2ab9ab86c..e8bd3168f84 100644 --- a/test/SILGen/protocol_extensions.swift +++ b/test/SILGen/protocol_extensions.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -disable-objc-attr-requires-foundation-module -emit-silgen %s | %FileCheck %s +// RUN: %target-swift-frontend -disable-objc-attr-requires-foundation-module -emit-silgen %s | %FileCheck %s public protocol P1 { func reqP1a() diff --git a/test/SILGen/protocol_resilience.swift b/test/SILGen/protocol_resilience.swift index 35e64a5a907..dc35e52f1e4 100644 --- a/test/SILGen/protocol_resilience.swift +++ b/test/SILGen/protocol_resilience.swift @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir %t // RUN: %target-swift-frontend -emit-module -enable-resilience -emit-module-path=%t/resilient_protocol.swiftmodule -module-name=resilient_protocol %S/../Inputs/resilient_protocol.swift -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -I %t -emit-silgen -enable-resilience %s | %FileCheck %s +// RUN: %target-swift-frontend -I %t -emit-silgen -enable-resilience %s | %FileCheck %s import resilient_protocol diff --git a/test/SILGen/protocols.swift b/test/SILGen/protocols.swift index 187e1758355..c2353c8dfea 100644 --- a/test/SILGen/protocols.swift +++ b/test/SILGen/protocols.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen %s | %FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s //===----------------------------------------------------------------------===// // Calling Existential Subscripts diff --git a/test/SILGen/reabstract.swift b/test/SILGen/reabstract.swift index 203cb2f9a45..373c81a4b3c 100644 --- a/test/SILGen/reabstract.swift +++ b/test/SILGen/reabstract.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -Xllvm -sil-full-demangle -emit-silgen %s | %FileCheck %s +// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -emit-silgen %s | %FileCheck %s func takeFn(_ f : (T) -> T?) {} func liftOptional(_ x : Int) -> Int? { return x } diff --git a/test/SILGen/reabstract_lvalue.swift b/test/SILGen/reabstract_lvalue.swift index 2c6d43169c6..4cb2a3ada63 100644 --- a/test/SILGen/reabstract_lvalue.swift +++ b/test/SILGen/reabstract_lvalue.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen %s | %FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s struct MyMetatypeIsThin {} diff --git a/test/SILGen/required_init.swift b/test/SILGen/required_init.swift index 938930e4afa..da8018e9224 100644 --- a/test/SILGen/required_init.swift +++ b/test/SILGen/required_init.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen %s | %FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s func subclassFloatLiteral() -> Bar { let x: Bar = 1.0 diff --git a/test/SILGen/result_abstraction.swift b/test/SILGen/result_abstraction.swift index f63fc1d6c11..f5b9056b6bf 100644 --- a/test/SILGen/result_abstraction.swift +++ b/test/SILGen/result_abstraction.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen %s | %FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s struct S {} struct R {} diff --git a/test/SILGen/rethrows.swift b/test/SILGen/rethrows.swift index ed699f0835c..d9380b9e0dd 100644 --- a/test/SILGen/rethrows.swift +++ b/test/SILGen/rethrows.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-sil -verify %s | %FileCheck %s +// RUN: %target-swift-frontend -emit-sil -verify %s | %FileCheck %s @discardableResult func rethrower(_ fn: () throws -> Int) rethrows -> Int { diff --git a/test/SILGen/same_type_abstraction.swift b/test/SILGen/same_type_abstraction.swift index b71e5b178cb..530938b0840 100644 --- a/test/SILGen/same_type_abstraction.swift +++ b/test/SILGen/same_type_abstraction.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen %s | %FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s protocol Associated { associatedtype Assoc diff --git a/test/SILGen/scalar_to_tuple_args.swift b/test/SILGen/scalar_to_tuple_args.swift index 881e94c732b..697d75e0a35 100644 --- a/test/SILGen/scalar_to_tuple_args.swift +++ b/test/SILGen/scalar_to_tuple_args.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen %s | %FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s func inoutWithDefaults(_ x: inout Int, y: Int = 0, z: Int = 0) {} func inoutWithCallerSideDefaults(_ x: inout Int, y: Int = #line) {} diff --git a/test/SILGen/sil_locations_top_level.swift b/test/SILGen/sil_locations_top_level.swift index 8d629fd4653..06673b89240 100644 --- a/test/SILGen/sil_locations_top_level.swift +++ b/test/SILGen/sil_locations_top_level.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -Xllvm -sil-full-demangle -emit-silgen -emit-verbose-sil %s | %FileCheck %s +// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -emit-silgen -emit-verbose-sil %s | %FileCheck %s // Test top-level/module locations. class TopLevelObjectTy { diff --git a/test/SILGen/source_location.swift b/test/SILGen/source_location.swift index ac11f5e4da7..5fab36490cd 100644 --- a/test/SILGen/source_location.swift +++ b/test/SILGen/source_location.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -Xllvm -sil-full-demangle -emit-silgen %s | %FileCheck %s +// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -emit-silgen %s | %FileCheck %s func printSourceLocation(file: String = #file, line: Int = #line) {} diff --git a/test/SILGen/specialize_attr.swift b/test/SILGen/specialize_attr.swift index 72e9241c44f..936d111f777 100644 --- a/test/SILGen/specialize_attr.swift +++ b/test/SILGen/specialize_attr.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen -emit-verbose-sil %s | %FileCheck %s +// RUN: %target-swift-frontend -emit-silgen -emit-verbose-sil %s | %FileCheck %s // CHECK-LABEL: @_specialize(exported: false, kind: full, where T == Int, U == Float) // CHECK-NEXT: func specializeThis(_ t: T, u: U) diff --git a/test/SILGen/struct_resilience.swift b/test/SILGen/struct_resilience.swift index a45fdb7baff..047bf4bfae4 100644 --- a/test/SILGen/struct_resilience.swift +++ b/test/SILGen/struct_resilience.swift @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir %t // RUN: %target-swift-frontend -emit-module -enable-resilience -emit-module-path=%t/resilient_struct.swiftmodule -module-name=resilient_struct %S/../Inputs/resilient_struct.swift -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -I %t -emit-silgen -enable-resilience %s | %FileCheck %s +// RUN: %target-swift-frontend -I %t -emit-silgen -enable-resilience %s | %FileCheck %s import resilient_struct diff --git a/test/SILGen/super.swift b/test/SILGen/super.swift index b80408d0503..68c3d4b6cc8 100644 --- a/test/SILGen/super.swift +++ b/test/SILGen/super.swift @@ -2,7 +2,7 @@ // RUN: mkdir -p %t // RUN: %target-swift-frontend -I %t -emit-module -emit-module-path=%t/resilient_struct.swiftmodule -module-name resilient_struct %S/../Inputs/resilient_struct.swift // RUN: %target-swift-frontend -I %t -emit-module -emit-module-path=%t/resilient_class.swiftmodule -module-name resilient_class %S/../Inputs/resilient_class.swift -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen -parse-as-library -I %t %s | %FileCheck %s +// RUN: %target-swift-frontend -emit-silgen -parse-as-library -I %t %s | %FileCheck %s import resilient_class diff --git a/test/SILGen/super_init_refcounting.swift b/test/SILGen/super_init_refcounting.swift index 6e187d4cb79..b7deb72320b 100644 --- a/test/SILGen/super_init_refcounting.swift +++ b/test/SILGen/super_init_refcounting.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen %s | %FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s class Foo { init() {} diff --git a/test/SILGen/super_objc_class_method.swift b/test/SILGen/super_objc_class_method.swift index 5abff6d7e80..e4ea1a84d19 100644 --- a/test/SILGen/super_objc_class_method.swift +++ b/test/SILGen/super_objc_class_method.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen -sdk %S/Inputs -I %S/Inputs -enable-source-import %s | %FileCheck %s +// RUN: %target-swift-frontend -emit-silgen -sdk %S/Inputs -I %S/Inputs -enable-source-import %s | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/SILGen/switch.swift b/test/SILGen/switch.swift index e2b2415e1b7..ff6e2e2122b 100644 --- a/test/SILGen/switch.swift +++ b/test/SILGen/switch.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen %s | %FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s func markUsed(_ t: T) {} diff --git a/test/SILGen/switch_abstraction.swift b/test/SILGen/switch_abstraction.swift index 62a52cc5686..50ecb7ea869 100644 --- a/test/SILGen/switch_abstraction.swift +++ b/test/SILGen/switch_abstraction.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen -parse-stdlib %s | %FileCheck %s +// RUN: %target-swift-frontend -emit-silgen -parse-stdlib %s | %FileCheck %s struct A {} diff --git a/test/SILGen/switch_fallthrough.swift b/test/SILGen/switch_fallthrough.swift index e7127c5a876..0f54341cfdb 100644 --- a/test/SILGen/switch_fallthrough.swift +++ b/test/SILGen/switch_fallthrough.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen %s | %FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s // Some fake predicates for pattern guards. func runced() -> Bool { return true } diff --git a/test/SILGen/switch_isa.swift b/test/SILGen/switch_isa.swift index 96557a657d2..f700db2ec8d 100644 --- a/test/SILGen/switch_isa.swift +++ b/test/SILGen/switch_isa.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen %s | %FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s func markUsed(_ t: T) {} diff --git a/test/SILGen/switch_var.swift b/test/SILGen/switch_var.swift index 3c0b68371e7..e8a944625be 100644 --- a/test/SILGen/switch_var.swift +++ b/test/SILGen/switch_var.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen %s | %FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s // TODO: Implement tuple equality in the library. // BLOCKED: diff --git a/test/SILGen/testable-multifile-other.swift b/test/SILGen/testable-multifile-other.swift index b54344cb491..0b13dccf65d 100644 --- a/test/SILGen/testable-multifile-other.swift +++ b/test/SILGen/testable-multifile-other.swift @@ -3,9 +3,9 @@ // RUN: rm -rf %t && mkdir -p %t // RUN: %target-swift-frontend -emit-module %S/Inputs/TestableMultifileHelper.swift -enable-testing -o %t -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen -I %t %s %S/testable-multifile.swift -module-name main | %FileCheck %s -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen -I %t %S/testable-multifile.swift %s -module-name main | %FileCheck %s -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen -I %t -primary-file %s %S/testable-multifile.swift -module-name main | %FileCheck %s +// RUN: %target-swift-frontend -emit-silgen -I %t %s %S/testable-multifile.swift -module-name main | %FileCheck %s +// RUN: %target-swift-frontend -emit-silgen -I %t %S/testable-multifile.swift %s -module-name main | %FileCheck %s +// RUN: %target-swift-frontend -emit-silgen -I %t -primary-file %s %S/testable-multifile.swift -module-name main | %FileCheck %s // Just make sure we don't crash later on. // RUN: %target-swift-frontend -emit-ir -I %t -primary-file %s %S/testable-multifile.swift -module-name main -o /dev/null diff --git a/test/SILGen/testable-multifile.swift b/test/SILGen/testable-multifile.swift index 9c1e81dff5f..8e183c075bd 100644 --- a/test/SILGen/testable-multifile.swift +++ b/test/SILGen/testable-multifile.swift @@ -3,9 +3,9 @@ // RUN: rm -rf %t && mkdir -p %t // RUN: %target-swift-frontend -emit-module %S/Inputs/TestableMultifileHelper.swift -enable-testing -o %t -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen -I %t %s %S/testable-multifile-other.swift -module-name main | %FileCheck %s -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen -I %t %S/testable-multifile-other.swift %s -module-name main | %FileCheck %s -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen -I %t -primary-file %s %S/testable-multifile-other.swift -module-name main | %FileCheck %s +// RUN: %target-swift-frontend -emit-silgen -I %t %s %S/testable-multifile-other.swift -module-name main | %FileCheck %s +// RUN: %target-swift-frontend -emit-silgen -I %t %S/testable-multifile-other.swift %s -module-name main | %FileCheck %s +// RUN: %target-swift-frontend -emit-silgen -I %t -primary-file %s %S/testable-multifile-other.swift -module-name main | %FileCheck %s // Just make sure we don't crash later on. // RUN: %target-swift-frontend -emit-ir -I %t -primary-file %s %S/testable-multifile-other.swift -module-name main -o /dev/null diff --git a/test/SILGen/toplevel.swift b/test/SILGen/toplevel.swift index 2c90f73dbe0..51a3bd8cc41 100644 --- a/test/SILGen/toplevel.swift +++ b/test/SILGen/toplevel.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -Xllvm -sil-full-demangle -emit-silgen %s | %FileCheck %s +// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -emit-silgen %s | %FileCheck %s func markUsed(_ t: T) {} diff --git a/test/SILGen/transparent_attribute.swift b/test/SILGen/transparent_attribute.swift index fba7a33ae40..4b9d637430c 100644 --- a/test/SILGen/transparent_attribute.swift +++ b/test/SILGen/transparent_attribute.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen -emit-verbose-sil %s | %FileCheck %s +// RUN: %target-swift-frontend -emit-silgen -emit-verbose-sil %s | %FileCheck %s // Test that the attribute gets set on default argument generators. @_transparent func transparentFuncWithDefaultArgument (x: Int = 1) -> Int { diff --git a/test/SILGen/tsan_instrumentation.swift b/test/SILGen/tsan_instrumentation.swift index b2edb2362c0..1b1078ee8d6 100644 --- a/test/SILGen/tsan_instrumentation.swift +++ b/test/SILGen/tsan_instrumentation.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -sanitize=thread -enable-experimental-tsan-inout-instrumentation -emit-silgen %s | %FileCheck %s +// RUN: %target-swift-frontend -sanitize=thread -enable-experimental-tsan-inout-instrumentation -emit-silgen %s | %FileCheck %s // REQUIRES: tsan_runtime // XFAIL: linux diff --git a/test/SILGen/tuples.swift b/test/SILGen/tuples.swift index 08583314970..388e759c0a2 100644 --- a/test/SILGen/tuples.swift +++ b/test/SILGen/tuples.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen %s | %FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s class C {} enum Foo { diff --git a/test/SILGen/types.swift b/test/SILGen/types.swift index f575374183e..6badf3ba2b1 100644 --- a/test/SILGen/types.swift +++ b/test/SILGen/types.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -parse-as-library -emit-silgen %s | %FileCheck %s +// RUN: %target-swift-frontend -parse-as-library -emit-silgen %s | %FileCheck %s class C { var member: Int = 0 diff --git a/test/SILGen/unmanaged.swift b/test/SILGen/unmanaged.swift index a427d1d6911..879aa69c922 100644 --- a/test/SILGen/unmanaged.swift +++ b/test/SILGen/unmanaged.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-sil %s | %FileCheck %s +// RUN: %target-swift-frontend -emit-sil %s | %FileCheck %s class C {} diff --git a/test/SILGen/unowned.swift b/test/SILGen/unowned.swift index 70c12c0b9fc..fef21cb7b22 100644 --- a/test/SILGen/unowned.swift +++ b/test/SILGen/unowned.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen %s | %FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s func takeClosure(_ fn: () -> Int) {} diff --git a/test/SILGen/unsafe_pointer_gen.swift b/test/SILGen/unsafe_pointer_gen.swift index 30508885416..496050a754c 100644 --- a/test/SILGen/unsafe_pointer_gen.swift +++ b/test/SILGen/unsafe_pointer_gen.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -O -emit-sil -parse-as-library %s | %FileCheck %s +// RUN: %target-swift-frontend -O -emit-sil -parse-as-library %s | %FileCheck %s // Test the absence of a 'strict' flag. // CHECK-LABEL: _T018unsafe_pointer_gen13test_raw_loadSiSV2rp_tF diff --git a/test/SILGen/vtable_thunks.swift b/test/SILGen/vtable_thunks.swift index 86db10ade92..cb23a871600 100644 --- a/test/SILGen/vtable_thunks.swift +++ b/test/SILGen/vtable_thunks.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -sdk %S/Inputs -emit-silgen -I %S/Inputs -enable-source-import %s -disable-objc-attr-requires-foundation-module | %FileCheck %s +// RUN: %target-swift-frontend -sdk %S/Inputs -emit-silgen -I %S/Inputs -enable-source-import %s -disable-objc-attr-requires-foundation-module | %FileCheck %s protocol AddrOnly {} diff --git a/test/SILGen/vtable_thunks_reabstraction_final.swift b/test/SILGen/vtable_thunks_reabstraction_final.swift index ed0ae1bea23..c46105bbf59 100644 --- a/test/SILGen/vtable_thunks_reabstraction_final.swift +++ b/test/SILGen/vtable_thunks_reabstraction_final.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen %s | %FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s protocol Fooable { func foo(_ x: Int) -> Int? diff --git a/test/SILGen/vtables.swift b/test/SILGen/vtables.swift index 7f01e2330b8..20e9b3ef770 100644 --- a/test/SILGen/vtables.swift +++ b/test/SILGen/vtables.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -sdk %S/Inputs -emit-silgen -I %S/Inputs -enable-source-import %s -disable-objc-attr-requires-foundation-module | %FileCheck %s +// RUN: %target-swift-frontend -sdk %S/Inputs -emit-silgen -I %S/Inputs -enable-source-import %s -disable-objc-attr-requires-foundation-module | %FileCheck %s // FIXME: rdar://problem/19648117 Needs splitting objc parts out // XFAIL: linux diff --git a/test/SILGen/weak.swift b/test/SILGen/weak.swift index c576d556bfd..914bd3922d4 100644 --- a/test/SILGen/weak.swift +++ b/test/SILGen/weak.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -Xllvm -sil-full-demangle -emit-silgen %s | %FileCheck %s +// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -emit-silgen %s | %FileCheck %s class C { func f() -> Int { return 42 } diff --git a/test/SILGen/weak_multiple_modules.swift b/test/SILGen/weak_multiple_modules.swift index d998ebef8cd..dcda4a7e086 100644 --- a/test/SILGen/weak_multiple_modules.swift +++ b/test/SILGen/weak_multiple_modules.swift @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir %t // RUN: %target-swift-frontend -emit-module -emit-module-path=%t/weak_other.swiftmodule -module-name=weak_other %S/Inputs/weak_other.swift -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -I %t -emit-silgen %s | %FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-%target-runtime +// RUN: %target-swift-frontend -I %t -emit-silgen %s | %FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-%target-runtime import weak_other diff --git a/test/SILGen/without_actually_escaping.swift b/test/SILGen/without_actually_escaping.swift index d4a612f3fed..a2407de2dc4 100644 --- a/test/SILGen/without_actually_escaping.swift +++ b/test/SILGen/without_actually_escaping.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen %s | %FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s var escapeHatch: Any = 0 diff --git a/test/SILGen/witness_same_type.swift b/test/SILGen/witness_same_type.swift index 70e5cdeeea7..ecda1aca232 100644 --- a/test/SILGen/witness_same_type.swift +++ b/test/SILGen/witness_same_type.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen %s | %FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s // RUN: %target-swift-frontend -emit-ir %s protocol Fooable { diff --git a/test/SILGen/witness_single_tuple.swift b/test/SILGen/witness_single_tuple.swift index 88f874a9ae4..e9ff59d8140 100644 --- a/test/SILGen/witness_single_tuple.swift +++ b/test/SILGen/witness_single_tuple.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen %s | %FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s protocol Runcible { func runce(x: Int) diff --git a/test/SILGen/witness_tables.swift b/test/SILGen/witness_tables.swift index 2ceab7f59c8..5f17130614c 100644 --- a/test/SILGen/witness_tables.swift +++ b/test/SILGen/witness_tables.swift @@ -1,8 +1,8 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen -I %S/Inputs -enable-source-import %s -disable-objc-attr-requires-foundation-module > %t.sil +// RUN: %target-swift-frontend -emit-silgen -I %S/Inputs -enable-source-import %s -disable-objc-attr-requires-foundation-module > %t.sil // RUN: %FileCheck -check-prefix=TABLE -check-prefix=TABLE-ALL %s < %t.sil // RUN: %FileCheck -check-prefix=SYMBOL %s < %t.sil -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen -I %S/Inputs -enable-source-import %s -disable-objc-attr-requires-foundation-module -enable-testing > %t.testable.sil +// RUN: %target-swift-frontend -emit-silgen -I %S/Inputs -enable-source-import %s -disable-objc-attr-requires-foundation-module -enable-testing > %t.testable.sil // RUN: %FileCheck -check-prefix=TABLE-TESTABLE -check-prefix=TABLE-ALL %s < %t.testable.sil // RUN: %FileCheck -check-prefix=SYMBOL-TESTABLE %s < %t.testable.sil diff --git a/test/SILGen/witnesses.swift b/test/SILGen/witnesses.swift index 26c2688e3db..4071912c59f 100644 --- a/test/SILGen/witnesses.swift +++ b/test/SILGen/witnesses.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -Xllvm -sil-full-demangle -emit-silgen %s -disable-objc-attr-requires-foundation-module | %FileCheck %s +// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -emit-silgen %s -disable-objc-attr-requires-foundation-module | %FileCheck %s infix operator <~> {} diff --git a/test/SILGen/witnesses_class.swift b/test/SILGen/witnesses_class.swift index 9d116aadc6c..ee3e9adce04 100644 --- a/test/SILGen/witnesses_class.swift +++ b/test/SILGen/witnesses_class.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen %s | %FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s protocol Fooable: class { func foo() diff --git a/test/SILGen/witnesses_inheritance.swift b/test/SILGen/witnesses_inheritance.swift index 6ce09790e59..79e086f7b14 100644 --- a/test/SILGen/witnesses_inheritance.swift +++ b/test/SILGen/witnesses_inheritance.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen %s | %FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s | %FileCheck %s protocol Fooable { func foo() diff --git a/test/SILGen/writeback.swift b/test/SILGen/writeback.swift index efedee4ca50..1a1fdbf43df 100644 --- a/test/SILGen/writeback.swift +++ b/test/SILGen/writeback.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -Xllvm -sil-full-demangle -emit-silgen %s | %FileCheck %s +// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -emit-silgen %s | %FileCheck %s struct Foo { mutating // used to test writeback. diff --git a/test/SILOptimizer/address_lowering.sil b/test/SILOptimizer/address_lowering.sil index d6e3a36a7fc..4a3de91338f 100644 --- a/test/SILOptimizer/address_lowering.sil +++ b/test/SILOptimizer/address_lowering.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -address-lowering -enable-sil-opaque-values -emit-sorted-sil -new-mangling-for-tests -assume-parsing-unqualified-ownership-sil %s | %FileCheck %s +// RUN: %target-sil-opt -address-lowering -enable-sil-opaque-values -emit-sorted-sil -assume-parsing-unqualified-ownership-sil %s | %FileCheck %s import Builtin diff --git a/test/SILOptimizer/address_projection.sil b/test/SILOptimizer/address_projection.sil index c3763af16c6..2c03a657dab 100644 --- a/test/SILOptimizer/address_projection.sil +++ b/test/SILOptimizer/address_projection.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -address-lowering -enable-sil-opaque-values -optimize-opaque-address-lowering -emit-sorted-sil -new-mangling-for-tests -assume-parsing-unqualified-ownership-sil %s | %FileCheck %s +// RUN: %target-sil-opt -address-lowering -enable-sil-opaque-values -optimize-opaque-address-lowering -emit-sorted-sil -assume-parsing-unqualified-ownership-sil %s | %FileCheck %s import Builtin diff --git a/test/SILOptimizer/capture_promotion.swift b/test/SILOptimizer/capture_promotion.swift index f75b52ba18b..838cb4d5c17 100644 --- a/test/SILOptimizer/capture_promotion.swift +++ b/test/SILOptimizer/capture_promotion.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests %s -emit-sil -o - -verify | %FileCheck %s +// RUN: %target-swift-frontend %s -emit-sil -o - -verify | %FileCheck %s class Foo { func foo() -> Int { diff --git a/test/SILOptimizer/cast_folding.swift b/test/SILOptimizer/cast_folding.swift index c3ef3004f27..4e61be2a9a4 100644 --- a/test/SILOptimizer/cast_folding.swift +++ b/test/SILOptimizer/cast_folding.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -O -emit-sil %s | %FileCheck %s +// RUN: %target-swift-frontend -O -emit-sil %s | %FileCheck %s // We want to check two things here: // - Correctness // - That certain "is" checks are eliminated based on static analysis at compile-time diff --git a/test/SILOptimizer/cast_folding_objc.swift b/test/SILOptimizer/cast_folding_objc.swift index ad1f4cfe53e..742a75bb02b 100644 --- a/test/SILOptimizer/cast_folding_objc.swift +++ b/test/SILOptimizer/cast_folding_objc.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -O -Xllvm -sil-disable-pass="Function Signature Optimization" -emit-sil %s | %FileCheck %s +// RUN: %target-swift-frontend -O -Xllvm -sil-disable-pass="Function Signature Optimization" -emit-sil %s | %FileCheck %s // We want to check two things here: // - Correctness // - That certain "is" checks are eliminated based on static analysis at compile-time diff --git a/test/SILOptimizer/cast_folding_objc_generics.swift b/test/SILOptimizer/cast_folding_objc_generics.swift index 0c5ffdf5559..60133598f01 100644 --- a/test/SILOptimizer/cast_folding_objc_generics.swift +++ b/test/SILOptimizer/cast_folding_objc_generics.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -Xllvm -new-mangling-for-tests -O -emit-sil %s | %FileCheck %s +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -O -emit-sil %s | %FileCheck %s // REQUIRES: objc_interop import objc_generics diff --git a/test/SILOptimizer/cast_folding_objc_no_foundation.swift b/test/SILOptimizer/cast_folding_objc_no_foundation.swift index a14b7db346c..36e72b3f968 100644 --- a/test/SILOptimizer/cast_folding_objc_no_foundation.swift +++ b/test/SILOptimizer/cast_folding_objc_no_foundation.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -Xllvm -new-mangling-for-tests -O -emit-sil %s | %FileCheck %s +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -O -emit-sil %s | %FileCheck %s // REQUIRES: objc_interop // TODO: Update optimizer for id-as-Any changes. diff --git a/test/SILOptimizer/closure_spec_and_inline.swift b/test/SILOptimizer/closure_spec_and_inline.swift index 6ae6e99436a..57c1afbc6bf 100644 --- a/test/SILOptimizer/closure_spec_and_inline.swift +++ b/test/SILOptimizer/closure_spec_and_inline.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -parse-as-library -O -module-name=test %s -emit-sil | %FileCheck %s +// RUN: %target-swift-frontend -parse-as-library -O -module-name=test %s -emit-sil | %FileCheck %s func closure(_ a: Int, b: Int) -> Bool { return a < b diff --git a/test/SILOptimizer/closure_specialize.sil b/test/SILOptimizer/closure_specialize.sil index 9a805030155..d8609ac1edf 100644 --- a/test/SILOptimizer/closure_specialize.sil +++ b/test/SILOptimizer/closure_specialize.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -new-mangling-for-tests -assume-parsing-unqualified-ownership-sil -enable-sil-verify-all -closure-specialize %s | %FileCheck %s +// RUN: %target-sil-opt -assume-parsing-unqualified-ownership-sil -enable-sil-verify-all -closure-specialize %s | %FileCheck %s import Builtin import Swift diff --git a/test/SILOptimizer/closure_specialize_fragile.swift b/test/SILOptimizer/closure_specialize_fragile.swift index 4c2df298051..31b245e006a 100644 --- a/test/SILOptimizer/closure_specialize_fragile.swift +++ b/test/SILOptimizer/closure_specialize_fragile.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests %s -emit-sil -O -o - -verify | %FileCheck %s +// RUN: %target-swift-frontend %s -emit-sil -O -o - -verify | %FileCheck %s // Make sure we do not specialize resilientCallee. diff --git a/test/SILOptimizer/dead_alloc_elim.sil b/test/SILOptimizer/dead_alloc_elim.sil index f0bf38763e0..4090cb11af9 100644 --- a/test/SILOptimizer/dead_alloc_elim.sil +++ b/test/SILOptimizer/dead_alloc_elim.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -new-mangling-for-tests -assume-parsing-unqualified-ownership-sil -enable-sil-verify-all -deadobject-elim %s | %FileCheck %s +// RUN: %target-sil-opt -assume-parsing-unqualified-ownership-sil -enable-sil-verify-all -deadobject-elim %s | %FileCheck %s import Swift import Builtin diff --git a/test/SILOptimizer/dead_function_elimination.swift b/test/SILOptimizer/dead_function_elimination.swift index ef13d0bda2f..2e85c94aa5a 100644 --- a/test/SILOptimizer/dead_function_elimination.swift +++ b/test/SILOptimizer/dead_function_elimination.swift @@ -1,5 +1,5 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests %s -O -emit-sil | %FileCheck %s -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests %s -O -emit-sil -enable-testing | %FileCheck -check-prefix=CHECK-TESTING %s +// RUN: %target-swift-frontend %s -O -emit-sil | %FileCheck %s +// RUN: %target-swift-frontend %s -O -emit-sil -enable-testing | %FileCheck -check-prefix=CHECK-TESTING %s // Check if cycles are removed. diff --git a/test/SILOptimizer/dead_partial_apply_arg.swift b/test/SILOptimizer/dead_partial_apply_arg.swift index 43f69f7ca2f..73b09a36f71 100644 --- a/test/SILOptimizer/dead_partial_apply_arg.swift +++ b/test/SILOptimizer/dead_partial_apply_arg.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -parse-as-library -module-name=test -primary-file %s -O -emit-sil | %FileCheck %s +// RUN: %target-swift-frontend -parse-as-library -module-name=test -primary-file %s -O -emit-sil | %FileCheck %s // Check if the compiler can convert a partial_apply of a dead argument (an diff --git a/test/SILOptimizer/dead_witness_module.swift b/test/SILOptimizer/dead_witness_module.swift index 48b9308750a..42928e5dfe6 100644 --- a/test/SILOptimizer/dead_witness_module.swift +++ b/test/SILOptimizer/dead_witness_module.swift @@ -1,6 +1,6 @@ // RUN: rm -rf %t && mkdir -p %t -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -Onone -parse-stdlib -parse-as-library -module-name TestModule -sil-serialize-all %S/Inputs/TestModule.swift -emit-module-path %t/TestModule.swiftmodule -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -O %s -I %t -emit-sil | %FileCheck %s +// RUN: %target-swift-frontend -Onone -parse-stdlib -parse-as-library -module-name TestModule -sil-serialize-all %S/Inputs/TestModule.swift -emit-module-path %t/TestModule.swiftmodule +// RUN: %target-swift-frontend -O %s -I %t -emit-sil | %FileCheck %s // DeadFunctionElimination may not remove a method from a witness table which // is imported from another module. diff --git a/test/SILOptimizer/definite_init_failable_initializers.swift b/test/SILOptimizer/definite_init_failable_initializers.swift index 94dbf3bf45b..90d0a0a2d82 100644 --- a/test/SILOptimizer/definite_init_failable_initializers.swift +++ b/test/SILOptimizer/definite_init_failable_initializers.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-sil -disable-objc-attr-requires-foundation-module %s | %FileCheck %s +// RUN: %target-swift-frontend -emit-sil -disable-objc-attr-requires-foundation-module %s | %FileCheck %s // High-level tests that DI handles early returns from failable and throwing // initializers properly. The main complication is conditional release of self diff --git a/test/SILOptimizer/definite_init_objc_factory_init.swift b/test/SILOptimizer/definite_init_objc_factory_init.swift index 00b2165e6aa..c504d6e8916 100644 --- a/test/SILOptimizer/definite_init_objc_factory_init.swift +++ b/test/SILOptimizer/definite_init_objc_factory_init.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -Xllvm -new-mangling-for-tests -I %S/../IDE/Inputs/custom-modules %s -emit-sil | %FileCheck %s +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -I %S/../IDE/Inputs/custom-modules %s -emit-sil | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/SILOptimizer/definite_init_protocol_init.swift b/test/SILOptimizer/definite_init_protocol_init.swift index 6ab8cfb139d..b109ff39ce3 100644 --- a/test/SILOptimizer/definite_init_protocol_init.swift +++ b/test/SILOptimizer/definite_init_protocol_init.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-sil %s | %FileCheck %s +// RUN: %target-swift-frontend -emit-sil %s | %FileCheck %s // Ensure that convenience initializers on concrete types can // delegate to factory initializers defined in protocol diff --git a/test/SILOptimizer/devirt_access.swift b/test/SILOptimizer/devirt_access.swift index ecb9ec0788c..5823b56d0dc 100644 --- a/test/SILOptimizer/devirt_access.swift +++ b/test/SILOptimizer/devirt_access.swift @@ -1,8 +1,8 @@ // RUN: rm -rf %t && mkdir -p %t // RUN: %target-swift-frontend -emit-module -Onone -o %t %S/Inputs/devirt_access_other_module.swift -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -O -primary-file %s %S/Inputs/devirt_access_helper.swift -I %t -emit-sil -sil-inline-threshold 1000 -sil-verify-all | %FileCheck -check-prefix=WHOLE-MODULE %s -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -O -primary-file %s %S/Inputs/devirt_access_helper.swift -I %t -emit-sil -sil-inline-threshold 1000 -sil-verify-all | %FileCheck -check-prefix=PRIMARY-FILE %s +// RUN: %target-swift-frontend -O -primary-file %s %S/Inputs/devirt_access_helper.swift -I %t -emit-sil -sil-inline-threshold 1000 -sil-verify-all | %FileCheck -check-prefix=WHOLE-MODULE %s +// RUN: %target-swift-frontend -O -primary-file %s %S/Inputs/devirt_access_helper.swift -I %t -emit-sil -sil-inline-threshold 1000 -sil-verify-all | %FileCheck -check-prefix=PRIMARY-FILE %s //PRIMARY-FILE-LABEL: sil hidden @_T013devirt_access012testInternalD0yyF //PRIMARY-FILE: class_method diff --git a/test/SILOptimizer/devirt_archetype_method.swift b/test/SILOptimizer/devirt_archetype_method.swift index 6ff7f79a8d4..fb7ee439405 100644 --- a/test/SILOptimizer/devirt_archetype_method.swift +++ b/test/SILOptimizer/devirt_archetype_method.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -O -emit-sil -primary-file %s | %FileCheck %s +// RUN: %target-swift-frontend -O -emit-sil -primary-file %s | %FileCheck %s // We can't deserialize apply_inst with subst lists. When radar://14443304 // is fixed then we should convert this test to a SIL test. diff --git a/test/SILOptimizer/devirt_base_class.swift b/test/SILOptimizer/devirt_base_class.swift index 877092bcd7a..f38d19885ca 100644 --- a/test/SILOptimizer/devirt_base_class.swift +++ b/test/SILOptimizer/devirt_base_class.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -O -emit-sil %s | %FileCheck %s +// RUN: %target-swift-frontend -O -emit-sil %s | %FileCheck %s public class Base1 { @inline(never) func f() -> Int { return 0 } } diff --git a/test/SILOptimizer/devirt_concrete_subclass_of_generic_class.swift b/test/SILOptimizer/devirt_concrete_subclass_of_generic_class.swift index 78853cec4b2..800f28a1537 100644 --- a/test/SILOptimizer/devirt_concrete_subclass_of_generic_class.swift +++ b/test/SILOptimizer/devirt_concrete_subclass_of_generic_class.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-sil -O %s | %FileCheck %s +// RUN: %target-swift-frontend -emit-sil -O %s | %FileCheck %s // Check that devirtualizer can properly handle concrete non-generic subclasses // of generic classes. diff --git a/test/SILOptimizer/devirt_contravariant_args.swift b/test/SILOptimizer/devirt_contravariant_args.swift index 488fba8eaf9..c7bb926768c 100644 --- a/test/SILOptimizer/devirt_contravariant_args.swift +++ b/test/SILOptimizer/devirt_contravariant_args.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -O -primary-file %s -emit-sil -sil-inline-threshold 1000 -sil-verify-all | %FileCheck %s +// RUN: %target-swift-frontend -O -primary-file %s -emit-sil -sil-inline-threshold 1000 -sil-verify-all | %FileCheck %s // Make sure that we can dig all the way through the class hierarchy and // protocol conformances. diff --git a/test/SILOptimizer/devirt_covariant_return.swift b/test/SILOptimizer/devirt_covariant_return.swift index 29ff5237faf..87acbe5956c 100644 --- a/test/SILOptimizer/devirt_covariant_return.swift +++ b/test/SILOptimizer/devirt_covariant_return.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -Xllvm -sil-full-demangle -O -Xllvm -disable-sil-cm-rr-cm=0 -Xllvm -sil-inline-generics=false -primary-file %s -emit-sil -sil-inline-threshold 1000 -sil-verify-all | %FileCheck %s +// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -O -Xllvm -disable-sil-cm-rr-cm=0 -Xllvm -sil-inline-generics=false -primary-file %s -emit-sil -sil-inline-threshold 1000 -sil-verify-all | %FileCheck %s // Make sure that we can dig all the way through the class hierarchy and // protocol conformances with covariant return types correctly. The verifier diff --git a/test/SILOptimizer/devirt_default_case.swift b/test/SILOptimizer/devirt_default_case.swift index 979ea2dc0c4..96383a362c3 100644 --- a/test/SILOptimizer/devirt_default_case.swift +++ b/test/SILOptimizer/devirt_default_case.swift @@ -1,5 +1,5 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -O -module-name devirt_default_case -emit-sil %s | %FileCheck -check-prefix=CHECK -check-prefix=CHECK-NORMAL %s -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -O -module-name devirt_default_case -emit-sil -enable-testing %s | %FileCheck -check-prefix=CHECK -check-prefix=CHECK-TESTABLE %s +// RUN: %target-swift-frontend -O -module-name devirt_default_case -emit-sil %s | %FileCheck -check-prefix=CHECK -check-prefix=CHECK-NORMAL %s +// RUN: %target-swift-frontend -O -module-name devirt_default_case -emit-sil -enable-testing %s | %FileCheck -check-prefix=CHECK -check-prefix=CHECK-TESTABLE %s @_silgen_name("action") func action(_ n:Int) -> () diff --git a/test/SILOptimizer/devirt_inherited_conformance.swift b/test/SILOptimizer/devirt_inherited_conformance.swift index cd724d99f92..51338450c91 100644 --- a/test/SILOptimizer/devirt_inherited_conformance.swift +++ b/test/SILOptimizer/devirt_inherited_conformance.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -O %s -emit-sil | %FileCheck %s +// RUN: %target-swift-frontend -O %s -emit-sil | %FileCheck %s // Make sure that we can dig all the way through the class hierarchy and // protocol conformances. diff --git a/test/SILOptimizer/devirt_materializeForSet.swift b/test/SILOptimizer/devirt_materializeForSet.swift index 9bc789728c7..d0b294cffa4 100644 --- a/test/SILOptimizer/devirt_materializeForSet.swift +++ b/test/SILOptimizer/devirt_materializeForSet.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -O -emit-sil %s | %FileCheck %s +// RUN: %target-swift-frontend -O -emit-sil %s | %FileCheck %s // Check that compiler does not crash on the devirtualization of materializeForSet methods // and produces a correct code. diff --git a/test/SILOptimizer/devirt_method_with_generic_params.swift b/test/SILOptimizer/devirt_method_with_generic_params.swift index bd88cbabfe0..95d339ae4ce 100644 --- a/test/SILOptimizer/devirt_method_with_generic_params.swift +++ b/test/SILOptimizer/devirt_method_with_generic_params.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-sil -O %s | %FileCheck %s +// RUN: %target-swift-frontend -emit-sil -O %s | %FileCheck %s class S { func f(_ x: T, _ y: U) -> T { return x } diff --git a/test/SILOptimizer/devirt_nested_class.swift b/test/SILOptimizer/devirt_nested_class.swift index d7cc6d181d0..57334911ccf 100644 --- a/test/SILOptimizer/devirt_nested_class.swift +++ b/test/SILOptimizer/devirt_nested_class.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-sil -O %s | %FileCheck %s +// RUN: %target-swift-frontend -emit-sil -O %s | %FileCheck %s fileprivate class Outer { class Inner : Base { diff --git a/test/SILOptimizer/devirt_protocol_method_invocations.swift b/test/SILOptimizer/devirt_protocol_method_invocations.swift index d8edcf738a5..9436224b906 100644 --- a/test/SILOptimizer/devirt_protocol_method_invocations.swift +++ b/test/SILOptimizer/devirt_protocol_method_invocations.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -O -emit-sil %s | %FileCheck %s +// RUN: %target-swift-frontend -O -emit-sil %s | %FileCheck %s public protocol Foo { func foo(_ x:Int) -> Int diff --git a/test/SILOptimizer/devirt_release.sil b/test/SILOptimizer/devirt_release.sil index 9b55bb21c89..8912f1e4877 100644 --- a/test/SILOptimizer/devirt_release.sil +++ b/test/SILOptimizer/devirt_release.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -new-mangling-for-tests -assume-parsing-unqualified-ownership-sil -enable-sil-verify-all %s -release-devirtualizer -module-name=test | %FileCheck %s +// RUN: %target-sil-opt -assume-parsing-unqualified-ownership-sil -enable-sil-verify-all %s -release-devirtualizer -module-name=test | %FileCheck %s sil_stage canonical diff --git a/test/SILOptimizer/devirt_single_module_in_multiple_files.swift b/test/SILOptimizer/devirt_single_module_in_multiple_files.swift index 05d13e996eb..e4cdbeb1999 100644 --- a/test/SILOptimizer/devirt_single_module_in_multiple_files.swift +++ b/test/SILOptimizer/devirt_single_module_in_multiple_files.swift @@ -1,4 +1,4 @@ -// RUN: %target-swiftc_driver -Xllvm -new-mangling-for-tests -module-name devirt_single_module_in_multiple_files -O %s %S/Inputs/BaseProblem.swift %S/Inputs/Problems.swift -parse-as-library -Xllvm -sil-disable-pass="Performance Inliner" -emit-sil 2>&1 | %FileCheck %s +// RUN: %target-swiftc_driver -module-name devirt_single_module_in_multiple_files -O %s %S/Inputs/BaseProblem.swift %S/Inputs/Problems.swift -parse-as-library -Xllvm -sil-disable-pass="Performance Inliner" -emit-sil 2>&1 | %FileCheck %s public func test() { let e = Evaluator() diff --git a/test/SILOptimizer/devirt_specialized_inherited_interplay.swift b/test/SILOptimizer/devirt_specialized_inherited_interplay.swift index a4f212edf4b..d71b2d45c1d 100644 --- a/test/SILOptimizer/devirt_specialized_inherited_interplay.swift +++ b/test/SILOptimizer/devirt_specialized_inherited_interplay.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -sil-verify-all -O %s -emit-sil | %FileCheck %s +// RUN: %target-swift-frontend -sil-verify-all -O %s -emit-sil | %FileCheck %s // This file consists of tests for making sure that protocol conformances and // inherited conformances work well together when applied to each other. The diff --git a/test/SILOptimizer/devirt_speculate.swift b/test/SILOptimizer/devirt_speculate.swift index 701f7b31ea9..eda0e26a2f2 100644 --- a/test/SILOptimizer/devirt_speculate.swift +++ b/test/SILOptimizer/devirt_speculate.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests %s -parse-as-library -O -emit-sil | %FileCheck %s +// RUN: %target-swift-frontend %s -parse-as-library -O -emit-sil | %FileCheck %s // // Test speculative devirtualization. diff --git a/test/SILOptimizer/devirt_unbound_generic.swift b/test/SILOptimizer/devirt_unbound_generic.swift index 56a60f9b402..982fc3dc6ff 100644 --- a/test/SILOptimizer/devirt_unbound_generic.swift +++ b/test/SILOptimizer/devirt_unbound_generic.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-sil -O %s | %FileCheck %s +// RUN: %target-swift-frontend -emit-sil -O %s | %FileCheck %s // We used to crash on this when trying to devirtualize t.boo(a, 1), // because it is an "apply" with unbound generic arguments and diff --git a/test/SILOptimizer/devirt_value_metatypes.swift b/test/SILOptimizer/devirt_value_metatypes.swift index dc7746e3e22..9e7df3e2f69 100644 --- a/test/SILOptimizer/devirt_value_metatypes.swift +++ b/test/SILOptimizer/devirt_value_metatypes.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-sil -O %s | %FileCheck %s +// RUN: %target-swift-frontend -emit-sil -O %s | %FileCheck %s open class A { @inline(never) diff --git a/test/SILOptimizer/devirtualize_existential.swift b/test/SILOptimizer/devirtualize_existential.swift index 570460b8ec7..1c1a729c6e6 100644 --- a/test/SILOptimizer/devirtualize_existential.swift +++ b/test/SILOptimizer/devirtualize_existential.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests %s -O -emit-sil | %FileCheck %s +// RUN: %target-swift-frontend %s -O -emit-sil | %FileCheck %s protocol Pingable { func ping(_ x : Int); diff --git a/test/SILOptimizer/eager_specialize.sil b/test/SILOptimizer/eager_specialize.sil index ce12c3786da..874a545ace6 100644 --- a/test/SILOptimizer/eager_specialize.sil +++ b/test/SILOptimizer/eager_specialize.sil @@ -1,6 +1,6 @@ -// RUN: %target-sil-opt -assume-parsing-unqualified-ownership-sil -enable-sil-verify-all -eager-specializer -new-mangling-for-tests %s | %FileCheck %s -// RUN: %target-sil-opt -assume-parsing-unqualified-ownership-sil -enable-sil-verify-all -eager-specializer -sil-deadfuncelim -new-mangling-for-tests %s | %FileCheck --check-prefix=CHECK-DEADFUNCELIM %s -// RUN: %target-sil-opt -assume-parsing-unqualified-ownership-sil -enable-sil-verify-all -eager-specializer -new-mangling-for-tests %s -o %t.sil && %target-swift-frontend -assume-parsing-unqualified-ownership-sil -module-name=eager_specialize -emit-ir %t.sil | %FileCheck --check-prefix=CHECK-IRGEN %s +// RUN: %target-sil-opt -assume-parsing-unqualified-ownership-sil -enable-sil-verify-all -eager-specializer %s | %FileCheck %s +// RUN: %target-sil-opt -assume-parsing-unqualified-ownership-sil -enable-sil-verify-all -eager-specializer -sil-deadfuncelim %s | %FileCheck --check-prefix=CHECK-DEADFUNCELIM %s +// RUN: %target-sil-opt -assume-parsing-unqualified-ownership-sil -enable-sil-verify-all -eager-specializer %s -o %t.sil && %target-swift-frontend -assume-parsing-unqualified-ownership-sil -module-name=eager_specialize -emit-ir %t.sil | %FileCheck --check-prefix=CHECK-IRGEN %s sil_stage canonical diff --git a/test/SILOptimizer/escape_analysis.sil b/test/SILOptimizer/escape_analysis.sil index 5b6e108a43a..2252034af11 100644 --- a/test/SILOptimizer/escape_analysis.sil +++ b/test/SILOptimizer/escape_analysis.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -new-mangling-for-tests -assume-parsing-unqualified-ownership-sil %s -escapes-dump -o /dev/null | %FileCheck %s +// RUN: %target-sil-opt -assume-parsing-unqualified-ownership-sil %s -escapes-dump -o /dev/null | %FileCheck %s // REQUIRES: asserts diff --git a/test/SILOptimizer/functionsigopts_self.swift b/test/SILOptimizer/functionsigopts_self.swift index 69540808248..34af0fa6b8e 100644 --- a/test/SILOptimizer/functionsigopts_self.swift +++ b/test/SILOptimizer/functionsigopts_self.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -Xllvm -sil-full-demangle -O -sil-inline-threshold 0 -emit-sil -primary-file %s | %FileCheck %s +// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -O -sil-inline-threshold 0 -emit-sil -primary-file %s | %FileCheck %s // // This is a .swift test because the SIL parser does not support Self. diff --git a/test/SILOptimizer/generic_inline_self.swift b/test/SILOptimizer/generic_inline_self.swift index 2f5b46fd563..7351c274a6d 100644 --- a/test/SILOptimizer/generic_inline_self.swift +++ b/test/SILOptimizer/generic_inline_self.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-sil -primary-file %s | %FileCheck %s +// RUN: %target-swift-frontend -emit-sil -primary-file %s | %FileCheck %s // Test to ensure that mandatory inlining of generics with a dynamic Self // substitution works correctly with thick_metatype instructions and SIL diff --git a/test/SILOptimizer/globalopt_global_propagation.swift b/test/SILOptimizer/globalopt_global_propagation.swift index 57b5d75401b..edcf0676c4e 100644 --- a/test/SILOptimizer/globalopt_global_propagation.swift +++ b/test/SILOptimizer/globalopt_global_propagation.swift @@ -1,5 +1,5 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -O -emit-sil %s | %FileCheck %s -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -O -wmo -emit-sil %s | %FileCheck -check-prefix=CHECK-WMO %s +// RUN: %target-swift-frontend -O -emit-sil %s | %FileCheck %s +// RUN: %target-swift-frontend -O -wmo -emit-sil %s | %FileCheck -check-prefix=CHECK-WMO %s // Check that values of internal and private global variables, which are provably assigned only // once, are propagated into their uses and enable further optimizations like constant diff --git a/test/SILOptimizer/globalopt_let_propagation.swift b/test/SILOptimizer/globalopt_let_propagation.swift index 8a19783efb3..48b0cdf42ad 100644 --- a/test/SILOptimizer/globalopt_let_propagation.swift +++ b/test/SILOptimizer/globalopt_let_propagation.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -O -emit-sil -primary-file %s | %FileCheck %s +// RUN: %target-swift-frontend -O -emit-sil -primary-file %s | %FileCheck %s // Check that values of static let and global let variables are propagated into their uses // and enable further optimizations like constant propagation, simplifications, etc. diff --git a/test/SILOptimizer/inline_deep.swift b/test/SILOptimizer/inline_deep.swift index b29545450ff..f14f1516cf1 100644 --- a/test/SILOptimizer/inline_deep.swift +++ b/test/SILOptimizer/inline_deep.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -O -emit-sil %s | %FileCheck %s +// RUN: %target-swift-frontend -O -emit-sil %s | %FileCheck %s class S { @inline(__always) func l0(_ x: T) -> T { return x } diff --git a/test/SILOptimizer/inline_recursive.swift b/test/SILOptimizer/inline_recursive.swift index 2d8a5148383..0440fbf1f3e 100644 --- a/test/SILOptimizer/inline_recursive.swift +++ b/test/SILOptimizer/inline_recursive.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -primary-file %s -parse-as-library -emit-sil -O | %FileCheck %s +// RUN: %target-swift-frontend -primary-file %s -parse-as-library -emit-sil -O | %FileCheck %s private func recFunc(_ x: Int32) -> Int32 { if x > 0 { diff --git a/test/SILOptimizer/inline_self.swift b/test/SILOptimizer/inline_self.swift index b60362d70d3..761d54cb40a 100644 --- a/test/SILOptimizer/inline_self.swift +++ b/test/SILOptimizer/inline_self.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -Xllvm -sil-full-demangle -O -emit-sil -primary-file %s | %FileCheck %s +// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -O -emit-sil -primary-file %s | %FileCheck %s // // This is a .swift test because the SIL parser does not support Self. diff --git a/test/SILOptimizer/inline_thunk.swift b/test/SILOptimizer/inline_thunk.swift index bb6db66583d..69b41224292 100644 --- a/test/SILOptimizer/inline_thunk.swift +++ b/test/SILOptimizer/inline_thunk.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -primary-file %s -parse-as-library -emit-ir -O | %FileCheck %s +// RUN: %target-swift-frontend -primary-file %s -parse-as-library -emit-ir -O | %FileCheck %s // Two thunks are generated: // 1. from function signature opts diff --git a/test/SILOptimizer/inout_deshadow_integration.swift b/test/SILOptimizer/inout_deshadow_integration.swift index d42d55efdba..e47bb2bda35 100644 --- a/test/SILOptimizer/inout_deshadow_integration.swift +++ b/test/SILOptimizer/inout_deshadow_integration.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests %s -emit-sil | %FileCheck %s +// RUN: %target-swift-frontend %s -emit-sil | %FileCheck %s // This is an integration check for the inout-deshadow pass, verifying that it // deshadows the inout variables in certain cases. These test should not be diff --git a/test/SILOptimizer/let_propagation.swift b/test/SILOptimizer/let_propagation.swift index 683195862ea..322d48c61ce 100644 --- a/test/SILOptimizer/let_propagation.swift +++ b/test/SILOptimizer/let_propagation.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -primary-file %s -emit-sil -O | %FileCheck %s +// RUN: %target-swift-frontend -primary-file %s -emit-sil -O | %FileCheck %s // Check that LoadStoreOpts can handle "let" variables properly. // Such variables should be loaded only once and their loaded values can be reused. diff --git a/test/SILOptimizer/let_properties_opts.swift b/test/SILOptimizer/let_properties_opts.swift index 749771f3525..c1754f0a2f1 100644 --- a/test/SILOptimizer/let_properties_opts.swift +++ b/test/SILOptimizer/let_properties_opts.swift @@ -1,5 +1,5 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests %s -O -emit-sil | %FileCheck -check-prefix=CHECK-WMO %s -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -primary-file %s -O -emit-sil | %FileCheck %s +// RUN: %target-swift-frontend %s -O -emit-sil | %FileCheck -check-prefix=CHECK-WMO %s +// RUN: %target-swift-frontend -primary-file %s -O -emit-sil | %FileCheck %s // Test propagation of non-static let properties with compile-time constant values. diff --git a/test/SILOptimizer/mandatory_inlining.swift b/test/SILOptimizer/mandatory_inlining.swift index 750add876bf..39b686994ac 100644 --- a/test/SILOptimizer/mandatory_inlining.swift +++ b/test/SILOptimizer/mandatory_inlining.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -primary-file %s -emit-sil -o - -verify | %FileCheck %s +// RUN: %target-swift-frontend -primary-file %s -emit-sil -o - -verify | %FileCheck %s // These tests are deliberately shallow, because I do not want to depend on the // specifics of SIL generation, which might change for reasons unrelated to this diff --git a/test/SILOptimizer/mandatory_inlining_devirt.swift b/test/SILOptimizer/mandatory_inlining_devirt.swift index 97873d1bc0d..9c57435517c 100644 --- a/test/SILOptimizer/mandatory_inlining_devirt.swift +++ b/test/SILOptimizer/mandatory_inlining_devirt.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests %s -module-name test -emit-sil -o - -verify | %FileCheck %s +// RUN: %target-swift-frontend %s -module-name test -emit-sil -o - -verify | %FileCheck %s // Constructor calls are dispatched dynamically for open classes, even if diff --git a/test/SILOptimizer/no_opt.swift b/test/SILOptimizer/no_opt.swift index c56d4ffdf1a..26f20226f9e 100644 --- a/test/SILOptimizer/no_opt.swift +++ b/test/SILOptimizer/no_opt.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -O -emit-sil %s | %FileCheck %s +// RUN: %target-swift-frontend -O -emit-sil %s | %FileCheck %s func bar(_ x : Int) { } diff --git a/test/SILOptimizer/opaque_values_mandatory.sil b/test/SILOptimizer/opaque_values_mandatory.sil index a59eac6e5c7..89ddb5cbbbe 100644 --- a/test/SILOptimizer/opaque_values_mandatory.sil +++ b/test/SILOptimizer/opaque_values_mandatory.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -diagnostics -enable-sil-opaque-values -emit-sorted-sil -new-mangling-for-tests %s | %FileCheck %s +// RUN: %target-sil-opt -diagnostics -enable-sil-opaque-values -emit-sorted-sil %s | %FileCheck %s import Builtin diff --git a/test/SILOptimizer/opaque_values_opt.sil b/test/SILOptimizer/opaque_values_opt.sil index 506447af820..3923fbb56ee 100644 --- a/test/SILOptimizer/opaque_values_opt.sil +++ b/test/SILOptimizer/opaque_values_opt.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -O -enable-sil-opaque-values -emit-sorted-sil -new-mangling-for-tests -assume-parsing-unqualified-ownership-sil %s | %FileCheck %s +// RUN: %target-sil-opt -O -enable-sil-opaque-values -emit-sorted-sil -assume-parsing-unqualified-ownership-sil %s | %FileCheck %s import Builtin diff --git a/test/SILOptimizer/predictable_memopt_unreferenceable_storage.swift b/test/SILOptimizer/predictable_memopt_unreferenceable_storage.swift index 56f5936962a..0d6e20c3a53 100644 --- a/test/SILOptimizer/predictable_memopt_unreferenceable_storage.swift +++ b/test/SILOptimizer/predictable_memopt_unreferenceable_storage.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -Xllvm -new-mangling-for-tests -emit-sil %s | %FileCheck %s +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -emit-sil %s | %FileCheck %s import ctypes struct S { diff --git a/test/SILOptimizer/prespecialization_with_definition.sil b/test/SILOptimizer/prespecialization_with_definition.sil index a84fd3e1b21..ed37a0cc35f 100644 --- a/test/SILOptimizer/prespecialization_with_definition.sil +++ b/test/SILOptimizer/prespecialization_with_definition.sil @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-ir %s -module-name main | %FileCheck %s +// RUN: %target-swift-frontend -emit-ir %s -module-name main | %FileCheck %s sil_stage canonical diff --git a/test/SILOptimizer/protocol_lookup.swift b/test/SILOptimizer/protocol_lookup.swift index 1d1b3884ecc..69da550fcf8 100644 --- a/test/SILOptimizer/protocol_lookup.swift +++ b/test/SILOptimizer/protocol_lookup.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -O -emit-sil -primary-file %s | %FileCheck %s +// RUN: %target-swift-frontend -O -emit-sil -primary-file %s | %FileCheck %s // Check that this file can be compiled using -O at all (it used to crash due to a bug in the SILCloner) // Check that it can be compiled correctly. diff --git a/test/SILOptimizer/sil_combine_objc_bridge.sil b/test/SILOptimizer/sil_combine_objc_bridge.sil index 15a7ceeec6f..0ff467a61a2 100644 --- a/test/SILOptimizer/sil_combine_objc_bridge.sil +++ b/test/SILOptimizer/sil_combine_objc_bridge.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -new-mangling-for-tests -assume-parsing-unqualified-ownership-sil -enable-sil-verify-all %s -sil-combine | %FileCheck %s +// RUN: %target-sil-opt -assume-parsing-unqualified-ownership-sil -enable-sil-verify-all %s -sil-combine | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/SILOptimizer/sil_locations.swift b/test/SILOptimizer/sil_locations.swift index 57ef9f24ff9..721262c0e50 100644 --- a/test/SILOptimizer/sil_locations.swift +++ b/test/SILOptimizer/sil_locations.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -primary-file %s -emit-sil -emit-verbose-sil | %FileCheck %s +// RUN: %target-swift-frontend -primary-file %s -emit-sil -emit-verbose-sil | %FileCheck %s func searchForMe(_ x: Float) -> Float { return x diff --git a/test/SILOptimizer/spec_archetype_method.swift b/test/SILOptimizer/spec_archetype_method.swift index 9a79698025d..ab61012af37 100644 --- a/test/SILOptimizer/spec_archetype_method.swift +++ b/test/SILOptimizer/spec_archetype_method.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -O -Xllvm -sil-disable-pass="Function Signature Optimization" -disable-arc-opts -emit-sil -primary-file %s | %FileCheck %s +// RUN: %target-swift-frontend -O -Xllvm -sil-disable-pass="Function Signature Optimization" -disable-arc-opts -emit-sil -primary-file %s | %FileCheck %s // We can't deserialize apply_inst with subst lists. When radar://14443304 // is fixed then we should convert this test to a SIL test. diff --git a/test/SILOptimizer/spec_conf1.swift b/test/SILOptimizer/spec_conf1.swift index 7336ff5d654..12716cfb2aa 100644 --- a/test/SILOptimizer/spec_conf1.swift +++ b/test/SILOptimizer/spec_conf1.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -O -Xllvm -sil-disable-pass="Function Signature Optimization" -disable-arc-opts -emit-sil -Xllvm -enable-destroyhoisting=false %s | %FileCheck %s +// RUN: %target-swift-frontend -O -Xllvm -sil-disable-pass="Function Signature Optimization" -disable-arc-opts -emit-sil -Xllvm -enable-destroyhoisting=false %s | %FileCheck %s // We can't deserialize apply_inst with subst lists. When radar://14443304 // is fixed then we should convert this test to a SIL test. diff --git a/test/SILOptimizer/spec_conf2.swift b/test/SILOptimizer/spec_conf2.swift index 8d8a807fe62..4e584bd9191 100644 --- a/test/SILOptimizer/spec_conf2.swift +++ b/test/SILOptimizer/spec_conf2.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -O -Xllvm -sil-disable-pass="Function Signature Optimization" -disable-arc-opts -emit-sil -Xllvm -enable-destroyhoisting=false %s | %FileCheck %s +// RUN: %target-swift-frontend -O -Xllvm -sil-disable-pass="Function Signature Optimization" -disable-arc-opts -emit-sil -Xllvm -enable-destroyhoisting=false %s | %FileCheck %s // We can't deserialize apply_inst with subst lists. When radar://14443304 // is fixed then we should convert this test to a SIL test. diff --git a/test/SILOptimizer/spec_recursion.swift b/test/SILOptimizer/spec_recursion.swift index f9445d9c9ef..13d854dc6aa 100644 --- a/test/SILOptimizer/spec_recursion.swift +++ b/test/SILOptimizer/spec_recursion.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -O -emit-sil %s | %FileCheck %s +// RUN: %target-swift-frontend -O -emit-sil %s | %FileCheck %s // Make sure we are not looping forever. diff --git a/test/SILOptimizer/specialize_apply_conf.swift b/test/SILOptimizer/specialize_apply_conf.swift index 71634799bb1..6c467fc7171 100644 --- a/test/SILOptimizer/specialize_apply_conf.swift +++ b/test/SILOptimizer/specialize_apply_conf.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -O -sil-inline-threshold 0 -emit-sil -primary-file %s | %FileCheck %s +// RUN: %target-swift-frontend -O -sil-inline-threshold 0 -emit-sil -primary-file %s | %FileCheck %s // We can't deserialize apply_inst with subst lists. When radar://14443304 // is fixed then we should convert this test to a SIL test. diff --git a/test/SILOptimizer/specialize_chain.swift b/test/SILOptimizer/specialize_chain.swift index 1e014ec910b..df5890049e7 100644 --- a/test/SILOptimizer/specialize_chain.swift +++ b/test/SILOptimizer/specialize_chain.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -O -Xllvm -sil-disable-pass="Function Signature Optimization" -emit-sil -primary-file %s | %FileCheck %s +// RUN: %target-swift-frontend -O -Xllvm -sil-disable-pass="Function Signature Optimization" -emit-sil -primary-file %s | %FileCheck %s // We can't deserialize apply_inst with subst lists. When radar://14443304 // is fixed then we should convert this test to a SIL test. diff --git a/test/SILOptimizer/specialize_checked_cast_branch.swift b/test/SILOptimizer/specialize_checked_cast_branch.swift index 23018c1fd77..547c3ed8507 100644 --- a/test/SILOptimizer/specialize_checked_cast_branch.swift +++ b/test/SILOptimizer/specialize_checked_cast_branch.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-sil -O -sil-inline-threshold 0 %s -o - | %FileCheck %s +// RUN: %target-swift-frontend -emit-sil -O -sil-inline-threshold 0 %s -o - | %FileCheck %s class C {} class D : C {} diff --git a/test/SILOptimizer/specialize_class_inherits_base_inherits_protocol.swift b/test/SILOptimizer/specialize_class_inherits_base_inherits_protocol.swift index 488df39e44f..c5b23753d76 100644 --- a/test/SILOptimizer/specialize_class_inherits_base_inherits_protocol.swift +++ b/test/SILOptimizer/specialize_class_inherits_base_inherits_protocol.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-sil -O %s | %FileCheck %s +// RUN: %target-swift-frontend -emit-sil -O %s | %FileCheck %s protocol P { func p() -> Any.Type } protocol Q: P { } diff --git a/test/SILOptimizer/specialize_deep_generics.swift b/test/SILOptimizer/specialize_deep_generics.swift index 1f106b1456a..3949ed06d71 100644 --- a/test/SILOptimizer/specialize_deep_generics.swift +++ b/test/SILOptimizer/specialize_deep_generics.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -O -emit-sil %s | %FileCheck %s +// RUN: %target-swift-frontend -O -emit-sil %s | %FileCheck %s // Check that this Church Numerals inspired example does not hang // a compiler in the generic specializer. diff --git a/test/SILOptimizer/specialize_default_witness.sil b/test/SILOptimizer/specialize_default_witness.sil index 56d9c4f90d4..324e44c4db6 100644 --- a/test/SILOptimizer/specialize_default_witness.sil +++ b/test/SILOptimizer/specialize_default_witness.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -new-mangling-for-tests -assume-parsing-unqualified-ownership-sil -enable-sil-verify-all -generic-specializer %s | %FileCheck %s +// RUN: %target-sil-opt -assume-parsing-unqualified-ownership-sil -enable-sil-verify-all -generic-specializer %s | %FileCheck %s sil_stage canonical diff --git a/test/SILOptimizer/specialize_ext.swift b/test/SILOptimizer/specialize_ext.swift index bcf0d9a9e32..5558ef0f281 100644 --- a/test/SILOptimizer/specialize_ext.swift +++ b/test/SILOptimizer/specialize_ext.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -O -emit-sil -primary-file %s | %FileCheck %s +// RUN: %target-swift-frontend -O -emit-sil -primary-file %s | %FileCheck %s struct XXX { init(t : T) {m_t = t} diff --git a/test/SILOptimizer/specialize_inherited.sil b/test/SILOptimizer/specialize_inherited.sil index 03d05450946..df8f03d0a47 100644 --- a/test/SILOptimizer/specialize_inherited.sil +++ b/test/SILOptimizer/specialize_inherited.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -new-mangling-for-tests -assume-parsing-unqualified-ownership-sil -enable-sil-verify-all %s -generic-specializer -module-name inherit | %FileCheck %s +// RUN: %target-sil-opt -assume-parsing-unqualified-ownership-sil -enable-sil-verify-all %s -generic-specializer -module-name inherit | %FileCheck %s import Builtin import Swift diff --git a/test/SILOptimizer/specialize_inherited_multifile.swift b/test/SILOptimizer/specialize_inherited_multifile.swift index c15c9965e80..63b7523c61d 100644 --- a/test/SILOptimizer/specialize_inherited_multifile.swift +++ b/test/SILOptimizer/specialize_inherited_multifile.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -primary-file %s %S/Inputs/specialize_inherited_multifile.swift -O -emit-sil -sil-verify-all | %FileCheck %s +// RUN: %target-swift-frontend -primary-file %s %S/Inputs/specialize_inherited_multifile.swift -O -emit-sil -sil-verify-all | %FileCheck %s @_semantics("optimize.sil.never") func takesBase(t: T) {} diff --git a/test/SILOptimizer/specialize_partial_apply.swift b/test/SILOptimizer/specialize_partial_apply.swift index 0d3b71be193..d8a930c8720 100644 --- a/test/SILOptimizer/specialize_partial_apply.swift +++ b/test/SILOptimizer/specialize_partial_apply.swift @@ -1,5 +1,5 @@ // First check the SIL. -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -O -Xllvm -sil-disable-pass="Function Signature Optimization" -module-name=test -emit-sil -primary-file %s | %FileCheck %s +// RUN: %target-swift-frontend -O -Xllvm -sil-disable-pass="Function Signature Optimization" -module-name=test -emit-sil -primary-file %s | %FileCheck %s // Also do an end-to-end test to check all components, including IRGen. // RUN: rm -rf %t && mkdir -p %t diff --git a/test/SILOptimizer/specialize_property_behavior.swift b/test/SILOptimizer/specialize_property_behavior.swift index 2912b821e59..2e594583535 100644 --- a/test/SILOptimizer/specialize_property_behavior.swift +++ b/test/SILOptimizer/specialize_property_behavior.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-sil -parse-as-library -O -enable-experimental-property-behaviors %s | %FileCheck %s +// RUN: %target-swift-frontend -emit-sil -parse-as-library -O -enable-experimental-property-behaviors %s | %FileCheck %s @inline(never) func whatever() -> T { fatalError("") } diff --git a/test/SILOptimizer/specialize_reabstraction.sil b/test/SILOptimizer/specialize_reabstraction.sil index f69b2de27c8..a308549a858 100644 --- a/test/SILOptimizer/specialize_reabstraction.sil +++ b/test/SILOptimizer/specialize_reabstraction.sil @@ -1,4 +1,4 @@ -// RUN: %target-sil-opt -new-mangling-for-tests -assume-parsing-unqualified-ownership-sil -enable-sil-verify-all -generic-specializer %s | %FileCheck %s +// RUN: %target-sil-opt -assume-parsing-unqualified-ownership-sil -enable-sil-verify-all -generic-specializer %s | %FileCheck %s sil_stage canonical diff --git a/test/SILOptimizer/specialize_refined_adds_constraints.swift b/test/SILOptimizer/specialize_refined_adds_constraints.swift index 009ca94afa3..89aa3e23abe 100644 --- a/test/SILOptimizer/specialize_refined_adds_constraints.swift +++ b/test/SILOptimizer/specialize_refined_adds_constraints.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -O -sil-inline-threshold 0 -emit-sil -primary-file %s | %FileCheck %s +// RUN: %target-swift-frontend -O -sil-inline-threshold 0 -emit-sil -primary-file %s | %FileCheck %s protocol P { } diff --git a/test/SILOptimizer/specialize_same_type_constraint.swift b/test/SILOptimizer/specialize_same_type_constraint.swift index c38bf34bcd5..c84a1267031 100644 --- a/test/SILOptimizer/specialize_same_type_constraint.swift +++ b/test/SILOptimizer/specialize_same_type_constraint.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -O -emit-sil -primary-file %s | %FileCheck %s +// RUN: %target-swift-frontend -O -emit-sil -primary-file %s | %FileCheck %s protocol FirstChild {} diff --git a/test/SILOptimizer/specialize_self.swift b/test/SILOptimizer/specialize_self.swift index 8b3e1a0c9b4..b9130025b45 100644 --- a/test/SILOptimizer/specialize_self.swift +++ b/test/SILOptimizer/specialize_self.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -Xllvm -sil-full-demangle -O -sil-inline-threshold 0 -emit-sil -primary-file %s | %FileCheck %s +// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -O -sil-inline-threshold 0 -emit-sil -primary-file %s | %FileCheck %s // CHECK-NOT: generic specialization of specialize_self.cast (A) -> Swift.Optional diff --git a/test/SILOptimizer/specialize_unconditional_checked_cast.swift b/test/SILOptimizer/specialize_unconditional_checked_cast.swift index da575ff8c52..1b3a2794847 100644 --- a/test/SILOptimizer/specialize_unconditional_checked_cast.swift +++ b/test/SILOptimizer/specialize_unconditional_checked_cast.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -Xllvm -sil-disable-pass="Function Signature Optimization" -emit-sil -o - -O %s | %FileCheck %s +// RUN: %target-swift-frontend -Xllvm -sil-disable-pass="Function Signature Optimization" -emit-sil -o - -O %s | %FileCheck %s ////////////////// // Declarations // diff --git a/test/SILOptimizer/stack_promotion_escaping.swift b/test/SILOptimizer/stack_promotion_escaping.swift index d6b646ff33d..53c2e75bd92 100644 --- a/test/SILOptimizer/stack_promotion_escaping.swift +++ b/test/SILOptimizer/stack_promotion_escaping.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -parse-as-library -O -module-name=test %s -emit-sil | %FileCheck %s +// RUN: %target-swift-frontend -parse-as-library -O -module-name=test %s -emit-sil | %FileCheck %s final class Item {} diff --git a/test/SILOptimizer/super_class_method.swift b/test/SILOptimizer/super_class_method.swift index cef0c957d57..7f1fd5fc82e 100644 --- a/test/SILOptimizer/super_class_method.swift +++ b/test/SILOptimizer/super_class_method.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-sil %s | %FileCheck %s +// RUN: %target-swift-frontend -emit-sil %s | %FileCheck %s class Parent { @inline(never) diff --git a/test/SILOptimizer/super_init.swift b/test/SILOptimizer/super_init.swift index 455517028fd..ff1fa128f9b 100644 --- a/test/SILOptimizer/super_init.swift +++ b/test/SILOptimizer/super_init.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-sil %s | %FileCheck %s +// RUN: %target-swift-frontend -emit-sil %s | %FileCheck %s // CHECK-LABEL: sil hidden [noinline] @_T010super_init3FooCACSicfC : $@convention(method) (Int, @thick Foo.Type) -> @owned Foo // CHECK-NOT: class_method diff --git a/test/SILOptimizer/super_method.swift b/test/SILOptimizer/super_method.swift index fa8d28e8d68..639005352c2 100644 --- a/test/SILOptimizer/super_method.swift +++ b/test/SILOptimizer/super_method.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-sil %s | %FileCheck %s +// RUN: %target-swift-frontend -emit-sil %s | %FileCheck %s class Parent { @inline(never) diff --git a/test/SILOptimizer/super_objc_class_method.swift b/test/SILOptimizer/super_objc_class_method.swift index 0b61224cd89..574f29a113e 100644 --- a/test/SILOptimizer/super_objc_class_method.swift +++ b/test/SILOptimizer/super_objc_class_method.swift @@ -1,5 +1,5 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-sil %s | %FileCheck %s -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-sil -I %S/Inputs -enable-source-import %s | %FileCheck %s +// RUN: %target-swift-frontend -emit-sil %s | %FileCheck %s +// RUN: %target-swift-frontend -emit-sil -I %S/Inputs -enable-source-import %s | %FileCheck %s // REQUIRES: objc_interop diff --git a/test/SILOptimizer/throw_inline.swift b/test/SILOptimizer/throw_inline.swift index f5e7e1a0057..909d92e36fb 100644 --- a/test/SILOptimizer/throw_inline.swift +++ b/test/SILOptimizer/throw_inline.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-sil %s | %FileCheck %s +// RUN: %target-swift-frontend -emit-sil %s | %FileCheck %s // Make sure that we are able to inline try-apply instructions. diff --git a/test/SILOptimizer/unused_containers.swift b/test/SILOptimizer/unused_containers.swift index ec0859301dc..3415cf684bf 100644 --- a/test/SILOptimizer/unused_containers.swift +++ b/test/SILOptimizer/unused_containers.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -primary-file %s -O -emit-sil | grep -v 'builtin "onFastPath"' | %FileCheck %s +// RUN: %target-swift-frontend -primary-file %s -O -emit-sil | grep -v 'builtin "onFastPath"' | %FileCheck %s // REQUIRES: swift_stdlib_no_asserts // XFAIL: resilient_stdlib diff --git a/test/Serialization/always_inline.swift b/test/Serialization/always_inline.swift index 0c31e77f418..de361c81167 100644 --- a/test/Serialization/always_inline.swift +++ b/test/Serialization/always_inline.swift @@ -1,8 +1,8 @@ // RUN: rm -rf %t // RUN: mkdir -p %t -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-module -sil-serialize-all -o %t %S/Inputs/def_always_inline.swift +// RUN: %target-swift-frontend -emit-module -sil-serialize-all -o %t %S/Inputs/def_always_inline.swift // RUN: llvm-bcanalyzer %t/def_always_inline.swiftmodule | %FileCheck %s -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen -sil-link-all -I %t %s | %FileCheck %s -check-prefix=SIL +// RUN: %target-swift-frontend -emit-silgen -sil-link-all -I %t %s | %FileCheck %s -check-prefix=SIL // CHECK-NOT: UnknownCode diff --git a/test/Serialization/basic_sil.swift b/test/Serialization/basic_sil.swift index a3595c652d5..c0ee5240b36 100644 --- a/test/Serialization/basic_sil.swift +++ b/test/Serialization/basic_sil.swift @@ -1,13 +1,13 @@ // RUN: rm -rf %t // RUN: mkdir -p %t -// RUN: %target-build-swift -Xllvm -new-mangling-for-tests -Xfrontend -assume-parsing-unqualified-ownership-sil -emit-module -Xfrontend -disable-diagnostic-passes -Xfrontend -sil-serialize-all -force-single-frontend-invocation -o %t/def_basic.swiftmodule %S/Inputs/def_basic.sil +// RUN: %target-build-swift -Xfrontend -assume-parsing-unqualified-ownership-sil -emit-module -Xfrontend -disable-diagnostic-passes -Xfrontend -sil-serialize-all -force-single-frontend-invocation -o %t/def_basic.swiftmodule %S/Inputs/def_basic.sil // RUN: llvm-bcanalyzer %t/def_basic.swiftmodule | %FileCheck %s -// RUN: %target-build-swift -Xllvm -new-mangling-for-tests -emit-silgen -Xfrontend -sil-link-all -I %t %s | %FileCheck %S/Inputs/def_basic.sil +// RUN: %target-build-swift -emit-silgen -Xfrontend -sil-link-all -I %t %s | %FileCheck %S/Inputs/def_basic.sil // RUN: rm -rf %t // RUN: mkdir -p %t -// RUN: %target-build-swift -Xllvm -new-mangling-for-tests -Xfrontend -assume-parsing-unqualified-ownership-sil -emit-module -Xfrontend -disable-diagnostic-passes -force-single-frontend-invocation -Xfrontend -sil-serialize-all -o %t/def_basic.swiftmodule %S/Inputs/def_basic.sil -// RUN: %target-build-swift -Xllvm -new-mangling-for-tests -emit-silgen -Xfrontend -sil-link-all -I %t %s | %FileCheck -check-prefix=CHECK_DECL %S/Inputs/def_basic.sil +// RUN: %target-build-swift -Xfrontend -assume-parsing-unqualified-ownership-sil -emit-module -Xfrontend -disable-diagnostic-passes -force-single-frontend-invocation -Xfrontend -sil-serialize-all -o %t/def_basic.swiftmodule %S/Inputs/def_basic.sil +// RUN: %target-build-swift -emit-silgen -Xfrontend -sil-link-all -I %t %s | %FileCheck -check-prefix=CHECK_DECL %S/Inputs/def_basic.sil // This test currently is written such that no optimizations are assumed. // REQUIRES: swift_test_mode_optimize_none diff --git a/test/Serialization/basic_sil_objc.swift b/test/Serialization/basic_sil_objc.swift index 942d2f7fc7f..a74ca4cfda1 100644 --- a/test/Serialization/basic_sil_objc.swift +++ b/test/Serialization/basic_sil_objc.swift @@ -1,8 +1,8 @@ // RUN: rm -rf %t // RUN: mkdir -p %t -// RUN: %target-build-swift -Xllvm -new-mangling-for-tests -Xfrontend %clang-importer-sdk -I %S/../Inputs/clang-importer-sdk/swift-modules -emit-module -Xfrontend -disable-diagnostic-passes -Xfrontend -sil-serialize-all -force-single-frontend-invocation -o %t/def_basic_objc.swiftmodule %S/Inputs/def_basic_objc.sil +// RUN: %target-build-swift -Xfrontend %clang-importer-sdk -I %S/../Inputs/clang-importer-sdk/swift-modules -emit-module -Xfrontend -disable-diagnostic-passes -Xfrontend -sil-serialize-all -force-single-frontend-invocation -o %t/def_basic_objc.swiftmodule %S/Inputs/def_basic_objc.sil // RUN: llvm-bcanalyzer %t/def_basic_objc.swiftmodule | %FileCheck %s -// RUN: %target-build-swift -Xllvm -new-mangling-for-tests -Xfrontend %clang-importer-sdk -emit-silgen -Xfrontend -sil-link-all -I %t %s | %FileCheck %S/Inputs/def_basic_objc.sil +// RUN: %target-build-swift -Xfrontend %clang-importer-sdk -emit-silgen -Xfrontend -sil-link-all -I %t %s | %FileCheck %S/Inputs/def_basic_objc.sil // This test currently is written such that no optimizations are assumed. // REQUIRES: swift_test_mode_optimize_none diff --git a/test/Serialization/function.swift b/test/Serialization/function.swift index c9aab866bc2..4a18178bdbe 100644 --- a/test/Serialization/function.swift +++ b/test/Serialization/function.swift @@ -2,7 +2,7 @@ // RUN: mkdir -p %t // RUN: %target-swift-frontend -emit-module -o %t %S/Inputs/def_func.swift // RUN: llvm-bcanalyzer %t/def_func.swiftmodule | %FileCheck %s -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen -I %t %s | %FileCheck %s -check-prefix=SIL +// RUN: %target-swift-frontend -emit-silgen -I %t %s | %FileCheck %s -check-prefix=SIL // CHECK-NOT: FALL_BACK_TO_TRANSLATION_UNIT // CHECK-NOT: UnknownCode diff --git a/test/Serialization/generic_extension.swift b/test/Serialization/generic_extension.swift index 4a6fe51d919..40a7725d5ff 100644 --- a/test/Serialization/generic_extension.swift +++ b/test/Serialization/generic_extension.swift @@ -1,7 +1,7 @@ // RUN: rm -rf %t // RUN: mkdir -p %t // RUN: %target-swift-frontend -emit-module -o %t %S/Inputs/generic_extension_1.swift -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-sil -I %t %s | %FileCheck %s +// RUN: %target-swift-frontend -emit-sil -I %t %s | %FileCheck %s // We have to perform IRGen to actually check that the generic substitutions // are being used. diff --git a/test/Serialization/global_init.swift b/test/Serialization/global_init.swift index 70396163303..f4da0a47b20 100644 --- a/test/Serialization/global_init.swift +++ b/test/Serialization/global_init.swift @@ -1,8 +1,8 @@ // RUN: rm -rf %t // RUN: mkdir -p %t -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-module -parse-as-library -sil-serialize-all -o %t %s +// RUN: %target-swift-frontend -emit-module -parse-as-library -sil-serialize-all -o %t %s // RUN: llvm-bcanalyzer %t/global_init.swiftmodule | %FileCheck %s -check-prefix=BCANALYZER -// RUN: %target-sil-opt -new-mangling-for-tests -enable-sil-verify-all %t/global_init.swiftmodule | %FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all %t/global_init.swiftmodule | %FileCheck %s // BCANALYZER-NOT: UnknownCode diff --git a/test/Serialization/noinline.swift b/test/Serialization/noinline.swift index 159a269f238..26d1dd2fcdc 100644 --- a/test/Serialization/noinline.swift +++ b/test/Serialization/noinline.swift @@ -1,8 +1,8 @@ // RUN: rm -rf %t // RUN: mkdir -p %t -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-module -sil-serialize-all -o %t %S/Inputs/def_noinline.swift +// RUN: %target-swift-frontend -emit-module -sil-serialize-all -o %t %S/Inputs/def_noinline.swift // RUN: llvm-bcanalyzer %t/def_noinline.swiftmodule | %FileCheck %s -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen -sil-link-all -I %t %s | %FileCheck %s -check-prefix=SIL +// RUN: %target-swift-frontend -emit-silgen -sil-link-all -I %t %s | %FileCheck %s -check-prefix=SIL // CHECK-NOT: UnknownCode diff --git a/test/Serialization/objc.swift b/test/Serialization/objc.swift index ccc5f65d474..ad8788613bb 100644 --- a/test/Serialization/objc.swift +++ b/test/Serialization/objc.swift @@ -2,7 +2,7 @@ // RUN: mkdir -p %t // RUN: %target-swift-frontend -emit-module -o %t %S/Inputs/def_objc.swift -disable-objc-attr-requires-foundation-module // RUN: llvm-bcanalyzer %t/def_objc.swiftmodule | %FileCheck %s -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen -I %t %s -o - | %FileCheck %s -check-prefix=SIL +// RUN: %target-swift-frontend -emit-silgen -I %t %s -o - | %FileCheck %s -check-prefix=SIL // CHECK-NOT: UnknownCode diff --git a/test/Serialization/serialize_attr.swift b/test/Serialization/serialize_attr.swift index 04b4d5c2523..78f9f48cc1f 100644 --- a/test/Serialization/serialize_attr.swift +++ b/test/Serialization/serialize_attr.swift @@ -1,8 +1,8 @@ // RUN: rm -rf %t // RUN: mkdir -p %t -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-module -parse-as-library -sil-serialize-all -o %t %s +// RUN: %target-swift-frontend -emit-module -parse-as-library -sil-serialize-all -o %t %s // RUN: llvm-bcanalyzer %t/serialize_attr.swiftmodule | %FileCheck %s -check-prefix=BCANALYZER -// RUN: %target-sil-opt -new-mangling-for-tests -enable-sil-verify-all %t/serialize_attr.swiftmodule | %FileCheck %s +// RUN: %target-sil-opt -enable-sil-verify-all %t/serialize_attr.swiftmodule | %FileCheck %s // BCANALYZER-NOT: UnknownCode diff --git a/test/Serialization/transparent-std.swift b/test/Serialization/transparent-std.swift index 1aebd76c85d..7e1841dee38 100644 --- a/test/Serialization/transparent-std.swift +++ b/test/Serialization/transparent-std.swift @@ -1,8 +1,8 @@ // RUN: rm -rf %t // RUN: mkdir -p %t -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-module -parse-stdlib -o %t %S/Inputs/def_transparent_std.swift +// RUN: %target-swift-frontend -emit-module -parse-stdlib -o %t %S/Inputs/def_transparent_std.swift // RUN: llvm-bcanalyzer %t/def_transparent_std.swiftmodule | %FileCheck %s -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -assume-parsing-unqualified-ownership-sil -emit-sil -Xllvm -sil-disable-pass="External Defs To Decls" -sil-debug-serialization -parse-stdlib -I %t %s | %FileCheck %s -check-prefix=SIL +// RUN: %target-swift-frontend -assume-parsing-unqualified-ownership-sil -emit-sil -Xllvm -sil-disable-pass="External Defs To Decls" -sil-debug-serialization -parse-stdlib -I %t %s | %FileCheck %s -check-prefix=SIL // CHECK-NOT: UnknownCode diff --git a/test/Serialization/transparent.swift b/test/Serialization/transparent.swift index ce84847a1ff..d3028a79d8d 100644 --- a/test/Serialization/transparent.swift +++ b/test/Serialization/transparent.swift @@ -1,8 +1,8 @@ // RUN: rm -rf %t // RUN: mkdir -p %t -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-module -sil-serialize-all -o %t %S/Inputs/def_transparent.swift +// RUN: %target-swift-frontend -emit-module -sil-serialize-all -o %t %S/Inputs/def_transparent.swift // RUN: llvm-bcanalyzer %t/def_transparent.swiftmodule | %FileCheck %s -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests -emit-silgen -sil-link-all -I %t %s | %FileCheck %s -check-prefix=SIL +// RUN: %target-swift-frontend -emit-silgen -sil-link-all -I %t %s | %FileCheck %s -check-prefix=SIL // CHECK-NOT: UnknownCode diff --git a/test/multifile/protocol-conformance-member.swift b/test/multifile/protocol-conformance-member.swift index 9ec0b157813..00d48abe112 100644 --- a/test/multifile/protocol-conformance-member.swift +++ b/test/multifile/protocol-conformance-member.swift @@ -1,5 +1,5 @@ // RUN: rm -rf %t && mkdir -p %t -// RUN: %target-build-swift -Xllvm -new-mangling-for-tests -emit-library %s %S/Inputs/protocol-conformance-member-helper.swift -o %t/libTest.dylib -module-name Test +// RUN: %target-build-swift -emit-library %s %S/Inputs/protocol-conformance-member-helper.swift -o %t/libTest.dylib -module-name Test // RUN: llvm-nm %t/libTest.dylib | %FileCheck %s // CHECK: _T04Test10CoolStructV10coolFactorSdfg diff --git a/test/sil-func-extractor/basic.swift b/test/sil-func-extractor/basic.swift index 9d18c2fe275..bbc88f917c4 100644 --- a/test/sil-func-extractor/basic.swift +++ b/test/sil-func-extractor/basic.swift @@ -1,16 +1,16 @@ // Passing demangled name -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests %s -g -module-name basic -emit-sib -o - | %target-sil-func-extractor -module-name basic -func="basic.foo" | %FileCheck %s -check-prefix=EXTRACT-FOO -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests %s -g -module-name basic -emit-sib -o - | %target-sil-func-extractor -module-name basic -func="basic.X.test" | %FileCheck %s -check-prefix=EXTRACT-TEST -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests %s -g -module-name basic -emit-sib -o - | %target-sil-func-extractor -module-name basic -func="basic.Vehicle.init" | %FileCheck %s -check-prefix=EXTRACT-INIT -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests %s -g -module-name basic -emit-sib -o - | %target-sil-func-extractor -module-name basic -func="basic.Vehicle.now" | %FileCheck %s -check-prefix=EXTRACT-NOW +// RUN: %target-swift-frontend %s -g -module-name basic -emit-sib -o - | %target-sil-func-extractor -module-name basic -func="basic.foo" | %FileCheck %s -check-prefix=EXTRACT-FOO +// RUN: %target-swift-frontend %s -g -module-name basic -emit-sib -o - | %target-sil-func-extractor -module-name basic -func="basic.X.test" | %FileCheck %s -check-prefix=EXTRACT-TEST +// RUN: %target-swift-frontend %s -g -module-name basic -emit-sib -o - | %target-sil-func-extractor -module-name basic -func="basic.Vehicle.init" | %FileCheck %s -check-prefix=EXTRACT-INIT +// RUN: %target-swift-frontend %s -g -module-name basic -emit-sib -o - | %target-sil-func-extractor -module-name basic -func="basic.Vehicle.now" | %FileCheck %s -check-prefix=EXTRACT-NOW // Passing mangled name -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests %s -g -module-name basic -emit-sib -o - | %target-sil-func-extractor -module-name basic -func="_T05basic3fooSiyF" | %FileCheck %s -check-prefix=EXTRACT-FOO -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests %s -g -module-name basic -emit-sib -o - | %target-sil-func-extractor -module-name basic -func="_T05basic1XV4testyyF" | %FileCheck %s -check-prefix=EXTRACT-TEST -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests %s -g -module-name basic -emit-sib -o - | %target-sil-func-extractor -module-name basic -func="_T05basic7VehicleCACSi1n_tcfc" | %FileCheck %s -check-prefix=EXTRACT-INIT -// RUN: %target-swift-frontend -Xllvm -new-mangling-for-tests %s -g -module-name basic -emit-sib -o - | %target-sil-func-extractor -module-name basic -func="_T05basic7VehicleC3nowSiyF" | %FileCheck %s -check-prefix=EXTRACT-NOW +// RUN: %target-swift-frontend %s -g -module-name basic -emit-sib -o - | %target-sil-func-extractor -module-name basic -func="_T05basic3fooSiyF" | %FileCheck %s -check-prefix=EXTRACT-FOO +// RUN: %target-swift-frontend %s -g -module-name basic -emit-sib -o - | %target-sil-func-extractor -module-name basic -func="_T05basic1XV4testyyF" | %FileCheck %s -check-prefix=EXTRACT-TEST +// RUN: %target-swift-frontend %s -g -module-name basic -emit-sib -o - | %target-sil-func-extractor -module-name basic -func="_T05basic7VehicleCACSi1n_tcfc" | %FileCheck %s -check-prefix=EXTRACT-INIT +// RUN: %target-swift-frontend %s -g -module-name basic -emit-sib -o - | %target-sil-func-extractor -module-name basic -func="_T05basic7VehicleC3nowSiyF" | %FileCheck %s -check-prefix=EXTRACT-NOW // EXTRACT-FOO-NOT: sil hidden @_T05basic1XV4testyyF : $@convention(method) (X) -> () { diff --git a/test/sil-llvm-gen/alloc.sil b/test/sil-llvm-gen/alloc.sil index ea956d91cc6..53b8a50f63e 100644 --- a/test/sil-llvm-gen/alloc.sil +++ b/test/sil-llvm-gen/alloc.sil @@ -1,9 +1,9 @@ -// RUN: %sil-llvm-gen -output-kind=llvm-as -new-mangling-for-tests -target x86_64-apple-macosx10.9 -module-name main %s -o - | %FileCheck %s -// RUN: %sil-llvm-gen -output-kind=llvm-as -new-mangling-for-tests -target i386-apple-ios7.0 %s -module-name main -o - | %FileCheck %s -// RUN: %sil-llvm-gen -output-kind=llvm-as -new-mangling-for-tests -target x86_64-apple-ios7.0 %s -module-name main -o - | %FileCheck %s -// RUN: %sil-llvm-gen -output-kind=llvm-as -new-mangling-for-tests -target armv7-apple-ios7.0 %s -module-name main -o - | %FileCheck %s -// RUN: %sil-llvm-gen -output-kind=llvm-as -new-mangling-for-tests -target arm64-apple-ios7.0 %s -module-name main -o - | %FileCheck %s -// RUN: %sil-llvm-gen -output-kind=llvm-as -new-mangling-for-tests -target x86_64-unknown-linux-gnu %s -module-name main -o - | %FileCheck %s +// RUN: %sil-llvm-gen -output-kind=llvm-as -target x86_64-apple-macosx10.9 -module-name main %s -o - | %FileCheck %s +// RUN: %sil-llvm-gen -output-kind=llvm-as -target i386-apple-ios7.0 %s -module-name main -o - | %FileCheck %s +// RUN: %sil-llvm-gen -output-kind=llvm-as -target x86_64-apple-ios7.0 %s -module-name main -o - | %FileCheck %s +// RUN: %sil-llvm-gen -output-kind=llvm-as -target armv7-apple-ios7.0 %s -module-name main -o - | %FileCheck %s +// RUN: %sil-llvm-gen -output-kind=llvm-as -target arm64-apple-ios7.0 %s -module-name main -o - | %FileCheck %s +// RUN: %sil-llvm-gen -output-kind=llvm-as -target x86_64-unknown-linux-gnu %s -module-name main -o - | %FileCheck %s // REQUIRES: CODEGENERATOR=X86 // REQUIRES: CODEGENERATOR=ARM diff --git a/test/stdlib/FloatingPointIR.swift b/test/stdlib/FloatingPointIR.swift index 6733b1a9876..539e29df658 100644 --- a/test/stdlib/FloatingPointIR.swift +++ b/test/stdlib/FloatingPointIR.swift @@ -1,6 +1,6 @@ -// RUN: %target-build-swift -Xllvm -new-mangling-for-tests -emit-ir %s | %FileCheck -check-prefix=%target-cpu %s -// RUN: %target-build-swift -Xllvm -new-mangling-for-tests -O -emit-ir %s | %FileCheck -check-prefix=%target-cpu %s -// RUN: %target-build-swift -Xllvm -new-mangling-for-tests -Ounchecked -emit-ir %s | %FileCheck -check-prefix=%target-cpu %s +// RUN: %target-build-swift -emit-ir %s | %FileCheck -check-prefix=%target-cpu %s +// RUN: %target-build-swift -O -emit-ir %s | %FileCheck -check-prefix=%target-cpu %s +// RUN: %target-build-swift -Ounchecked -emit-ir %s | %FileCheck -check-prefix=%target-cpu %s var globalFloat32 : Float32 = 0.0 var globalFloat64 : Float64 = 0.0