Skip to content

Commit c990fc1

Browse files
lattnerlattner
committed
Add some parens to function types in sil tests. NFC.
1 parent 8d3f887 commit c990fc1

File tree

69 files changed

+227
-227
lines changed

Some content is hidden

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

69 files changed

+227
-227
lines changed

‎test/SIL/Parser/basic.sil

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ bb0:
217217
%O = unchecked_ref_cast %C : $C to $Builtin.UnknownObject
218218

219219
// CHECK: class_method {{.*}} : $C, #C.doIt!1
220-
%2 = class_method %C : $C, #C.doIt!1 : C -> () -> () , $@convention(method) (@guaranteed C) -> ()
220+
%2 = class_method %C : $C, #C.doIt!1 : (C) -> () -> () , $@convention(method) (@guaranteed C) -> ()
221221

222222
// CHECK: alloc_ref $D
223223
%D = alloc_ref $D

‎test/SIL/Parser/overloaded_member.sil

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ bb0(%0 : $A, %1 : $X):
2828
%7 = load %2a : $*X
2929
strong_retain %7 : $X
3030
// CHECK: class_method [volatile] %{{[0-9]+}} : $X, #X.init!initializer.1.foreign : X.Type -> (a1: A, a2: A) -> X , $@convention(objc_method) (A, A, @owned X) -> @owned X
31-
%9 = class_method [volatile] %7 : $X, #X.init!initializer.1.foreign : X.Type -> (a1: A, a2: A) -> X , $@convention(objc_method) (A, A, @owned X) -> @owned X
31+
%9 = class_method [volatile] %7 : $X, #X.init!initializer.1.foreign : (X.Type) -> (a1: A, a2: A) -> X , $@convention(objc_method) (A, A, @owned X) -> @owned X
3232
%10 = load %3a : $*A
3333
%11 = load %3a : $*A
3434
%12 = apply %9(%10, %11, %7) : $@convention(objc_method) (A, A, @owned X) -> @owned X

‎test/SILGen/addressors.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -147,17 +147,17 @@ func id_int(_ i: Int32) -> Int32 { return i }
147147

