Skip to content

Commit bd5f4b7

Browse files
airspeedswiftairspeedswift
committed
Fixed various hard-coded tests
1 parent 8ffd149 commit bd5f4b7

File tree

11 files changed

+52
-52
lines changed

11 files changed

+52
-52
lines changed

‎test/Constraints/array_literal.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ func longArray() {
102102
var _=["1", "1", "1", "1", "1", "1", "1", "1", "1", "1", "1", "1", "1", "1", "1", "1", "1", "1", "1", "1", "1", "1", "1", "1", "1", "1", "1", "1", "1", "1", "1", "1", "1", "1"]
103103
}
104104

105-
[1,2].map // expected-error {{expression type '((Int) throws -> _) throws -> [_]' is ambiguous without more context}}
105+
[1,2].map // expected-error {{expression type '(((Int)) throws -> _) throws -> [_]' is ambiguous without more context}}
106106

107107

108108
// <rdar://problem/25563498> Type checker crash assigning array literal to type conforming to _ArrayProtocol

‎test/Constraints/closures.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,7 @@ func rdar21078316() {
349349

350350
// <rdar://problem/20978044> QoI: Poor diagnostic when using an incorrect tuple element in a closure
351351
var numbers = [1, 2, 3]
352-
zip(numbers, numbers).filter { $0.2 > 1 } // expected-error {{value of tuple type '(Int, Int)' has no member '2'}}
352+
zip(numbers, numbers).filter { $0.2 > 1 } // expected-error {{value of tuple type '((Int), (Int))' has no member '2'}}
353353

354354

355355

‎test/Constraints/tuple_arguments.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1409,7 +1409,7 @@ func processArrayOfFunctions(f1: [((Bool, Bool)) -> ()],
14091409
}
14101410

14111411
f2.forEach { (block: ((Bool, Bool)) -> ()) in
1412-
// expected-error@-1 {{cannot convert value of type '(((Bool, Bool)) -> ()) -> ()' to expected argument type '((Bool, Bool) -> ()) -> Void'}}
1412+
// expected-error@-1 {{cannot convert value of type '(((Bool, Bool)) -> ()) -> ()' to expected argument type '(((Bool, Bool) -> ())) -> Void}}
14131413
block(p)
14141414
block((c, c))
14151415
block(c, c)

‎test/IDE/complete_from_stdlib.swift

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ func protocolExtCollection1a<C : Collection>(_ a: C) {
9191
}
9292

9393
// PRIVATE_NOMINAL_MEMBERS_2A: Begin completions
94-
// PRIVATE_NOMINAL_MEMBERS_2A-DAG: map({#(transform): (C._Element) throws -> T##(C._Element) throws -> T#})[' rethrows'][#[T]#]{{; name=.+}}
94+
// PRIVATE_NOMINAL_MEMBERS_2A-DAG: map({#(transform): (C.Element) throws -> T##(C.Element) throws -> T#})[' rethrows'][#[T]#]{{; name=.+}}
9595
// PRIVATE_NOMINAL_MEMBERS_2A: End completions
9696
// NEGATIVE_PRIVATE_NOMINAL_MEMBERS_2A-NOT: Decl{{.*}}: last
9797

@@ -100,7 +100,7 @@ func protocolExtCollection1b(_ a: Collection) {
100100
}
101101

102102
// PRIVATE_NOMINAL_MEMBERS_2B: Begin completions
103-
// PRIVATE_NOMINAL_MEMBERS_2B-DAG: map({#(transform): (Collection.Iterator.Element) throws -> T##(Collection.Iterator.Element) throws -> T#})[' rethrows'][#[T]#]{{; name=.+}}
103+
// PRIVATE_NOMINAL_MEMBERS_2B-DAG: map({#(transform): (Collection.Element) throws -> T##(Collection.Element) throws -> T#})[' rethrows'][#[T]#]{{; name=.+}}
104104
// PRIVATE_NOMINAL_MEMBERS_2B: End completions
105105
// NEGATIVE_PRIVATE_NOMINAL_MEMBERS_2B-NOT: Decl{{.*}}: last
106106

@@ -109,32 +109,32 @@ func protocolExtCollection2<C : Collection where C.Index : BidirectionalIndex>(_
109109
}
110110

111111
// PRIVATE_NOMINAL_MEMBERS_3: Begin completions
112-
// PRIVATE_NOMINAL_MEMBERS_3-DAG: Decl[InstanceMethod]/Super: map({#(transform): (C._Element) throws -> T##(C._Element) throws -> T#})[' rethrows'][#[T]#]{{; name=.+}}
112+
// PRIVATE_NOMINAL_MEMBERS_3-DAG: Decl[InstanceMethod]/Super: map({#(transform): (C.Element) throws -> T##(C.Element) throws -> T#})[' rethrows'][#[T]#]{{; name=.+}}
113113
// PRIVATE_NOMINAL_MEMBERS_3-DAG: Decl[InstanceVar]/Super: lazy[#LazySequence<Collection>#]{{; name=.+}}
114-
// PRIVATE_NOMINAL_MEMBERS_3-DAG: index({#where: (C._Element) throws -> Bool##(C._Element) throws -> Bool#})[' rethrows'][#Comparable?#]{{; name=.+}}
114+
// PRIVATE_NOMINAL_MEMBERS_3-DAG: index({#where: (C.Element) throws -> Bool##(C.Element) throws -> Bool#})[' rethrows'][#Comparable?#]{{; name=.+}}
115115
// PRIVATE_NOMINAL_MEMBERS_3: End completions
116116
// NEGATIVE_PRIVATE_NOMINAL_MEMBERS_3-NOT: Decl{{.*}}: index({#({{.*}}): Self.Iterator.Element
117117

118118
func protocolExtArray<T : Equatable>(_ a: [T]) {
119119
a.#^PRIVATE_NOMINAL_MEMBERS_4^#
120120
}
121121
// PRIVATE_NOMINAL_MEMBERS_4: Begin completions
122-
// PRIVATE_NOMINAL_MEMBERS_4-DAG: Decl[InstanceMethod]/Super: map({#(transform): (Equatable) throws -> T##(Equatable) throws -> T#})[' rethrows'][#[T]#]{{; name=.+}}
123-
// PRIVATE_NOMINAL_MEMBERS_4-DAG: Decl[InstanceVar]/Super: last[#Equatable?#]{{; name=.+}}
124-
// PRIVATE_NOMINAL_MEMBERS_4-DAG: Decl[InstanceMethod]/Super: index({#of: Equatable#})[#Int?#]{{; name=.+}}
125-
// PRIVATE_NOMINAL_MEMBERS_4-DAG: Decl[InstanceMethod]/Super: index({#where: (Equatable) throws -> Bool##(Equatable) throws -> Bool#})[' rethrows'][#Int?#]{{; name=.+}}
122+
// PRIVATE_NOMINAL_MEMBERS_4-DAG: Decl[InstanceMethod]/Super: map({#(transform): ((Equatable)) throws -> T##((Equatable)) throws -> T#})[' rethrows'][#[T]#]{{; name=.+}}
123+
// PRIVATE_NOMINAL_MEMBERS_4-DAG: Decl[InstanceVar]/Super: last[#(Equatable)?#]{{; name=.+}}
124+
// PRIVATE_NOMINAL_MEMBERS_4-DAG: Decl[InstanceMethod]/Super: index({#of: (Equatable)#})[#Int?#]{{; name=.+}}
125+
// PRIVATE_NOMINAL_MEMBERS_4-DAG: Decl[InstanceMethod]/Super: index({#where: ((Equatable)) throws -> Bool##((Equatable)) throws -> Bool#})[' rethrows'][#Int?#]{{; name=.+}}
126126
// PRIVATE_NOMINAL_MEMBERS_4: End completions
127127

128128
func testArchetypeReplacement1<FOO : Equatable>(_ a: [FOO]) {
129129
a.#^PRIVATE_NOMINAL_MEMBERS_5^#
130130
}
131131

132132
// PRIVATE_NOMINAL_MEMBERS_5: Begin completions
133-
// PRIVATE_NOMINAL_MEMBERS_5-DAG: Decl[InstanceMethod]/CurrNominal: append({#(newElement): Equatable#})[#Void#]{{; name=.+}}
134-
// PRIVATE_NOMINAL_MEMBERS_5-DAG: Decl[InstanceMethod]/CurrNominal: insert({#(newElement): Equatable#}, {#at: Int#})[#Void#]{{; name=.+}}
135-
// PRIVATE_NOMINAL_MEMBERS_5-DAG: Decl[InstanceMethod]/CurrNominal: popLast()[#Equatable?#]{{; name=.+}}
133+
// PRIVATE_NOMINAL_MEMBERS_5-DAG: Decl[InstanceMethod]/CurrNominal: append({#(newElement): (Equatable)#})[#Void#]{{; name=.+}}
134+
// PRIVATE_NOMINAL_MEMBERS_5-DAG: Decl[InstanceMethod]/CurrNominal: insert({#(newElement): (Equatable)#}, {#at: Int#})[#Void#]{{; name=.+}}
135+
// PRIVATE_NOMINAL_MEMBERS_5-DAG: Decl[InstanceMethod]/CurrNominal: popLast()[#(Equatable)?#]{{; name=.+}}
136136
// PRIVATE_NOMINAL_MEMBERS_5-DAG: Decl[InstanceVar]/Super: isEmpty[#Bool#]{{; name=.+}}
137-
// PRIVATE_NOMINAL_MEMBERS_5-DAG: Decl[InstanceVar]/Super: first[#Equatable?#]{{; name=.+}}
137+
// PRIVATE_NOMINAL_MEMBERS_5-DAG: Decl[InstanceVar]/Super: first[#(Equatable)?#]{{; name=.+}}
138138
// PRIVATE_NOMINAL_MEMBERS_5-DAG: Decl[InstanceMethod]/Super: dropFirst({#(n): Int#})[#ArraySlice<Equatable>#]{{; name=.+}}
139139
// PRIVATE_NOMINAL_MEMBERS_5-DAG: Decl[InstanceMethod]/Super: dropLast({#(n): Int#})[#ArraySlice<Equatable>#]{{; name=.+}}
140140
// PRIVATE_NOMINAL_MEMBERS_5-DAG: Decl[InstanceMethod]/Super: prefix({#(maxLength): Int#})[#ArraySlice<Equatable>#]{{; name=.+}}
@@ -146,33 +146,33 @@ func testArchetypeReplacement2<BAR : Equatable>(_ a: [BAR]) {
146146
}
147147

148148
// PRIVATE_NOMINAL_MEMBERS_6: Begin completions
149-
// PRIVATE_NOMINAL_MEMBERS_6-DAG: Decl[InstanceMethod]/CurrNominal: append({#(newElement): Equatable#})[#Void#]{{; name=.+}}
150-
// PRIVATE_NOMINAL_MEMBERS_6-DAG: Decl[InstanceMethod]/CurrNominal: insert({#(newElement): Equatable#}, {#at: Int#})[#Void#]{{; name=.+}}
151-
// PRIVATE_NOMINAL_MEMBERS_6-DAG: Decl[InstanceMethod]/CurrNominal: popLast()[#Equatable?#]{{; name=.+}}
149+
// PRIVATE_NOMINAL_MEMBERS_6-DAG: Decl[InstanceMethod]/CurrNominal: append({#(newElement): (Equatable)#})[#Void#]{{; name=.+}}
150+
// PRIVATE_NOMINAL_MEMBERS_6-DAG: Decl[InstanceMethod]/CurrNominal: insert({#(newElement): (Equatable)#}, {#at: Int#})[#Void#]{{; name=.+}}
151+
// PRIVATE_NOMINAL_MEMBERS_6-DAG: Decl[InstanceMethod]/CurrNominal: popLast()[#(Equatable)?#]{{; name=.+}}
152152
// PRIVATE_NOMINAL_MEMBERS_6-DAG: Decl[InstanceMethod]/Super: dropFirst()[#ArraySlice<Equatable>#]{{; name=.+}}
153153
// PRIVATE_NOMINAL_MEMBERS_6-DAG: Decl[InstanceMethod]/Super: dropLast()[#ArraySlice<Equatable>#]{{; name=.+}}
154154
// PRIVATE_NOMINAL_MEMBERS_6-DAG: Decl[InstanceMethod]/Super: enumerated()[#EnumeratedSequence<[Equatable]>#]{{; name=.+}}
155-
// PRIVATE_NOMINAL_MEMBERS_6-DAG: Decl[InstanceMethod]/Super: min({#by: (Equatable, Equatable) throws -> Bool##(Equatable, Equatable) throws -> Bool#})[' rethrows'][#Equatable?#]{{; name=.+}}
156-
// PRIVATE_NOMINAL_MEMBERS_6-DAG: Decl[InstanceMethod]/Super: max({#by: (Equatable, Equatable) throws -> Bool##(Equatable, Equatable) throws -> Bool#})[' rethrows'][#Equatable?#]{{; name=.+}}
155+
// PRIVATE_NOMINAL_MEMBERS_6-DAG: Decl[InstanceMethod]/Super: min({#by: ((Equatable), (Equatable)) throws -> Bool##((Equatable), (Equatable)) throws -> Bool#})[' rethrows'][#(Equatable)?#]{{; name=.+}}
156+
// PRIVATE_NOMINAL_MEMBERS_6-DAG: Decl[InstanceMethod]/Super: max({#by: ((Equatable), (Equatable)) throws -> Bool##((Equatable), (Equatable)) throws -> Bool#})[' rethrows'][#(Equatable)?#]{{; name=.+}}
157157
// FIXME: The following should include 'partialResult' as local parameter name: "(nextPartialResult): (_ partialResult: Result, Equatable)"
158-
// PRIVATE_NOMINAL_MEMBERS_6-DAG: Decl[InstanceMethod]/Super: reduce({#(initialResult): Result#}, {#(nextPartialResult): (Result, Equatable) throws -> Result##(Result, Equatable) throws -> Result#})[' rethrows'][#Result#]{{; name=.+}}
158+
// PRIVATE_NOMINAL_MEMBERS_6-DAG: Decl[InstanceMethod]/Super: reduce({#(initialResult): Result#}, {#(nextPartialResult): (Result, (Equatable)) throws -> Result##(Result, (Equatable)) throws -> Result#})[' rethrows'][#Result#]{{; name=.+}}
159159
// PRIVATE_NOMINAL_MEMBERS_6-DAG: Decl[InstanceMethod]/Super: dropFirst({#(n): Int#})[#ArraySlice<Equatable>#]{{; name=.+}}
160-
// PRIVATE_NOMINAL_MEMBERS_6-DAG: Decl[InstanceMethod]/Super: flatMap({#(transform): (Equatable) throws -> Sequence##(Equatable) throws -> Sequence#})[' rethrows'][#[IteratorProtocol.Element]#]{{; name=.+}}
160+
// FIXME: restore Decl[InstanceMethod]/Super: flatMap({#(transform): ((Equatable)) throws -> Sequence##(Equatable) throws -> Sequence#})[' rethrows'][#[IteratorProtocol.Element]#]{{; name=.+}}
161161

162162
func testArchetypeReplacement3 (_ a : [Int]) {
163163
a.#^PRIVATE_NOMINAL_MEMBERS_7^#
164164
}
165165

166166
// PRIVATE_NOMINAL_MEMBERS_7: Begin completions
167-
// PRIVATE_NOMINAL_MEMBERS_7-DAG: Decl[InstanceMethod]/CurrNominal: append({#(newElement): Int#})[#Void#]
168-
// PRIVATE_NOMINAL_MEMBERS_7-DAG: Decl[InstanceMethod]/Super: removeLast()[#Int#]
169-
// PRIVATE_NOMINAL_MEMBERS_7-DAG: Decl[InstanceMethod]/CurrNominal: popLast()[#Int?#]
170-
// PRIVATE_NOMINAL_MEMBERS_7-DAG: Decl[InstanceVar]/Super: first[#Int?#]
171-
// PRIVATE_NOMINAL_MEMBERS_7-DAG: Decl[InstanceMethod]/Super: map({#(transform): (Int) throws -> T##(Int) throws -> T#})[' rethrows'][#[T]#]
167+
// PRIVATE_NOMINAL_MEMBERS_7-DAG: Decl[InstanceMethod]/CurrNominal: append({#(newElement): (Int)#})[#Void#]
168+
// PRIVATE_NOMINAL_MEMBERS_7-DAG: Decl[InstanceMethod]/Super: removeLast()[#(Int)#]
169+
// PRIVATE_NOMINAL_MEMBERS_7-DAG: Decl[InstanceMethod]/CurrNominal: popLast()[#(Int)?#]
170+
// PRIVATE_NOMINAL_MEMBERS_7-DAG: Decl[InstanceVar]/Super: first[#(Int)?#]
171+
// PRIVATE_NOMINAL_MEMBERS_7-DAG: Decl[InstanceMethod]/Super: map({#(transform): ((Int)) throws -> T##((Int)) throws -> T#})[' rethrows'][#[T]#]
172172
// PRIVATE_NOMINAL_MEMBERS_7-DAG: Decl[InstanceMethod]/Super: dropLast({#(n): Int#})[#ArraySlice<Int>#]
173-
// PRIVATE_NOMINAL_MEMBERS_7-DAG: Decl[InstanceMethod]/Super: dropFirst({#(n): Int#})[#AnySequence<Int>#]
174-
// PRIVATE_NOMINAL_MEMBERS_7-DAG: Decl[InstanceMethod]/Super: prefix({#(maxLength): Int#})[#AnySequence<Int>#]
175-
// PRIVATE_NOMINAL_MEMBERS_7-DAG: Decl[InstanceMethod]/Super: elementsEqual({#(other): Sequence#}, {#by: (Int, Int) throws -> Bool##(Int, Int) throws -> Bool#})[' rethrows'][#Bool#]
173+
// PRIVATE_NOMINAL_MEMBERS_7-DAG: Decl[InstanceMethod]/Super: dropFirst({#(n): Int#})[#AnySequence<(Int)>#]
174+
// PRIVATE_NOMINAL_MEMBERS_7-DAG: Decl[InstanceMethod]/Super: prefix({#(maxLength): Int#})[#AnySequence<(Int)>#]
175+
// PRIVATE_NOMINAL_MEMBERS_7-DAG: Decl[InstanceMethod]/Super: elementsEqual({#(other): Sequence#}, {#by: ((Int), (Int)) throws -> Bool##((Int), (Int)) throws -> Bool#})[' rethrows'][#Bool#]
176176

177177

178178
protocol P2 {

‎test/IDE/print_type_interface.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ extension D {
7070

7171
// RUN: %target-swift-ide-test -print-type-interface -usr=_TtGSaSi_ -module-name print_type_interface -source-filename %s | %FileCheck %s -check-prefix=TYPE4
7272
// TYPE4-DAG: public typealias Index = Int
73-
// TYPE4-DAG: public func min() -> Int?
73+
// TYPE4-DAG: public func min() -> (Int)?
7474
// TYPE4-DAG: public mutating func insert<C>(contentsOf newElements: C, at i: Int)
7575
// TYPE4-DAG: public mutating func removeFirst(_ n: Int)
7676
// TYPE4-DAG: public func makeIterator() -> IndexingIterator<Array<Int>>
@@ -79,7 +79,7 @@ extension D {
7979
// RUN: %target-swift-ide-test -print-type-interface -usr=_TtGSaSS_ -module-name print_type_interface -source-filename %s | %FileCheck %s -check-prefix=TYPE5
8080
// TYPE5-DAG: public func prefix(_ maxLength: Int) -> ArraySlice<String>
8181
// TYPE5-DAG: public func suffix(_ maxLength: Int) -> ArraySlice<String>
82-
// TYPE5-DAG: public func split(separator: String, maxSplits: Int = default, omittingEmptySubsequences: Bool = default) -> [ArraySlice<String>]
82+
// TYPE5-DAG: public func split(separator: (String), maxSplits: Int = default, omittingEmptySubsequences: Bool = default) -> [ArraySlice<String>]
8383
// TYPE5-DAG: public func formIndex(_ i: inout Int, offsetBy n: Int)
8484
// TYPE5-DAG: public func distance(from start: Int, to end: Int) -> Int
8585
// TYPE5-DAG: public func joined(separator: String = default) -> String

‎test/Misc/misc_diagnostics.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ func testIS1() -> Int { return 0 }
9090
let _: String = testIS1() // expected-error {{cannot convert value of type 'Int' to specified type 'String'}}
9191

9292
func insertA<T>(array : inout [T], elt : T) {
93-
array.append(T); // expected-error {{cannot invoke 'append' with an argument list of type '((T).Type)'}} expected-note {{expected an argument list of type '(T)'}}
93+
array.append(T); // expected-error {{cannot invoke 'append' with an argument list of type '((T).Type)'}} expected-note {{expected an argument list of type '((T))'}}
9494
}
9595

9696
// <rdar://problem/17875634> can't append to array of tuples

‎test/SILGen/foreach.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -494,21 +494,21 @@ func genericCollectionBreak<T : Collection>(_ xx: T) {
494494
// CHECK: [[PROJECT_ITERATOR_BOX:%.*]] = project_box [[ITERATOR_BOX]]
495495
// CHECK: [[MAKE_ITERATOR_FUNC:%.*]] = witness_method $T, #Sequence.makeIterator!1 : <Self where Self : Sequence> (Self) -> () -> Self.Iterator : $@convention(witness_method) <τ_0_0 where τ_0_0 : Sequence> (@in_guaranteed τ_0_0) -> @out τ_0_0.Iterator
496496
// CHECK: apply [[MAKE_ITERATOR_FUNC]]<T>([[PROJECT_ITERATOR_BOX]], [[COLLECTION]])
497-
// CHECK: [[ELT_STACK:%.*]] = alloc_stack $Optional<T._Element>
497+
// CHECK: [[ELT_STACK:%.*]] = alloc_stack $Optional<T.Element>
498498
// CHECK: br [[LOOP_DEST:bb[0-9]+]]
499499
//
500500
// CHECK: [[LOOP_DEST]]:
501501
// CHECK: [[GET_NEXT_FUNC:%.*]] = witness_method $T.Iterator, #IteratorProtocol.next!1 : <Self where Self : IteratorProtocol> (inout Self) -> () -> Self.Element? : $@convention(witness_method) <τ_0_0 where τ_0_0 : IteratorProtocol> (@inout τ_0_0) -> @out Optional<τ_0_0.Element>
502502
// CHECK: [[WRITE:%.*]] = begin_access [modify] [unknown] [[PROJECT_ITERATOR_BOX]] : $*T.Iterator
503503
// CHECK: apply [[GET_NEXT_FUNC]]<T.Iterator>([[ELT_STACK]], [[WRITE]])
504-
// CHECK: switch_enum_addr [[ELT_STACK]] : $*Optional<T._Element>, case #Optional.some!enumelt.1: [[SOME_BB:bb[0-9]+]], case #Optional.none!enumelt: [[NONE_BB:bb[0-9]+]]
504+
// CHECK: switch_enum_addr [[ELT_STACK]] : $*Optional<T.Element>, case #Optional.some!enumelt.1: [[SOME_BB:bb[0-9]+]], case #Optional.none!enumelt: [[NONE_BB:bb[0-9]+]]
505505
//
506506
// CHECK: [[NONE_BB]]:
507507
// CHECK: br [[CONT_BLOCK_JUMP:bb[0-9]+]]
508508
//
509509
// CHECK: [[SOME_BB]]:
510-
// CHECK: [[T0:%.*]] = alloc_stack $T._Element, let, name "x"
511-
// CHECK: [[ELT_STACK_TAKE:%.*]] = unchecked_take_enum_data_addr [[ELT_STACK]] : $*Optional<T._Element>, #Optional.some!enumelt.1
510+
// CHECK: [[T0:%.*]] = alloc_stack $T.Element, let, name "x"
511+
// CHECK: [[ELT_STACK_TAKE:%.*]] = unchecked_take_enum_data_addr [[ELT_STACK]] : $*Optional<T.Element>, #Optional.some!enumelt.1
512512
// CHECK: copy_addr [take] [[ELT_STACK_TAKE]] to [initialization] [[T0]]
513513
// CHECK: cond_br {{%.*}}, [[LOOP_BREAK_END_BLOCK:bb[0-9]+]], [[CONTINUE_CHECK_BLOCK:bb[0-9]+]]
514514
//

‎test/SILGen/witness_same_type.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ struct Foo: Fooable {
1919
}
2020

2121
// rdar://problem/19049566
22-
// CHECK-LABEL: sil shared [transparent] [serialized] [thunk] @_T017witness_same_type14LazySequenceOfVyxq_Gs0E0AAsAERz8Iterator_7ElementQZRs_r0_lsAEP04makeG0AFQzyFTW : $@convention(witness_method) <τ_0_0, τ_0_1 where τ_0_0 : Sequence, τ_0_1 == τ_0_0.Iterator.Element> (@in_guaranteed LazySequenceOf<τ_0_0, τ_0_1>) -> @out AnyIterator<τ_0_1>
22+
// CHECK-LABEL: sil shared [transparent] [serialized] [thunk] @_T017witness_same_type14LazySequenceOfVyxq_Gs0E0AAsAERz7ElementQzRs_r0_lsAEP12makeIterator0I0QzyFTW : $@convention(witness_method) <τ_0_0, τ_0_1 where τ_0_0 : Sequence, τ_0_1 == τ_0_0.Element> (@in_guaranteed LazySequenceOf<τ_0_0, τ_0_1>) -> @out AnyIterator<τ_0_1>
2323
public struct LazySequenceOf<SS : Sequence, A where SS.Iterator.Element == A> : Sequence {
2424
public func makeIterator() -> AnyIterator<A> {
2525
var opt: AnyIterator<A>?

‎test/SILOptimizer/array_contentof_opt.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public func testThreeInts(_ a: inout [Int]) {
3232

3333
// CHECK-LABEL: sil @{{.*}}testTooManyInts
3434
// CHECK-NOT: apply
35-
// CHECK: [[F:%[0-9]+]] = function_ref @_T0Sa6appendyqd__10contentsOf_t8Iterator_7ElementQYd__Rszs8SequenceRd__lF
35+
// CHECK: [[F:%[0-9]+]] = function_ref @_T0Sa6appendyqd__10contentsOf_t7ElementQyd__Rszs8SequenceRd__lFSi_SaySiGTg5
3636
// CHECK-NOT: apply
3737
// CHECK: apply [[F]]
3838
// CHECK-NOT: apply

0 commit comments

Comments
 (0)