Fixup tests for -assume-parsing-unqualified-ownership-sil => [ossa] transition.

Author: gottesmm

test/APINotes/versioned.swift

@@ -251,14 +251,14 @@ func testRenamedOptionyEnum() {
 #if !swift(>=5)
 
 func useSwift4Name(_: ImportantCStruct) {}
-// CHECK-SILGEN-4: sil hidden @$s9versioned13useSwift4NameyySo11SomeCStructVF
+// CHECK-SILGEN-4: sil hidden [ossa] @$s9versioned13useSwift4NameyySo11SomeCStructVF
 
 func useNewlyNested(_: InnerInSwift5) {}
-// CHECK-SILGEN-4: sil hidden @$s9versioned14useNewlyNestedyySo13InnerInSwift5VF
+// CHECK-SILGEN-4: sil hidden [ossa] @$s9versioned14useNewlyNestedyySo13InnerInSwift5VF
 #endif
 
 func useSwift5Name(_: VeryImportantCStruct) {}
-// CHECK-SILGEN: sil hidden @$s9versioned13useSwift5NameyySo11SomeCStructVF
+// CHECK-SILGEN: sil hidden [ossa] @$s9versioned13useSwift5NameyySo11SomeCStructVF
 
 
 

test/ClangImporter/nullability_silgen.swift

@@ -9,7 +9,7 @@ import nullability
 import Foundation
 
 // null_resettable properties.
-// CHECK-LABEL: sil hidden @$s18nullability_silgen18testNullResettable{{[_0-9a-zA-Z]*}}F
+// CHECK-LABEL: sil hidden [ossa] @$s18nullability_silgen18testNullResettable{{[_0-9a-zA-Z]*}}F
 func testNullResettable(_ sc: SomeClass) {
   sc.defaultedProperty = nil
   sc.defaultedProperty = "hello"

test/ClangImporter/optional.swift

@@ -12,7 +12,7 @@ class A {
   @objc func foo() -> String? {
     return ""
   }
-// CHECK-LABEL:    sil hidden [thunk] @$s8optional1AC3fooSSSgyFTo : $@convention(objc_method) (A) -> @autoreleased Optional<NSString>
+// CHECK-LABEL:    sil hidden [thunk] [ossa] @$s8optional1AC3fooSSSgyFTo : $@convention(objc_method) (A) -> @autoreleased Optional<NSString>
 // CHECK:    bb0([[SELF:%.*]] : @unowned $A):
 // CHECK:      [[SELF_COPY:%.*]] = copy_value [[SELF]]
 // CHECK:      [[BORROWED_SELF_COPY:%.*]] = begin_borrow [[SELF_COPY]]
@@ -41,7 +41,7 @@ class A {
 // CHECK-NEXT: return [[T0]]
 
   @objc func bar(x x : String?) {}
-// CHECK-LABEL:    sil hidden [thunk] @$s8optional1AC3bar1xySSSg_tFTo : $@convention(objc_method) (Optional<NSString>, A) -> ()
+// CHECK-LABEL:    sil hidden [thunk] [ossa] @$s8optional1AC3bar1xySSSg_tFTo : $@convention(objc_method) (Optional<NSString>, A) -> ()
 // CHECK:    bb0([[ARG:%.*]] : @unowned $Optional<NSString>, [[SELF:%.*]] : @unowned $A):
 // CHECK:      [[ARG_COPY:%.*]] = copy_value [[ARG]]
 // CHECK:      [[SELF_COPY:%.*]] = copy_value [[SELF]]

test/Constraints/ranking.swift

@@ -30,7 +30,7 @@ func genericOverload<T>(_: T?) {}
 func genericOptional<T>(_: T?) {}
 func genericNoOptional<T>(_: T) {}
 
-// CHECK-LABEL: sil hidden @$s7ranking22propertyVersusFunctionyyAA1P_p_xtAaCRzlF
+// CHECK-LABEL: sil hidden [ossa] @$s7ranking22propertyVersusFunctionyyAA1P_p_xtAaCRzlF
 func propertyVersusFunction<T : P>(_ p: P, _ t: T) {
   // CHECK: witness_method $@opened("{{.*}}") P, #P.p!getter.1
   let _ = p.p
@@ -149,7 +149,7 @@ func f1(_ a: A) -> A { return a }
 func f1(_ b: B) -> B { return b }
 
 func testDerived(b: B) {
-  // CHECK-LABEL: sil hidden @$s7ranking11testDerived1byAA1BC_tF
+  // CHECK-LABEL: sil hidden [ossa] @$s7ranking11testDerived1byAA1BC_tF
   // CHECK: function_ref @$s7ranking2f1yAA1BCADF
   // CHECK: function_ref @$s7ranking2f0yyxlF
   f0(f1(b))
@@ -191,47 +191,47 @@ extension GenericClass {
 
 // Make sure we favour the class implementation over the protocol requirement.
 
-// CHECK-LABEL: sil hidden @$s7ranking32testGenericPropertyProtocolClassyyxAA1YCRbzAA1XRzlF
+// CHECK-LABEL: sil hidden [ossa] @$s7ranking32testGenericPropertyProtocolClassyyxAA1YCRbzAA1XRzlF
 func testGenericPropertyProtocolClass<T : X & Y>(_ t: T) {
   _ = t.foo   // CHECK: class_method {{%.*}} : $Y, #Y.foo!getter.1
   _ = t.bar   // CHECK: function_ref @$s7ranking1YC3barSivg
   _ = t.baz() // CHECK: class_method {{%.*}} : $Y, #Y.baz
   _ = t[""]   // CHECK: class_method {{%.*}} : $Y, #Y.subscript!getter.1
 }
 
-// CHECK-LABEL: sil hidden @$s7ranking36testExistentialPropertyProtocolClassyyAA1X_AA1YCXcF
+// CHECK-LABEL: sil hidden [ossa] @$s7ranking36testExistentialPropertyProtocolClassyyAA1X_AA1YCXcF
 func testExistentialPropertyProtocolClass(_ t: X & Y) {
   _ = t.foo   // CHECK: class_method {{%.*}} : $Y, #Y.foo!getter.1
   _ = t.bar   // CHECK: function_ref @$s7ranking1YC3barSivg
   _ = t.baz() // CHECK: class_method {{%.*}} : $Y, #Y.baz
   _ = t[""]   // CHECK: class_method {{%.*}} : $Y, #Y.subscript!getter.1
 }
 
-// CHECK-LABEL: sil hidden @$s7ranking46testGenericPropertySubclassConstrainedProtocolyyxAA1ZRzlF
+// CHECK-LABEL: sil hidden [ossa] @$s7ranking46testGenericPropertySubclassConstrainedProtocolyyxAA1ZRzlF
 func testGenericPropertySubclassConstrainedProtocol<T : Z>(_ t: T) {
   _ = t.foo   // CHECK: class_method {{%.*}} : $Y, #Y.foo!getter.1
   _ = t.bar   // CHECK: function_ref @$s7ranking1YC3barSivg
   _ = t.baz() // CHECK: class_method {{%.*}} : $Y, #Y.baz
   _ = t[""]   // CHECK: class_method {{%.*}} : $Y, #Y.subscript!getter.1
 }
 
-// CHECK-LABEL: sil hidden @$s7ranking50testExistentialPropertySubclassConstrainedProtocolyyAA1Z_pF
+// CHECK-LABEL: sil hidden [ossa] @$s7ranking50testExistentialPropertySubclassConstrainedProtocolyyAA1Z_pF
 func testExistentialPropertySubclassConstrainedProtocol(_ t: Z) {
   _ = t.foo   // CHECK: class_method {{%.*}} : $Y, #Y.foo!getter.1
   _ = t.bar   // CHECK: function_ref @$s7ranking1YC3barSivg
   _ = t.baz() // CHECK: class_method {{%.*}} : $Y, #Y.baz
   _ = t[""]   // CHECK: class_method {{%.*}} : $Y, #Y.subscript!getter.1
 }
 
-// CHECK-LABEL: sil hidden @$s7ranking43testExistentialPropertyProtocolGenericClassyyAA1X_AA0fG0CySiGXcF
+// CHECK-LABEL: sil hidden [ossa] @$s7ranking43testExistentialPropertyProtocolGenericClassyyAA1X_AA0fG0CySiGXcF
 func testExistentialPropertyProtocolGenericClass(_ t: GenericClass<Int> & X) {
   _ = t.foo   // CHECK: class_method {{%.*}} : $GenericClass<Int>, #GenericClass.foo!getter.1
   _ = t.bar   // CHECK: function_ref @$s7ranking12GenericClassC3barxvg
   _ = t.baz() // CHECK: class_method {{%.*}} : $GenericClass<Int>, #GenericClass.baz
   _ = t[""]   // CHECK: function_ref @$s7ranking12GenericClassCySiSScig
 }
 
-// CHECK-LABEL: sil hidden @$s7ranking43testExistentialPropertyProtocolGenericClassyyAA1X_AA0fG0CySSGXcF
+// CHECK-LABEL: sil hidden [ossa] @$s7ranking43testExistentialPropertyProtocolGenericClassyyAA1X_AA0fG0CySSGXcF
 func testExistentialPropertyProtocolGenericClass(_ t: GenericClass<String> & X) {
   _ = t.foo   // CHECK: class_method {{%.*}} : $GenericClass<String>, #GenericClass.foo!getter.1
   _ = t.bar   // CHECK: function_ref @$s7ranking12GenericClassC3barxvg
@@ -240,7 +240,7 @@ func testExistentialPropertyProtocolGenericClass(_ t: GenericClass<String> & X)
 }
 
 extension X where Self : Y {
-  // CHECK-LABEL: sil hidden @$s7ranking1XPA2A1YCRbzrlE32testGenericPropertyProtocolClassyyxF
+  // CHECK-LABEL: sil hidden [ossa] @$s7ranking1XPA2A1YCRbzrlE32testGenericPropertyProtocolClassyyxF
   func testGenericPropertyProtocolClass(_ x: Self) {
     _ = self.foo   // CHECK: class_method {{%.*}} : $Y, #Y.foo!getter.1
     _ = self.bar   // CHECK: function_ref @$s7ranking1YC3barSivg
@@ -250,7 +250,7 @@ extension X where Self : Y {
 }
 
 extension X where Self : GenericClass<Int> {
-  // CHECK-LABEL: sil hidden @$s7ranking1XPA2A12GenericClassCySiGRbzrlE04testb16PropertyProtocolbC0yyxF
+  // CHECK-LABEL: sil hidden [ossa] @$s7ranking1XPA2A12GenericClassCySiGRbzrlE04testb16PropertyProtocolbC0yyxF
   func testGenericPropertyProtocolGenericClass(_ x: Self) {
     _ = self.foo   // CHECK: class_method {{%.*}} : $GenericClass<Int>, #GenericClass.foo!getter.1
     _ = self.bar   // CHECK: function_ref @$s7ranking12GenericClassC3barxvg
@@ -260,7 +260,7 @@ extension X where Self : GenericClass<Int> {
 }
 
 extension X where Self : GenericClass<String> {
-  // CHECK-LABEL: sil hidden @$s7ranking1XPA2A12GenericClassCySSGRbzrlE04testb16PropertyProtocolbC0yyxF
+  // CHECK-LABEL: sil hidden [ossa] @$s7ranking1XPA2A12GenericClassCySSGRbzrlE04testb16PropertyProtocolbC0yyxF
   func testGenericPropertyProtocolGenericClass(_ x: Self) {
     _ = self.foo   // CHECK: class_method {{%.*}} : $GenericClass<String>, #GenericClass.foo!getter.1
     _ = self.bar   // CHECK: function_ref @$s7ranking12GenericClassC3barxvg
@@ -274,15 +274,15 @@ extension X where Self : GenericClass<String> {
 //--------------------------------------------------------------------
 
 struct UnsafePointerStruct {
-  // CHECK-LABEL: sil hidden @$s7ranking19UnsafePointerStructVyACSPyxGSgclufC : $@convention(method) <U> (Optional<UnsafePointer<U>>, @thin UnsafePointerStruct.Type) -> UnsafePointerStruct
+  // CHECK-LABEL: sil hidden [ossa] @$s7ranking19UnsafePointerStructVyACSPyxGSgclufC : $@convention(method) <U> (Optional<UnsafePointer<U>>, @thin UnsafePointerStruct.Type) -> UnsafePointerStruct
   init<U>(_ from: UnsafePointer<U>) {}
   init<U>(_ from: UnsafePointer<U>?) {
     // CHECK: function_ref @$s7ranking19UnsafePointerStructVyACSPyxGclufC : $@convention(method) <τ_0_0> (UnsafePointer<τ_0_0>, @thin UnsafePointerStruct.Type) -> UnsafePointerStruct
     self.init(from!)
   }
 }
 
-// CHECK-LABEL: sil hidden @$s7ranking22useUnsafePointerStructyySPyxGlF : $@convention(thin) <U> (UnsafePointer<U>) -> ()
+// CHECK-LABEL: sil hidden [ossa] @$s7ranking22useUnsafePointerStructyySPyxGlF : $@convention(thin) <U> (UnsafePointer<U>) -> ()
 func useUnsafePointerStruct<U>(_ ptr: UnsafePointer<U>) {
   // CHECK: function_ref @$s7ranking19UnsafePointerStructVyACSPyxGclufC : $@convention(method) <τ_0_0> (UnsafePointer<τ_0_0>, @thin UnsafePointerStruct.Type) -> UnsafePointerStruct
   let _: UnsafePointerStruct = UnsafePointerStruct(ptr)

test/DebugInfo/simple.sil

@@ -5,7 +5,7 @@ sil_stage canonical
 import Builtin
 import Swift
 
-sil @square : $@convention(thin) (Int32) -> Int32 {
+sil [ossa] @square : $@convention(thin) (Int32) -> Int32 {
 bb0(%0 : $Int32):
   debug_value %0 : $Int32, let, name "x" // id: %1
   %3 = struct_extract %0 : $Int32, #Int32._value       // user: %6

test/IRGen/archetype_resilience.sil

@@ -19,7 +19,7 @@ public enum EnumWithClassArchetypeAndDynamicSize<T : AnyObject> {
 // CHECK-LABEL: define swiftcc void @copyDynamicMultiEnum(%swift.type* %"EnumWithClassArchetypeAndDynamicSize<T>", %swift.type* %U, %T20archetype_resilience36EnumWithClassArchetypeAndDynamicSizeO* noalias nocapture swiftself)
 // CHECK: call %T20archetype_resilience36EnumWithClassArchetypeAndDynamicSizeO* @"$s20archetype_resilience36EnumWithClassArchetypeAndDynamicSizeOyxGRlzCr0_lWOc"(%T20archetype_resilience36EnumWithClassArchetypeAndDynamicSizeO* %0, %T20archetype_resilience36EnumWithClassArchetypeAndDynamicSizeO* {{.*}}, %swift.type* %"EnumWithClassArchetypeAndDynamicSize<T>")
 // CHECK: ret void
-sil @copyDynamicMultiEnum : $@convention(method) <T, U where T: AnyObject> (@in_guaranteed EnumWithClassArchetypeAndDynamicSize<T>) -> () {
+sil [ossa] @copyDynamicMultiEnum : $@convention(method) <T, U where T: AnyObject> (@in_guaranteed EnumWithClassArchetypeAndDynamicSize<T>) -> () {
 bb0(%0 : $*EnumWithClassArchetypeAndDynamicSize<T>):
   %1 = alloc_stack $EnumWithClassArchetypeAndDynamicSize<T> 
   copy_addr %0 to [initialization] %1 : $*EnumWithClassArchetypeAndDynamicSize<T>

test/IRGen/autorelease.sil

@@ -9,13 +9,13 @@ import Swift
 
 class C {}
 sil_vtable C {}
-sil @_TFC11autorelease1Cd : $@convention(method) (@owned C) -> @owned Builtin.NativeObject {
+sil [ossa] @_TFC11autorelease1Cd : $@convention(method) (@owned C) -> @owned Builtin.NativeObject {
 bb0(%0 : @owned $C):
   %1 = unchecked_ref_cast %0 : $C to $Builtin.NativeObject // user: %2
   return %1 : $Builtin.NativeObject              // id: %2
 }
 
-sil @foo : $@convention(thin) (@owned C?) -> @autoreleased C? {
+sil [ossa] @foo : $@convention(thin) (@owned C?) -> @autoreleased C? {
 bb0(%0 : @owned $C?):
   return %0 : $C?
 }
@@ -28,7 +28,7 @@ bb0(%0 : @owned $C?):
 // CHECK-64:        [[T0:%.*]] = tail call i64 bitcast ([[OBJC]]* ([[OBJC]]*)* @objc_autoreleaseReturnValue to i64 (i64)*)(i64 %0)
 // CHECK-64-NEXT:   ret i64 [[T0]]
 
-sil @bar : $@convention(thin) (@owned C?) -> @owned C? {
+sil [ossa] @bar : $@convention(thin) (@owned C?) -> @owned C? {
 bb0(%0 : @owned $C?):
   %1 = function_ref @foo : $@convention(thin) (@owned C?) -> @autoreleased C?
   %2 = apply %1(%0) : $@convention(thin) (@owned C?) -> @autoreleased C?

test/IRGen/autorelease_optimized_aarch64.sil

@@ -12,7 +12,7 @@ class C {}
 
 sil_vtable C {}
 
-sil @_TFC21autorelease_optimized1Cd : $@convention(method) (@owned C) -> @owned Builtin.NativeObject {
+sil [ossa] @_TFC21autorelease_optimized1Cd : $@convention(method) (@owned C) -> @owned Builtin.NativeObject {
 bb0(%0 : @owned $C):
   %1 = unchecked_ref_cast %0 : $C to $Builtin.NativeObject // user: %2
   return %1 : $Builtin.NativeObject              // id: %2
@@ -21,7 +21,7 @@ bb0(%0 : @owned $C):
 sil public_external @foo : $@convention(thin) (@owned C) -> @autoreleased C
 sil public_external @bar : $@convention(thin) (@owned C) -> ()
 
-sil @baz : $@convention(thin) (@owned C) -> () {
+sil [ossa] @baz : $@convention(thin) (@owned C) -> () {
 bb0(%0 : @owned $C):
   %1 = function_ref @foo : $@convention(thin) (@owned C) -> @autoreleased C
   %2 = apply %1(%0) : $@convention(thin) (@owned C) -> @autoreleased C

test/IRGen/autorelease_optimized_armv7.sil

@@ -12,7 +12,7 @@ class C {}
 
 sil_vtable C {}
 
-sil @_TFC21autorelease_optimized1Cd : $@convention(method) (@owned C) -> @owned Builtin.NativeObject {
+sil [ossa] @_TFC21autorelease_optimized1Cd : $@convention(method) (@owned C) -> @owned Builtin.NativeObject {
 bb0(%0 : @owned $C):
   %1 = unchecked_ref_cast %0 : $C to $Builtin.NativeObject // user: %2
   return %1 : $Builtin.NativeObject              // id: %2
@@ -21,7 +21,7 @@ bb0(%0 : @owned $C):
 sil public_external @foo : $@convention(thin) (@owned C) -> @autoreleased C
 sil public_external @bar : $@convention(thin) (@owned C) -> ()
 
-sil @baz : $@convention(thin) (@owned C) -> () {
+sil [ossa] @baz : $@convention(thin) (@owned C) -> () {
 bb0(%0 : @owned $C):
   %1 = function_ref @foo : $@convention(thin) (@owned C) -> @autoreleased C
   %2 = apply %1(%0) : $@convention(thin) (@owned C) -> @autoreleased C

test/IRGen/autorelease_optimized_x86_64.sil

@@ -12,7 +12,7 @@ class C {}
 
 sil_vtable C {}
 
-sil @_TFC21autorelease_optimized1Cd : $@convention(method) (@owned C) -> @owned Builtin.NativeObject {
+sil [ossa] @_TFC21autorelease_optimized1Cd : $@convention(method) (@owned C) -> @owned Builtin.NativeObject {
 bb0(%0 : @owned $C):
   %1 = unchecked_ref_cast %0 : $C to $Builtin.NativeObject // user: %2
   return %1 : $Builtin.NativeObject              // id: %2
@@ -21,7 +21,7 @@ bb0(%0 : @owned $C):
 sil public_external @foo : $@convention(thin) (@owned C) -> @autoreleased C
 sil public_external @bar : $@convention(thin) (@owned C) -> ()
 
-sil @baz : $@convention(thin) (@owned C) -> () {
+sil [ossa] @baz : $@convention(thin) (@owned C) -> () {
 bb0(%0 : @owned $C):
   %1 = function_ref @foo : $@convention(thin) (@owned C) -> @autoreleased C
   %2 = apply %1(%0) : $@convention(thin) (@owned C) -> @autoreleased C

test/IRGen/builtin_word.sil

@@ -35,7 +35,7 @@ entry:
 // ARM32:   %4 = insertvalue { i32, i64 } %3, i64 %2, 1
 // ARM32:   ret { i32, i64 } %4
 // ARM32: }
-sil @word_zextOrBitCast : $(Builtin.Int32, Builtin.Word) -> (Builtin.Word, Builtin.Int64) {
+sil [ossa] @word_zextOrBitCast : $(Builtin.Int32, Builtin.Word) -> (Builtin.Word, Builtin.Int64) {
 entry(%i : $Builtin.Int32, %w : $Builtin.Word):
   %j = builtin "zextOrBitCast_Int32_Word"(%i : $Builtin.Int32) : $Builtin.Word
   %v = builtin "zextOrBitCast_Word_Int64"(%w : $Builtin.Word) : $Builtin.Int64
@@ -57,7 +57,7 @@ entry(%i : $Builtin.Int32, %w : $Builtin.Word):
 // ARM32:   %4 = insertvalue { i32, i32 } %3, i32 %2, 1
 // ARM32:   ret { i32, i32 } %4
 // ARM32: }
-sil @word_truncOrBitCast : $(Builtin.Word, Builtin.Int64) -> (Builtin.Int32, Builtin.Word) {
+sil [ossa] @word_truncOrBitCast : $(Builtin.Word, Builtin.Int64) -> (Builtin.Int32, Builtin.Word) {
 entry(%w : $Builtin.Word, %i : $Builtin.Int64):
   %v = builtin "truncOrBitCast_Word_Int32"(%w : $Builtin.Word) : $Builtin.Int32
   %j = builtin "truncOrBitCast_Int64_Word"(%i : $Builtin.Int64) : $Builtin.Word

test/IRGen/class_isa_pointers.sil

@@ -22,7 +22,7 @@ sil_vtable Purebred {}
 // CHECK:         [[ISA:%.*]] = load %swift.type*, %swift.type** [[ISA_PTR]]
 // CHECK:         [[VTABLE:%.*]] = bitcast %swift.type* [[ISA]]
 // CHECK:         getelementptr inbounds {{.*}} [[VTABLE]]
-sil @purebred_method : $@convention(thin) (@owned Purebred) -> () {
+sil [ossa] @purebred_method : $@convention(thin) (@owned Purebred) -> () {
 entry(%0 : @owned $Purebred):
   %m = class_method %0 : $Purebred, #Purebred.method!1 : (Purebred) -> () -> (), $@convention(method) (@guaranteed Purebred) -> ()
   %z = apply %m(%0) : $@convention(method) (@guaranteed Purebred) -> ()
@@ -46,7 +46,7 @@ sil_vtable Mongrel {}
 // CHECK:         [[ISA:%.*]] = inttoptr i64 [[T3]] to %swift.type*
 // CHECK:         [[VTABLE:%.*]] = bitcast %swift.type* [[ISA]]
 // CHECK:         getelementptr inbounds {{.*}} [[VTABLE]]
-sil @mongrel_method : $@convention(thin) (@owned Mongrel) -> () {
+sil [ossa] @mongrel_method : $@convention(thin) (@owned Mongrel) -> () {
 entry(%0 : @owned $Mongrel):
   %m = class_method %0 : $Mongrel, #Mongrel.method!1 : (Mongrel) -> () -> (), $@convention(method) (@guaranteed Mongrel) -> ()
   %z = apply %m(%0) : $@convention(method) (@guaranteed Mongrel) -> ()
@@ -55,15 +55,15 @@ entry(%0 : @owned $Mongrel):
 
 // ObjC stubs expected by ObjC metadata emission
 
-sil private @$s18class_isa_pointers7MongrelC6methodyyFTo : $@convention(objc_method) (Purebred) -> () {
+sil private [ossa] @$s18class_isa_pointers7MongrelC6methodyyFTo : $@convention(objc_method) (Purebred) -> () {
 entry(%0 : @unowned $Purebred):
   unreachable
 }
-sil private @$s18class_isa_pointers7MongrelC7bellsOnACSgSi_tcfcTo : $@convention(objc_method) (Int, Purebred) -> () {
+sil private [ossa] @$s18class_isa_pointers7MongrelC7bellsOnACSgSi_tcfcTo : $@convention(objc_method) (Int, Purebred) -> () {
 entry(%0 : $Int, %1 : @unowned $Purebred):
   unreachable
 }
-sil private @$s18class_isa_pointers7MongrelCACycfcTo : $@convention(objc_method) (Purebred) -> () {
+sil private [ossa] @$s18class_isa_pointers7MongrelCACycfcTo : $@convention(objc_method) (Purebred) -> () {
 entry(%0 : @unowned $Purebred):
   unreachable
 }

test/IRGen/completely_fragile_class_layout.sil

@@ -181,7 +181,7 @@ bb0:
 
 // CHECK-LABEL: define swiftcc {{(dllexport )?}}{{(protected )?}}i64 @accessClassWithResilientField(%T31completely_fragile_class_layout23ClassWithResilientFieldC*)
 sil @accessClassWithResilientField : $@convention(thin) (@guaranteed ClassWithResilientField) -> Int {
-bb0(%0 : @guaranteed $ClassWithResilientField):
+bb0(%0 : $ClassWithResilientField):
 
 // CHECK:        [[OFFSET:%.*]] = load i64, i64* @"$s31completely_fragile_class_layout23ClassWithResilientFieldC5thirdSivpWvd", align 8
 // CHECK-NEXT:   [[SELF_ADDR:%.*]] = bitcast %T31completely_fragile_class_layout23ClassWithResilientFieldC* %0 to i8*
@@ -192,7 +192,7 @@ bb0(%0 : @guaranteed $ClassWithResilientField):
   %1 = ref_element_addr %0 : $ClassWithResilientField, #ClassWithResilientField.third
 
 // CHECK-NEXT:   [[VALUE:%.*]] = load i64, i64* [[FIELD_PTR]], align 8
-  %2 = load [trivial] %1 : $*Int
+  %2 = load %1 : $*Int
 
 // CHECK-NEXT:   ret i64 [[VALUE]]
   return %2 : $Int

test/IRGen/copy_value_destroy_value.sil

@@ -19,7 +19,7 @@ struct Foo {
 // CHECK: define{{( protected)?}} swiftcc void @trivial_arg(
 // CHECK-NEXT: entry
 // CHECK-NEXT: ret void
-sil @trivial_arg : $@convention(thin) (Builtin.Int32) -> () {
+sil [ossa] @trivial_arg : $@convention(thin) (Builtin.Int32) -> () {
 bb0(%0 : $Builtin.Int32):
   %1 = copy_value %0 : $Builtin.Int32
   destroy_value %1 : $Builtin.Int32
@@ -36,7 +36,7 @@ bb0(%0 : $Builtin.Int32):
 // CHECK: call %swift.refcounted* @swift_retain(%swift.refcounted* returned [[VAL2]])
 // CHECK: call void @swift_release(%swift.refcounted* [[VAL1]])
 // CHECK: call void @swift_release(%swift.refcounted* [[VAL2]])
-sil @non_trivial : $@convention(thin) (@guaranteed Foo) -> () {
+sil [ossa] @non_trivial : $@convention(thin) (@guaranteed Foo) -> () {
 bb0(%0 : @guaranteed $Foo):
   %1 = copy_value %0 : $Foo
   destroy_value %1 : $Foo
@@ -47,7 +47,7 @@ bb0(%0 : @guaranteed $Foo):
 // CHECK: define{{( protected)?}} swiftcc void @non_trivial_unowned(
 // CHECK: call %swift.refcounted* @swift_unownedRetainStrong(%swift.refcounted* returned %0)
 // CHECK: call void @swift_release(%swift.refcounted* %0)
-sil @non_trivial_unowned : $@convention(thin) (@guaranteed Builtin.NativeObject) -> () {
+sil [ossa] @non_trivial_unowned : $@convention(thin) (@guaranteed Builtin.NativeObject) -> () {
 bb0(%0 : @guaranteed $Builtin.NativeObject):
   %1 = ref_to_unowned %0 : $Builtin.NativeObject to $@sil_unowned Builtin.NativeObject
   %2 = copy_unowned_value %1 : $@sil_unowned Builtin.NativeObject