148148
// CHECK-LABEL: sil hidden @_TF10addressors11test_carrayFRGVS_6CArrayFVs5Int32S1__S1_ : $@convention(thin) (@inout CArray<Int32 -> Int32>) -> Int32 {
149149
// CHECK: bb0([[ARRAY:%.*]] : $*CArray<Int32 -> Int32>):
150-
func test_carray(_ array: inout CArray<Int32 -> Int32>) -> Int32 {
150+
func test_carray(_ array: inout CArray<(Int32) -> Int32>) -> Int32 {
151151
// CHECK: [[T0:%.*]] = function_ref @_TFV10addressors6CArrayau9subscriptFSix :
152-
// CHECK: [[T1:%.*]] = apply [[T0]]<Int32 -> Int32>({{%.*}}, [[ARRAY]])
152+
// CHECK: [[T1:%.*]] = apply [[T0]]<(Int32) -> Int32>({{%.*}}, [[ARRAY]])
153153
// CHECK: [[T2:%.*]] = struct_extract [[T1]] : $UnsafeMutablePointer<Int32 -> Int32>, #UnsafeMutablePointer._rawValue
154154
// CHECK: [[T3:%.*]] = pointer_to_address [[T2]] : $Builtin.RawPointer to $*@callee_owned (@in Int32) -> @out Int32
155155
// CHECK: store {{%.*}} to [[T3]] :
156156
array[0] = id_int
157157

158158
// CHECK: [[T0:%.*]] = load [[ARRAY]]
159159
// CHECK: [[T1:%.*]] = function_ref @_TFV10addressors6CArraylu9subscriptFSix :
160-
// CHECK: [[T2:%.*]] = apply [[T1]]<Int32 -> Int32>({{%.*}}, [[T0]])
160+
// CHECK: [[T2:%.*]] = apply [[T1]]<(Int32) -> Int32>({{%.*}}, [[T0]])
161161
// CHECK: [[T3:%.*]] = struct_extract [[T2]] : $UnsafePointer<Int32 -> Int32>, #UnsafePointer._rawValue
162162
// CHECK: [[T4:%.*]] = pointer_to_address [[T3]] : $Builtin.RawPointer to $*@callee_owned (@in Int32) -> @out Int32
163163
// CHECK: [[T5:%.*]] = load [[T4]]

‎test/SILGen/apply_abstraction_nested.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ func baz<T:P>(_: inout T) -> (Int) -> () { return {_ in ()} }
1010
func ~> <T: P, Args, Result>(
1111
x: inout T,
1212
m: (x: inout T) -> ((Args) -> Result)
13-
) -> (Args -> Result) {
13+
) -> ((Args) -> Result) {
1414
return m(x: &x)
1515
}
1616

‎test/SILGen/capture_typed_boxes.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ func foo(_ x: Int) -> () -> Int {
77
// CHECK-LABEL: sil shared @_TFF19capture_typed_boxes3fooFSiFT_SiU_FT_Si : $@convention(thin) (@owned @box Int) -> Int {
88
// CHECK: bb0(%0 : $@box Int):
99

10-
func closure(_ f: Int -> Int) -> Int {
10+
func closure(_ f: (Int) -> Int) -> Int {
1111
var f = f
1212
func bar(_ x: Int) -> Int {
1313
return f(x)
@@ -18,7 +18,7 @@ func closure(_ f: Int -> Int) -> Int {
1818
// CHECK-LABEL: sil shared @_TFF19capture_typed_boxes7closureFFSiSiSiL_3barfSiSi : $@convention(thin) (Int, @owned @box @callee_owned (Int) -> Int) -> Int {
1919
// CHECK: bb0(%0 : $Int, %1 : $@box @callee_owned (Int) -> Int):
2020

21-
func closure_generic<T>(_ f: T -> T, x: T) -> T {
21+
func closure_generic<T>(_ f: (T) -> T, x: T) -> T {
2222
var f = f
2323
func bar(_ x: T) -> T {
2424
return f(x)

‎test/SILGen/cdecl.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
// CHECK: function_ref @_TF5cdecl5apple
55
// CHECK-LABEL: sil hidden @_TF5cdecl5apple
66
@_cdecl("pear")
7-
func apple(_ f: @convention(c) Int -> Int) {
7+
func apple(_ f: @convention(c) (Int) -> Int) {
88
}
99

1010
// CHECK-LABEL: sil hidden @_TF5cdecl16forceCEntryPoint

‎test/SILGen/closures.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ var zero = 0
66

77
// <rdar://problem/15921334>
88
// CHECK-LABEL: sil hidden @_TF8closures46return_local_generic_function_without_captures{{.*}} : $@convention(thin) <A, R> () -> @owned @callee_owned (@in A) -> @out R {
9-
func return_local_generic_function_without_captures<A, R>() -> A -> R {
9+
func return_local_generic_function_without_captures<A, R>() -> (A) -> R {
1010
func f(_: A) -> R {
1111
Builtin.int_trap()
1212
}
@@ -16,7 +16,7 @@ func return_local_generic_function_without_captures<A, R>() -> A -> R {
1616
return f
1717
}
1818

19-
func return_local_generic_function_with_captures<A, R>(_ a: A) -> A -> R {
19+
func return_local_generic_function_with_captures<A, R>(_ a: A) -> (A) -> R {
2020
func f(_: A) -> R {
2121
_ = a
2222
}

‎test/SILGen/coverage_default_args.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -profile-generate -profile-coverage-mapping -emit-sorted-sil -emit-sil -module-name coverage_default_args %s | FileCheck %s
22

33
// CHECK-LABEL: sil_coverage_map {{.*}}// coverage_default_args.closureInArgs
4-
// CHECK: [[@LINE+2]]:39 -> [[@LINE+2]]:55 : 1
5-
// CHECK: [[@LINE+1]]:57 -> {{[0-9]+}}:2 : 0
6-
func closureInArgs(f : (Int -> Int) = { i1 in i1 + 1 }) {
4+
// CHECK: [[@LINE+2]]:41 -> [[@LINE+2]]:57 : 1
5+
// CHECK: [[@LINE+1]]:59 -> {{[0-9]+}}:2 : 0
6+
func closureInArgs(f : ((Int) -> Int) = { i1 in i1 + 1 }) {
77
f(3)
88
}
99

‎test/SILGen/dependent_member_lowering.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ struct Foo<T>: P {
1313
// CHECK: bb0(%0 : $*@thick T.Type, %1 : $*Foo<T>):
1414
}
1515
struct Bar<T>: P {
16-
typealias A = Int -> T
16+
typealias A = (Int) -> T
1717

18-
func f(_ t: Int -> T) {}
18+
func f(_ t: (Int) -> T) {}
1919
// CHECK-LABEL: sil hidden [transparent] [thunk] @_TTWurGV25dependent_member_lowering3Barx_S_1PS_FS1_1{{.*}} : $@convention(witness_method) <T> (@in @callee_owned (@in Int) -> @out T, @in_guaranteed Bar<T>) -> ()
2020
// CHECK: bb0(%0 : $*@callee_owned (@in Int) -> @out T, %1 : $*Bar<T>):
2121
}

‎test/SILGen/function_conversion.swift

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
// CHECK: [[THUNK:%.*]] = function_ref @_TTRXFtCc_dSi_dSi_XFo_dSi_dSi_
99
// CHECK: [[FUNC:%.*]] = partial_apply [[THUNK]](%0)
1010
// CHECK: return [[FUNC]]
11-
func cToFunc(_ arg: @convention(c) Int -> Int) -> Int -> Int {
11+
func cToFunc(_ arg: @convention(c) (Int) -> Int) -> (Int) -> Int {
1212
return arg
1313
}
1414

@@ -17,7 +17,7 @@ func cToFunc(_ arg: @convention(c) Int -> Int) -> Int -> Int {
1717
// CHECK: [[BLOCK:%.*]] = init_block_storage_header [[BLOCK_STORAGE]]
1818
// CHECK: [[COPY:%.*]] = copy_block [[BLOCK]] : $@convention(block) (Int) -> Int
1919
// CHECK: return [[COPY]]
20-
func cToBlock(_ arg: @convention(c) Int -> Int) -> @convention(block) Int -> Int {
20+
func cToBlock(_ arg: @convention(c) (Int) -> Int) -> @convention(block) (Int) -> Int {
2121
return arg
2222
}
2323

@@ -61,7 +61,7 @@ func funcToUpcast(_ x: () -> Domesticated) -> () -> Feral {
6161
// CHECK-LABEL: sil hidden @_TF19function_conversion12funcToUpcastFFCS_5FeralT_FCS_12DomesticatedT_ : $@convention(thin) (@owned @callee_owned (@owned Feral) -> ()) -> @owned @callee_owned (@owned Domesticated) -> ()
6262
// CHECK: [[FUNC:%.*]] = convert_function %0 : $@callee_owned (@owned Feral) -> () to $@callee_owned (@owned Domesticated) -> (){{.*}} // user: %3
6363
// CHECK: return [[FUNC]]
64-
func funcToUpcast(_ x: Feral -> ()) -> Domesticated -> () {
64+
func funcToUpcast(_ x: (Feral) -> ()) -> (Domesticated) -> () {
6565
return x
6666
}
6767

@@ -104,14 +104,14 @@ struct AddrOnly {
104104
}
105105

106106
// CHECK-LABEL: sil hidden @_TF19function_conversion19convOptionalTrivialFFGSqVS_7Trivial_S0_T_
107-
func convOptionalTrivial(_ t1: Trivial? -> Trivial) {
107+
func convOptionalTrivial(_ t1: (Trivial?) -> Trivial) {
108108
// CHECK: function_ref @_TTRXFo_dGSqV19function_conversion7Trivial__dS0__XFo_dS0__dGSqS0___
109109
// CHECK: partial_apply
110-
let _: Trivial -> Trivial? = t1
110+
let _: (Trivial) -> Trivial? = t1
111111

112112
// CHECK: function_ref @_TTRXFo_dGSqV19function_conversion7Trivial__dS0__XFo_dGSQS0___dGSqS0___
113113
// CHECK: partial_apply
114-
let _: Trivial! -> Trivial? = t1
114+
let _: (Trivial!) -> Trivial? = t1
115115
}
116116

117117
// CHECK-LABEL: sil shared [transparent] [reabstraction_thunk] @_TTRXFo_dGSqV19function_conversion7Trivial__dS0__XFo_dS0__dGSqS0___ : $@convention(thin) (Trivial, @owned @callee_owned (Optional<Trivial>) -> Trivial) -> Optional<Trivial>
@@ -127,14 +127,14 @@ func convOptionalTrivial(_ t1: Trivial? -> Trivial) {
127127
// CHECK-NEXT: return
128128

129129
// CHECK-LABEL: sil hidden @_TF19function_conversion20convOptionalLoadableFFGSqVS_8Loadable_S0_T_
130-
func convOptionalLoadable(_ l1: Loadable? -> Loadable) {
130+
func convOptionalLoadable(_ l1: (Loadable?) -> Loadable) {
131131
// CHECK: function_ref @_TTRXFo_oGSqV19function_conversion8Loadable__oS0__XFo_oS0__oGSqS0___
132132
// CHECK: partial_apply
133-
let _: Loadable -> Loadable? = l1
133+
let _: (Loadable) -> Loadable? = l1
134134

135135
// CHECK: function_ref @_TTRXFo_oGSqV19function_conversion8Loadable__oS0__XFo_oGSQS0___oGSqS0___
136136
// CHECK: partial_apply
137-
let _: Loadable! -> Loadable? = l1
137+
let _: (Loadable!) -> Loadable? = l1
138138
}
139139

140140
// CHECK-LABEL: sil shared [transparent] [reabstraction_thunk] @_TTRXFo_oGSqV19function_conversion8Loadable__oS0__XFo_oGSQS0___oGSqS0___ : $@convention(thin) (@owned ImplicitlyUnwrappedOptional<Loadable>, @owned @callee_owned (@owned Optional<Loadable>) -> @owned Loadable) -> @owned Optional<Loadable>
@@ -144,14 +144,14 @@ func convOptionalLoadable(_ l1: Loadable? -> Loadable) {
144144
// CHECK-NEXT: return
145145

146146
// CHECK-LABEL: sil hidden @_TF19function_conversion20convOptionalAddrOnlyFFGSqVS_8AddrOnly_S0_T_
147-
func convOptionalAddrOnly(_ a1: AddrOnly? -> AddrOnly) {
147+
func convOptionalAddrOnly(_ a1: (AddrOnly?) -> AddrOnly) {
148148
// CHECK: function_ref @_TTRXFo_iGSqV19function_conversion8AddrOnly__iS0__XFo_iGSqS0___iGSqS0___
149149
// CHECK: partial_apply
150-
let _: AddrOnly? -> AddrOnly? = a1
150+
let _: (AddrOnly?) -> AddrOnly? = a1
151151

152152
// CHECK: function_ref @_TTRXFo_iGSqV19function_conversion8AddrOnly__iS0__XFo_iGSQS0___iGSqS0___
153153
// CHECK: partial_apply
154-
let _: AddrOnly! -> AddrOnly? = a1
154+
let _: (AddrOnly!) -> AddrOnly? = a1
155155
}
156156

157157
// CHECK-LABEL: sil shared [transparent] [reabstraction_thunk] @_TTRXFo_iGSqV19function_conversion8AddrOnly__iS0__XFo_iGSqS0___iGSqS0___ : $@convention(thin) (@in Optional<AddrOnly>, @owned @callee_owned (@in Optional<AddrOnly>) -> @out AddrOnly) -> @out Optional<AddrOnly>
@@ -191,18 +191,18 @@ extension Loadable : P {}
191191
extension AddrOnly : P {}
192192

193193
// CHECK-LABEL: sil hidden @_TF19function_conversion22convExistentialTrivialFTFPS_1Q_VS_7Trivial2t3FGSqPS0___S1__T_
194-
func convExistentialTrivial(_ t2: Q -> Trivial, t3: Q? -> Trivial) {
194+
func convExistentialTrivial(_ t2: (Q) -> Trivial, t3: (Q?) -> Trivial) {
195195
// CHECK: function_ref @_TTRXFo_iP19function_conversion1Q__dVS_7Trivial_XFo_dS1__iPS_1P__
196196
// CHECK: partial_apply
197-
let _: Trivial -> P = t2
197+
let _: (Trivial) -> P = t2
198198

199199
// CHECK: function_ref @_TTRXFo_iGSqP19function_conversion1Q___dVS_7Trivial_XFo_dGSqS1___iPS_1P__
200200
// CHECK: partial_apply
201-
let _: Trivial? -> P = t3
201+
let _: (Trivial?) -> P = t3
202202

203203
// CHECK: function_ref @_TTRXFo_iP19function_conversion1Q__dVS_7Trivial_XFo_iPS_1P__iPS2___
204204
// CHECK: partial_apply
205-
let _: P -> P = t2
205+
let _: (P) -> P = t2
206206
}
207207

208208
// CHECK-LABEL: sil shared [transparent] [reabstraction_thunk] @_TTRXFo_iP19function_conversion1Q__dVS_7Trivial_XFo_dS1__iPS_1P__ : $@convention(thin) (Trivial, @owned @callee_owned (@in Q) -> Trivial) -> @out P
@@ -245,18 +245,18 @@ func convExistentialTrivial(_ t2: Q -> Trivial, t3: Q? -> Trivial) {
245245
// ==== Existential metatypes
246246

247247
// CHECK-LABEL: sil hidden @_TF19function_conversion23convExistentialMetatypeFFGSqPMPS_1Q__MVS_7TrivialT_
248-
func convExistentialMetatype(_ em: Q.Type? -> Trivial.Type) {
248+
func convExistentialMetatype(_ em: (Q.Type?) -> Trivial.Type) {
249249
// CHECK: function_ref @_TTRXFo_dGSqPMP19function_conversion1Q___dXMtVS_7Trivial_XFo_dXMtS1__dXPMTPS_1P__
250250
// CHECK: partial_apply
251-
let _: Trivial.Type -> P.Type = em
251+
let _: (Trivial.Type) -> P.Type = em
252252

253253
// CHECK: function_ref @_TTRXFo_dGSqPMP19function_conversion1Q___dXMtVS_7Trivial_XFo_dGSqMS1___dXPMTPS_1P__
254254
// CHECK: partial_apply
255-
let _: Trivial.Type? -> P.Type = em
255+
let _: (Trivial.Type?) -> P.Type = em
256256

257257
// CHECK: function_ref @_TTRXFo_dGSqPMP19function_conversion1Q___dXMtVS_7Trivial_XFo_dXPMTPS_1P__dXPMTPS2___
258258
// CHECK: partial_apply
259-
let _: P.Type -> P.Type = em
259+
let _: (P.Type) -> P.Type = em
260260
}
261261

262262
// CHECK-LABEL: sil shared [transparent] [reabstraction_thunk] @_TTRXFo_dGSqPMP19function_conversion1Q___dXMtVS_7Trivial_XFo_dXMtS1__dXPMTPS_1P__ : $@convention(thin) (@thin Trivial.Type, @owned @callee_owned (Optional<Q.Type>) -> @thin Trivial.Type) -> @thick P.Type
@@ -341,10 +341,10 @@ func convUpcastMetatype(_ c4: (Parent.Type, Trivial?) -> Child.Type,
341341
// ==== Function to existential -- make sure we maximally abstract it
342342

343343
// CHECK-LABEL: sil hidden @_TF19function_conversion19convFuncExistentialFFP_FSiSiT_ : $@convention(thin) (@owned @callee_owned (@in protocol<>) -> @owned @callee_owned (Int) -> Int) -> ()
344-
func convFuncExistential(_ f1: Any -> Int -> Int) {
344+
func convFuncExistential(_ f1: (Any) -> (Int) -> Int) {
345345
// CHECK: function_ref @_TTRXFo_iP__oXFo_dSi_dSi__XFo_oXFo_dSi_dSi__iP__
346346
// CHECK: partial_apply %3(%0)
347-
let _: (Int -> Int) -> Any = f1
347+
let _: ((Int) -> Int) -> Any = f1
348348
}
349349

350350
// CHECK-LABEL: sil shared [transparent] [reabstraction_thunk] @_TTRXFo_iP__oXFo_dSi_dSi__XFo_oXFo_dSi_dSi__iP__ : $@convention(thin) (@owned @callee_owned (Int) -> Int, @owned @callee_owned (@in protocol<>) -> @owned @callee_owned (Int) -> Int) -> @out protocol<>
@@ -369,10 +369,10 @@ func convFuncExistential(_ f1: Any -> Int -> Int) {
369369
// ==== Class-bound archetype upcast
370370

371371
// CHECK-LABEL: sil hidden @_TF19function_conversion29convClassBoundArchetypeUpcast
372-
func convClassBoundArchetypeUpcast<T : Parent>(_ f1: Parent -> (T, Trivial)) {
372+
func convClassBoundArchetypeUpcast<T : Parent>(_ f1: (Parent) -> (T, Trivial)) {
373373
// CHECK: function_ref @_TTRGRxC19function_conversion6ParentrXFo_oS0__oxdVS_7Trivial_XFo_ox_oS0_dGSqS1___
374374
// CHECK: partial_apply
375-
let _: T -> (Parent, Trivial?) = f1
375+
let _: (T) -> (Parent, Trivial?) = f1
376376
}
377377

378378
// CHECK-LABEL: sil shared [transparent] [reabstraction_thunk] @_TTRGRxC19function_conversion6ParentrXFo_oS0__oxdVS_7Trivial_XFo_ox_oS0_dGSqS1___ : $@convention(thin) <T where T : Parent> (@owned T, @owned @callee_owned (@owned Parent) -> (@owned T, Trivial)) -> (@owned Parent, Optional<Trivial>)
@@ -386,10 +386,10 @@ func convClassBoundArchetypeUpcast<T : Parent>(_ f1: Parent -> (T, Trivial)) {
386386
// CHECK-NEXT: return
387387

388388
// CHECK-LABEL: sil hidden @_TF19function_conversion37convClassBoundMetatypeArchetypeUpcast
389-
func convClassBoundMetatypeArchetypeUpcast<T : Parent>(_ f1: Parent.Type -> (T.Type, Trivial)) {
389+
func convClassBoundMetatypeArchetypeUpcast<T : Parent>(_ f1: (Parent.Type) -> (T.Type, Trivial)) {
390390
// CHECK: function_ref @_TTRGRxC19function_conversion6ParentrXFo_dXMTS0__dXMTxdVS_7Trivial_XFo_dXMTx_dXMTS0_dGSqS1___
391391
// CHECK: partial_apply
392-
let _: T.Type -> (Parent.Type, Trivial?) = f1
392+
let _: (T.Type) -> (Parent.Type, Trivial?) = f1
393393
}
394394

395395
// CHECK-LABEL: sil shared [transparent] [reabstraction_thunk] @_TTRGRxC19function_conversion6ParentrXFo_dXMTS0__dXMTxdVS_7Trivial_XFo_dXMTx_dXMTS0_dGSqS1___ : $@convention(thin) <T where T : Parent> (@thick T.Type, @owned @callee_owned (@thick Parent.Type) -> (@thick T.Type, Trivial)) -> (@thick Parent.Type, Optional<Trivial>)
@@ -413,11 +413,11 @@ func convClassBoundMetatypeArchetypeUpcast<T : Parent>(_ f1: Parent.Type -> (T.T
413413

414414
// CHECK-LABEL: sil shared [transparent] [reabstraction_thunk] @_TTRXFo_dGSqTSiSi____XFo_dSidSi__ : $@convention(thin) (Int, Int, @owned @callee_owned (Optional<(Int, Int)>) -> ()) -> ()
415415

416-
func convTupleScalar(_ f1: Q -> (),
416+
func convTupleScalar(_ f1: (Q) -> (),
417417
f2: (parent: Q) -> (),
418418
f3: (tuple: (Int, Int)?) -> ()) {
419419
let _: (parent: P) -> () = f1
420-
let _: P -> () = f2
420+
let _: (P) -> () = f2
421421
let _: (Int, Int) -> () = f3
422422
}
423423

‎test/SILGen/generic_closures.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,6 @@ protocol HasClassAssoc { associatedtype Assoc : Class }
156156
// CHECK: [[GENERIC_FN:%.*]] = function_ref @_TFF16generic_closures34captures_class_constrained_genericuRxS_13HasClassAssocrFTx1fFwx5AssocwxS1__T_U_FT_FQQ_5AssocS2_
157157
// CHECK: [[CONCRETE_FN:%.*]] = partial_apply [[GENERIC_FN]]<T, T.Assoc>(%1)
158158

159-
func captures_class_constrained_generic<T : HasClassAssoc>(_ x: T, f: T.Assoc -> T.Assoc) {
160-
let _: () -> T.Assoc -> T.Assoc = { f }
159+
func captures_class_constrained_generic<T : HasClassAssoc>(_ x: T, f: (T.Assoc) -> T.Assoc) {
160+
let _: () -> (T.Assoc) -> T.Assoc = { f }
161161
}

‎test/SILGen/generic_objc_block_bridge.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
import Foundation
66

77
class Butt: NSObject {
8-
dynamic func butt(_ b: Int -> Int) {}
8+
dynamic func butt(_ b: (Int) -> Int) {}
99
}
1010

1111
class Tubb<GenericParamName>: Butt {
12-
override func butt(_ b: Int -> Int) {
12+
override func butt(_ b: (Int) -> Int) {
1313
super.butt(b)
1414
}
1515
}

‎test/SILGen/generic_signatures.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ func concreteJungle<T where T : Fooable, T.Foo == C>(t: T.Foo) -> C {
7777
return c
7878
}
7979

80-
func concreteJungle<T where T : Fooable, T.Foo == C>(f: T.Foo -> C) -> T.Foo {
81-
let ff: C -> T.Foo = f
80+
func concreteJungle<T where T : Fooable, T.Foo == C>(f: (T.Foo) -> C) -> T.Foo {
81+
let ff: (C) -> T.Foo = f
8282
return ff(C())
8383
}

‎test/SILGen/guaranteed_self.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -390,11 +390,11 @@ class D: C {
390390
}
391391
}
392392

393-
func S_curryThunk(_ s: S) -> (S -> Int -> ()/*, Int -> ()*/) {
393+
func S_curryThunk(_ s: S) -> ((S) -> (Int) -> ()/*, Int -> ()*/) {
394394
return (S.foo /*, s.foo*/)
395395
}
396396

397-
func AO_curryThunk<T>(_ ao: AO<T>) -> (AO<T> -> Int -> ()/*, Int -> ()*/) {
397+
func AO_curryThunk<T>(_ ao: AO<T>) -> ((AO<T>) -> (Int) -> ()/*, Int -> ()*/) {
398398
return (AO.foo /*, ao.foo*/)
399399
}
400400

‎test/SILGen/indirect_enum.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ func TreeA_cases<T>(_ t: T, l: TreeA<T>, r: TreeA<T>) {
4343
}
4444

4545
// CHECK-LABEL: sil hidden @_TF13indirect_enum16TreeA_reabstractFFSiSiT_
46-
func TreeA_reabstract(_ f: Int -> Int) {
46+
func TreeA_reabstract(_ f: (Int) -> Int) {
4747

4848
// CHECK: [[METATYPE:%.*]] = metatype $@thin TreeA<Int -> Int>.Type
4949
// CHECK-NEXT: [[BOX:%.*]] = alloc_box $@callee_owned (@in Int) -> @out Int
@@ -56,7 +56,7 @@ func TreeA_reabstract(_ f: Int -> Int) {
5656
// CHECK-NEXT: release_value [[LEAF]]
5757
// CHECK-NEXT: strong_release %0
5858
// CHECK: return
59-
let _ = TreeA<Int -> Int>.Leaf(f)
59+
let _ = TreeA<(Int) -> Int>.Leaf(f)
6060
}
6161

6262
enum TreeB<T> {

‎test/SILGen/let_decls.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -353,14 +353,14 @@ func address_only_let_closure<T>(_ x:T) -> T {
353353
}
354354

355355
struct GenericFunctionStruct<T, U> {
356-
var f: T -> U
356+
var f: (T) -> U
357357
}
358358

359359

360360
// CHECK-LABEL: sil hidden @{{.*}}member_ref_abstraction_change
361361
// CHECK: function_ref reabstraction thunk helper
362362
// CHECK: return
363-
func member_ref_abstraction_change(_ x: GenericFunctionStruct<Int, Int>) -> Int -> Int {
363+
func member_ref_abstraction_change(_ x: GenericFunctionStruct<Int, Int>) -> (Int) -> Int {
364364
return x.f
365365
}
366366

‎test/SILGen/local_recursion.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ func local_recursion(_ x: Int, y: Int) {
5656
// CHECK: [[CLOSURE_REF:%.*]] = function_ref @_TFF15local_recursion15local_recursionFTSi1ySi_T_U0_FSiT_
5757
// CHECK: [[CLOSURE:%.*]] = partial_apply [[CLOSURE_REF]]([[X]], [[Y]])
5858
// CHECK: apply [[CLOSURE]]([[X]])
59-
let f: Int -> () = {
59+
let f: (Int) -> () = {
6060
self_recursive($0)
6161
transitive_capture_2($0)
6262
}

0 commit comments

Comments
 (0)