Skip to content

Commit e64977e

Browse files
swift-ciswift-ci
authored
Merge pull request #13757 from eeckstein/dollar-sil-names
2 parents 9efe1c2 + ca67b43 commit e64977e

File tree

80 files changed

+653
-650
lines changed

Some content is hidden

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

80 files changed

+653
-650
lines changed

‎lib/Parse/Lexer.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -852,8 +852,9 @@ void Lexer::lexDollarIdent() {
852852
const char *tokStart = CurPtr-1;
853853
assert(*tokStart == '$');
854854

855-
// In a SIL function body, '$' is a token by itself.
856-
if (InSILBody)
855+
// In a SIL function body, '$' is a token by itself, except it's a SIL global
856+
// name. SIL global identifiers may start with a '$', e.g. @$S1m3fooyyF.
857+
if (InSILBody && NextToken.getKind() != tok::at_sign)
857858
return formToken(tok::sil_dollar, tokStart);
858859

859860
bool isAllDigits = true;
@@ -881,7 +882,7 @@ void Lexer::lexDollarIdent() {
881882

882883
// We reserve $nonNumeric for persistent bindings in the debugger.
883884
if (!isAllDigits) {
884-
if (!LangOpts.EnableDollarIdentifiers)
885+
if (!LangOpts.EnableDollarIdentifiers && !InSILBody)
885886
diagnose(tokStart, diag::expected_dollar_numeric);
886887

887888
// Even if we diagnose, we go ahead and form an identifier token,

‎lib/ParseSIL/ParseSIL.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -433,6 +433,7 @@ bool SILParser::parseSILIdentifier(Identifier &Result, SourceLoc &Loc,
433433
const Diagnostic &D) {
434434
switch (P.Tok.getKind()) {
435435
case tok::identifier:
436+
case tok::dollarident:
436437
Result = P.Context.getIdentifier(P.Tok.getText());
437438
break;
438439
case tok::string_literal: {
@@ -5277,6 +5278,7 @@ bool SILParserTUState::parseSILVTable(Parser &P) {
52775278
} else {
52785279
if (P.parseToken(tok::colon, diag::expected_sil_vtable_colon) ||
52795280
parseSILLinkage(Linkage, P) ||
5281+
P.parseToken(tok::at_sign, diag::expected_sil_function_name) ||
52805282
VTableState.parseSILIdentifier(FuncName, FuncLoc,
52815283
diag::expected_sil_value_name))
52825284
return true;

‎lib/SIL/SILPrinter.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2653,7 +2653,7 @@ void SILVTable::print(llvm::raw_ostream &OS, bool Verbose) const {
26532653
stripExternalFromLinkage(entry.Implementation->getLinkage())) {
26542654
OS << getLinkageString(entry.Linkage);
26552655
}
2656-
OS << entry.Implementation->getName();
2656+
OS << '@' << entry.Implementation->getName();
26572657
switch (entry.TheKind) {
26582658
case SILVTable::Entry::Kind::Normal:
26592659
break;

‎test/IRGen/class.sil

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -137,12 +137,12 @@ sil public_external @alloc_RequiredBase : $@convention(method) (@thick RequiredB
137137
sil public_external @init_RequiredBase : $@convention(method) (@owned RequiredBase) -> @owned RequiredBase
138138

139139
sil_vtable NonRequiredBase {
140-
#NonRequiredBase.init!initializer.1: init_NonRequiredBase
140+
#NonRequiredBase.init!initializer.1: @init_NonRequiredBase
141141
}
142142

143143
sil_vtable RequiredBase {
144-
#NonRequiredBase.init!initializer.1: init_RequiredBase
145-
#RequiredBase.init!allocator.1: alloc_RequiredBase
144+
#NonRequiredBase.init!initializer.1: @init_RequiredBase
145+
#RequiredBase.init!allocator.1: @alloc_RequiredBase
146146
}
147147

148148
// rdar://problem/19902523

‎test/IRGen/dynamic_init.sil

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,5 @@ bb0(%0 : $@thick C.Type):
3333
}
3434

3535
sil_vtable C {
36-
#C.init!allocator.1: _T012dynamic_init1CCACycACmcfC // dynamic_init.C.__allocating_init (dynamic_init.C.Type)() -> dynamic_init.C
36+
#C.init!allocator.1: @_T012dynamic_init1CCACycACmcfC // dynamic_init.C.__allocating_init (dynamic_init.C.Type)() -> dynamic_init.C
3737
}

‎test/IRGen/exactcast.sil

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -50,17 +50,17 @@ sil @_TFC9pic_crash10ParentNodecfMS0_FT5indexSi_S0_ : $@convention(method) (Int,
5050
sil @_TFC9pic_crash10ParentNodeCfMS0_FT5indexSi_S0_ : $@convention(thin) (Int, @thick ParentNode.Type) -> @owned ParentNode
5151

5252
sil_vtable Node {
53-
#Node.init!initializer.1: _TFC9pic_crash4NodecfMS0_FT5indexSi_S0_ // pic_crash.Node.init (pic_crash.Node.Type)(index : Swift.Int) -> pic_crash.Node
54-
#Node.check!1: _test_exact_checked_cast_branch // pic_crash.Node.check (pic_crash.Node)() -> Swift.Int
55-
#Node.index!getter.1: _TFC9pic_crash4Nodeg5indexSi // pic_crash.Node.index.getter : Swift.Int
56-
#Node.index!setter.1: _TFC9pic_crash4Nodes5indexSi // pic_crash.Node.index.setter : Swift.Int
53+
#Node.init!initializer.1: @_TFC9pic_crash4NodecfMS0_FT5indexSi_S0_ // pic_crash.Node.init (pic_crash.Node.Type)(index : Swift.Int) -> pic_crash.Node
54+
#Node.check!1: @_test_exact_checked_cast_branch // pic_crash.Node.check (pic_crash.Node)() -> Swift.Int
55+
#Node.index!getter.1: @_TFC9pic_crash4Nodeg5indexSi // pic_crash.Node.index.getter : Swift.Int
56+
#Node.index!setter.1: @_TFC9pic_crash4Nodes5indexSi // pic_crash.Node.index.setter : Swift.Int
5757
}
5858

5959
sil_vtable ParentNode {
60-
#Node.init!initializer.1: _TFC9pic_crash10ParentNodecfMS0_FT5indexSi_S0_ // pic_crash.ParentNode.init (pic_crash.ParentNode.Type)(index : Swift.Int) -> pic_crash.ParentNode
61-
#Node.check!1: _test_exact_checked_cast_branch // pic_crash.Node.check (pic_crash.Node)() -> Swift.Int
62-
#Node.index!getter.1: _TFC9pic_crash4Nodeg5indexSi // pic_crash.Node.index.getter : Swift.Int
63-
#Node.index!setter.1: _TFC9pic_crash4Nodes5indexSi // pic_crash.Node.index.setter : Swift.Int
64-
#ParentNode.init!initializer.1: _TFC9pic_crash10ParentNodecfMS0_FT4leftCS_4Node5rightS1_5indexSi_S0_ // pic_crash.ParentNode.init (pic_crash.ParentNode.Type)(left : pic_crash.Node, right : pic_crash.Node, index : Swift.Int) -> pic_crash.ParentNode
60+
#Node.init!initializer.1: @_TFC9pic_crash10ParentNodecfMS0_FT5indexSi_S0_ // pic_crash.ParentNode.init (pic_crash.ParentNode.Type)(index : Swift.Int) -> pic_crash.ParentNode
61+
#Node.check!1: @_test_exact_checked_cast_branch // pic_crash.Node.check (pic_crash.Node)() -> Swift.Int
62+
#Node.index!getter.1: @_TFC9pic_crash4Nodeg5indexSi // pic_crash.Node.index.getter : Swift.Int
63+
#Node.index!setter.1: @_TFC9pic_crash4Nodes5indexSi // pic_crash.Node.index.setter : Swift.Int
64+
#ParentNode.init!initializer.1: @_TFC9pic_crash10ParentNodecfMS0_FT4leftCS_4Node5rightS1_5indexSi_S0_ // pic_crash.ParentNode.init (pic_crash.ParentNode.Type)(left : pic_crash.Node, right : pic_crash.Node, index : Swift.Int) -> pic_crash.ParentNode
6565
}
6666

‎test/IRGen/exactcast2.sil

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,15 +46,15 @@ sil @_TFC4main3MD5cfMS0_FT_S0_ : $@convention(method) (@owned MD5) -> @owned MD5
4646
sil @_TFC4main3MD5CfMS0_FT_S0_ : $@convention(thin) (@thick MD5.Type) -> @owned MD5
4747

4848
sil_vtable Hash {
49-
#Hash.init!initializer.1: _TFC4main4HashcfMS0_FT_S0_ // main.Hash.init (main.Hash.Type)() -> main.Hash
50-
#Hash.update!1: _TFC4main4Hash6updatefS0_FT_T_ // main.Hash.update (main.Hash)() -> ()
51-
#Hash.hash!1: _TFC4main4Hash4hashfS0_FT_T_ // main.Hash.hash (main.Hash)() -> ()
49+
#Hash.init!initializer.1: @_TFC4main4HashcfMS0_FT_S0_ // main.Hash.init (main.Hash.Type)() -> main.Hash
50+
#Hash.update!1: @_TFC4main4Hash6updatefS0_FT_T_ // main.Hash.update (main.Hash)() -> ()
51+
#Hash.hash!1: @_TFC4main4Hash4hashfS0_FT_T_ // main.Hash.hash (main.Hash)() -> ()
5252
}
5353

5454
sil_vtable MD5 {
55-
#Hash.init!initializer.1: _TFC4main3MD5cfMS0_FT_S0_ // main.MD5.init (main.MD5.Type)() -> main.MD5
56-
#Hash.update!1: _TFC4main4Hash6updatefS0_FT_T_ // main.Hash.update (main.Hash)() -> ()
57-
#Hash.hash!1: _TFC4main4Hash4hashfS0_FT_T_ // main.Hash.hash (main.Hash)() -> ()
55+
#Hash.init!initializer.1: @_TFC4main3MD5cfMS0_FT_S0_ // main.MD5.init (main.MD5.Type)() -> main.MD5
56+
#Hash.update!1: @_TFC4main4Hash6updatefS0_FT_T_ // main.Hash.update (main.Hash)() -> ()
57+
#Hash.hash!1: @_TFC4main4Hash4hashfS0_FT_T_ // main.Hash.hash (main.Hash)() -> ()
5858
}
5959

6060

‎test/IRGen/generic_classes.sil

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -131,9 +131,9 @@ sil @_TFC15generic_classes11RootGeneric3barU__fGS0_Q__FT_T_ : $@convention(metho
131131
sil @_TFC15generic_classes11RootGeneric3basU__fGS0_Q__FT_T_ : $@convention(method) <T> (@guaranteed RootGeneric<T>) -> ()
132132

133133
sil_vtable RootGeneric {
134-
#RootGeneric.foo!1: _TFC15generic_classes11RootGeneric3fooU__fGS0_Q__FT_T_
135-
#RootGeneric.bar!1: _TFC15generic_classes11RootGeneric3barU__fGS0_Q__FT_T_
136-
#RootGeneric.bas!1: _TFC15generic_classes11RootGeneric3basU__fGS0_Q__FT_T_
134+
#RootGeneric.foo!1: @_TFC15generic_classes11RootGeneric3fooU__fGS0_Q__FT_T_
135+
#RootGeneric.bar!1: @_TFC15generic_classes11RootGeneric3barU__fGS0_Q__FT_T_
136+
#RootGeneric.bas!1: @_TFC15generic_classes11RootGeneric3basU__fGS0_Q__FT_T_
137137
}
138138

139139
class RootGenericFixedLayout<T> {
@@ -174,12 +174,12 @@ sil @_TFC15generic_classes22GenericInheritsGeneric3dooU___fGS0_Q_Q0__FT_T_ : $@c
174174
sil @_TFC15generic_classes22GenericInheritsGeneric3dahU___fGS0_Q_Q0__FT_T_ : $@convention(method) <A, B> (@guaranteed GenericInheritsGeneric<A, B>) -> ()
175175

176176
sil_vtable GenericInheritsGeneric {
177-
#RootGeneric.foo!1: _TFC15generic_classes11RootGeneric3fooU__fGS0_Q__FT_T_ [inherited]
178-
#RootGeneric.bar!1: _TFC15generic_classes11RootGeneric3barU__fGS0_Q__FT_T_ [inherited]
179-
#RootGeneric.bas!1: _TFC15generic_classes11RootGeneric3basU__fGS0_Q__FT_T_ [inherited]
180-
#GenericInheritsGeneric.zippity!1: _TFC15generic_classes22GenericInheritsGeneric7zippityU___fGS0_Q_Q0__FT_T_
181-
#GenericInheritsGeneric.doo!1: _TFC15generic_classes22GenericInheritsGeneric3dooU___fGS0_Q_Q0__FT_T_
182-
#GenericInheritsGeneric.dah!1: _TFC15generic_classes22GenericInheritsGeneric3dahU___fGS0_Q_Q0__FT_T_
177+
#RootGeneric.foo!1: @_TFC15generic_classes11RootGeneric3fooU__fGS0_Q__FT_T_ [inherited]
178+
#RootGeneric.bar!1: @_TFC15generic_classes11RootGeneric3barU__fGS0_Q__FT_T_ [inherited]
179+
#RootGeneric.bas!1: @_TFC15generic_classes11RootGeneric3basU__fGS0_Q__FT_T_ [inherited]
180+
#GenericInheritsGeneric.zippity!1: @_TFC15generic_classes22GenericInheritsGeneric7zippityU___fGS0_Q_Q0__FT_T_
181+
#GenericInheritsGeneric.doo!1: @_TFC15generic_classes22GenericInheritsGeneric3dooU___fGS0_Q_Q0__FT_T_
182+
#GenericInheritsGeneric.dah!1: @_TFC15generic_classes22GenericInheritsGeneric3dahU___fGS0_Q_Q0__FT_T_
183183
}
184184

185185
class GenericInheritsNonGeneric<C> : RootNonGeneric {

‎test/IRGen/ivar_destroyer.sil

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class TrivialBase {}
3737
sil public_external @init_TrivialBase : $@convention(method) (@owned TrivialBase) -> @owned TrivialBase
3838

3939
sil_vtable TrivialBase {
40-
#TrivialBase.init!initializer.1: init_TrivialBase
40+
#TrivialBase.init!initializer.1: @init_TrivialBase
4141
}
4242

4343
class NonTrivialDerived : TrivialBase {
@@ -51,7 +51,7 @@ sil public_external @alloc_NonTrivialDerived : $@convention(method) (@thick NonT
5151
sil public_external @_T014ivar_destroyer17NonTrivialDerivedCfE : $@convention(method) (@guaranteed NonTrivialDerived) -> ()
5252

5353
sil_vtable NonTrivialDerived {
54-
#NonTrivialDerived.init!initializer.1: init_NonTrivialDerived
55-
#NonTrivialDerived.init!allocator.1: alloc_NonTrivialDerived
56-
#NonTrivialDerived!ivardestroyer.1: _T014ivar_destroyer17NonTrivialDerivedCfE
54+
#NonTrivialDerived.init!initializer.1: @init_NonTrivialDerived
55+
#NonTrivialDerived.init!allocator.1: @alloc_NonTrivialDerived
56+
#NonTrivialDerived!ivardestroyer.1: @_T014ivar_destroyer17NonTrivialDerivedCfE
5757
}

‎test/IRGen/nonatomic_reference_counting.sil

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,6 +220,6 @@ bb0(%0 : $C):
220220
}
221221

222222
sil_vtable C {
223-
#C.deinit!deallocator: _TFC28nonatomic_reference_counting1CD // C.__deallocating_deinit
223+
#C.deinit!deallocator: @_TFC28nonatomic_reference_counting1CD // C.__deallocating_deinit
224224
}
225225

‎test/IRGen/objc_attr_NSManaged.sil

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,5 +65,5 @@ sil @_T019objc_attr_NSManaged10SwiftGizmoC7bellsOnSQyACGSi_tcfc : $@convention(m
6565
/* FIXME: sil_vtable parser picks the wrong 'init' overload. rdar://problem/19572342 */
6666
sil_vtable SwiftGizmo {
6767
// #SwiftGizmo.init!initializer.1: _T019objc_attr_NSManaged10SwiftGizmoCACycfc
68-
#SwiftGizmo.init!initializer.1: _T019objc_attr_NSManaged10SwiftGizmoC7bellsOnACSi_tcfc
68+
#SwiftGizmo.init!initializer.1: @_T019objc_attr_NSManaged10SwiftGizmoC7bellsOnACSi_tcfc
6969
}

‎test/IRGen/readonly.sil

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,6 @@ bb0(%0 : $*Any):
6262
}
6363

6464
sil_vtable XXX {
65-
#XXX.deinit!deallocator: XXX_dtor
66-
#XXX.init!initializer.1: XXX_ctor
65+
#XXX.deinit!deallocator: @XXX_dtor
66+
#XXX.init!initializer.1: @XXX_ctor
6767
}

‎test/IRGen/super.sil

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -186,13 +186,13 @@ bb0(%0 : $@thick ResilientOutsideChild.Type):
186186
// CHECK: call swiftcc void
187187

188188
sil_vtable ChildToResilientParent {
189-
#ResilientOutsideParent.method!1: _T05super22ChildToResilientParentC6methodyyF // super.ChildToResilientParent.method () -> ()
190-
#ResilientOutsideParent.classMethod!1: _T05super22ChildToResilientParentC11classMethodyyFZ // static super.ChildToResilientParent.classMethod () -> ()
189+
#ResilientOutsideParent.method!1: @_T05super22ChildToResilientParentC6methodyyF // super.ChildToResilientParent.method () -> ()
190+
#ResilientOutsideParent.classMethod!1: @_T05super22ChildToResilientParentC11classMethodyyFZ // static super.ChildToResilientParent.classMethod () -> ()
191191
}
192192

193193
sil_vtable ChildToFixedParent {
194-
#OutsideParent.method!1: _T05super18ChildToFixedParentC6methodyyF // super.ChildToFixedParent.method () -> ()
195-
#OutsideParent.classMethod!1: _T05super18ChildToFixedParentC11classMethodyyFZ // static super.ChildToFixedParent.classMethod () -> ()
194+
#OutsideParent.method!1: @_T05super18ChildToFixedParentC6methodyyF // super.ChildToFixedParent.method () -> ()
195+
#OutsideParent.classMethod!1: @_T05super18ChildToFixedParentC11classMethodyyFZ // static super.ChildToFixedParent.classMethod () -> ()
196196
}
197197

198198
protocol Proto {

‎test/IRGen/vtable.sil

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,6 @@ sil @_T06vtable1CCfD : $@convention(method) (@owned C) -> ()
5050
// CHECK-native: }>
5151

5252
sil_vtable C {
53-
#C.init!allocator.1: _T06vtable1CCACycACmcfC
54-
#C.init!initializer.1: _T06vtable1CCACycACmcfc
53+
#C.init!allocator.1: @_T06vtable1CCACycACmcfC
54+
#C.init!initializer.1: @_T06vtable1CCACycACmcfc
5555
}

‎test/SIL/Parser/SILDeclRef.sil

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -118,19 +118,19 @@ sil @_TF10SILDeclRef5testPFT1pPS_1P__Vs5Int32 : $@convention(thin) (@in P) -> In
118118
sil @_TF10SILDeclRef8testBaseFT1bCS_4Base_Vs5Int32 : $@convention(thin) (@owned Base) -> Int32
119119

120120
sil_vtable Derived1 {
121-
#Base.foo!1: (Base) -> () -> Int32 : _TFC10SILDeclRef8Derived13foofT_Vs5Int32 // Derived1.foo() -> Int32
122-
#Base.foo!1: (Base) -> (Int32) -> () : _TFC10SILDeclRef8Derived13foofT1nVs5Int32_T_ // Derived1.foo(n : Int32) -> ()
123-
#Base.foo!1: (Base) -> (Float) -> Int32 : _TFC10SILDeclRef8Derived13foofT1fSf_Vs5Int32 // Derived1.foo(f : Float) -> Int32
124-
#Base.init!initializer.1: (Base.Type) -> () -> Base : _TFC10SILDeclRef8Derived1cfT_S0_ // Derived1.init() -> Derived1
125-
#Derived1.deinit!deallocator: (Derived1) -> () -> () : _TFC10SILDeclRef8Derived1D // Derived1.__deallocating_deinit
121+
#Base.foo!1: (Base) -> () -> Int32 : @_TFC10SILDeclRef8Derived13foofT_Vs5Int32 // Derived1.foo() -> Int32
122+
#Base.foo!1: (Base) -> (Int32) -> () : @_TFC10SILDeclRef8Derived13foofT1nVs5Int32_T_ // Derived1.foo(n : Int32) -> ()
123+
#Base.foo!1: (Base) -> (Float) -> Int32 : @_TFC10SILDeclRef8Derived13foofT1fSf_Vs5Int32 // Derived1.foo(f : Float) -> Int32
124+
#Base.init!initializer.1: (Base.Type) -> () -> Base : @_TFC10SILDeclRef8Derived1cfT_S0_ // Derived1.init() -> Derived1
125+
#Derived1.deinit!deallocator: (Derived1) -> () -> () : @_TFC10SILDeclRef8Derived1D // Derived1.__deallocating_deinit
126126
}
127127

128128
sil_vtable Derived2 {
129-
#Base.foo!1: (Base) -> () -> Int32 : _TFC10SILDeclRef8Derived23foofT_Vs5Int32 // Derived2.foo() -> Int32
130-
#Base.foo!1: (Base) -> (Int32) -> () : _TFC10SILDeclRef8Derived23foofT1nVs5Int32_T_ // Derived2.foo(n : Int32) -> ()
131-
#Base.foo!1: (Base) -> (Float) -> Int32 : _TFC10SILDeclRef8Derived23foofT1fSf_Vs5Int32 // Derived2.foo(f : Float) -> Int32
132-
#Base.init!initializer.1: (Base.Type) -> () -> Base : _TFC10SILDeclRef8Derived2cfT_S0_ // Derived2.init() -> Derived2
133-
#Derived2.deinit!deallocator: (Derived2) -> () -> () : _TFC10SILDeclRef8Derived2D // Derived2.__deallocating_deinit
129+
#Base.foo!1: (Base) -> () -> Int32 : @_TFC10SILDeclRef8Derived23foofT_Vs5Int32 // Derived2.foo() -> Int32
130+
#Base.foo!1: (Base) -> (Int32) -> () : @_TFC10SILDeclRef8Derived23foofT1nVs5Int32_T_ // Derived2.foo(n : Int32) -> ()
131+
#Base.foo!1: (Base) -> (Float) -> Int32 : @_TFC10SILDeclRef8Derived23foofT1fSf_Vs5Int32 // Derived2.foo(f : Float) -> Int32
132+
#Base.init!initializer.1: (Base.Type) -> () -> Base : @_TFC10SILDeclRef8Derived2cfT_S0_ // Derived2.init() -> Derived2
133+
#Derived2.deinit!deallocator: (Derived2) -> () -> () : @_TFC10SILDeclRef8Derived2D // Derived2.__deallocating_deinit
134134
}
135135

136136
sil_witness_table [serialized] Base: P module SILDeclRef {

‎test/SIL/Parser/basic.sil

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1638,12 +1638,12 @@ bb0:
16381638
}
16391639

16401640
// CHECK-LABEL: sil_vtable Foo {
1641-
// CHECK: #Foo.subscript!getter.1: {{.*}} : hidden _TFC3tmp3Foog9subscriptFTVs5Int32S1__S1_
1642-
// CHECK: #Foo.subscript!setter.1: {{.*}} : _TFC3tmp3Foos9subscriptFTVs5Int32S1__S1_
1641+
// CHECK: #Foo.subscript!getter.1: {{.*}} : hidden @_TFC3tmp3Foog9subscriptFTVs5Int32S1__S1_
1642+
// CHECK: #Foo.subscript!setter.1: {{.*}} : @_TFC3tmp3Foos9subscriptFTVs5Int32S1__S1_
16431643
// CHECK: }
16441644
sil_vtable Foo {
16451645
// Override the linke to check if it is parsed correctly.
1646-
#Foo.subscript!getter.1: hidden _TFC3tmp3Foog9subscriptFTVs5Int32S1__S1_
1646+
#Foo.subscript!getter.1: hidden @_TFC3tmp3Foog9subscriptFTVs5Int32S1__S1_
16471647
// The public linkage is the same as the function's linkage and should not be printed.
1648-
#Foo.subscript!setter.1: public _TFC3tmp3Foos9subscriptFTVs5Int32S1__S1_
1648+
#Foo.subscript!setter.1: public @_TFC3tmp3Foos9subscriptFTVs5Int32S1__S1_
16491649
}

‎test/SIL/Parser/function_named_subscript.sil

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@ bb0(%0 : $SubscriptAsFunction):
1818
}
1919

2020
sil_vtable SubscriptAsFunction {
21-
// CHECK: #SubscriptAsFunction.`subscript`!1: (SubscriptAsFunction) -> () -> () : _T04test19SubscriptAsFunctionC9subscriptyyF
22-
#SubscriptAsFunction.`subscript`!1: (SubscriptAsFunction) -> () -> () : _T04test19SubscriptAsFunctionC9subscriptyyF
21+
// CHECK: #SubscriptAsFunction.`subscript`!1: (SubscriptAsFunction) -> () -> () : @_T04test19SubscriptAsFunctionC9subscriptyyF
22+
#SubscriptAsFunction.`subscript`!1: (SubscriptAsFunction) -> () -> () : @_T04test19SubscriptAsFunctionC9subscriptyyF
2323
}

‎test/SIL/Parser/nonatomic_reference_counting.sil

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,6 @@ bb0(%0 : $C):
9191
}
9292

9393
sil_vtable C {
94-
#C.deinit!deallocator: _TFC28nonatomic_reference_counting1CD // C.__deallocating_deinit
94+
#C.deinit!deallocator: @_TFC28nonatomic_reference_counting1CD // C.__deallocating_deinit
9595
}
9696

‎test/SIL/Parser/stored_property.sil

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,5 @@ bb0(%0 : $Rect):
2222
// CHECK_LABEL: sil_vtable Rect
2323
sil_vtable Rect {
2424
// CHECK: #Rect.orgx!getter
25-
#Rect.orgx!getter.1: _TFC4rect4Rectg4orgxSd
25+
#Rect.orgx!getter.1: @_TFC4rect4Rectg4orgxSd
2626
}

‎test/SIL/Serialization/vtable.sil

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -41,31 +41,31 @@ sil hidden_external [serialized] @_T01x7DerivedCACycfC : $@convention(method) (@
4141
sil hidden_external [serialized] @_T01x7DerivedCACycfc : $@convention(method) (@owned Derived) -> @owned Derived
4242

4343
sil_vtable Base {
44-
#Base.m1!1: (Base) -> () -> () : _T01x4BaseC2m1yyF
45-
#Base.m2!1: (Base) -> () -> () : _T01x4BaseC2m2yyF
46-
#Base.init!initializer.1: (Base.Type) -> () -> Base : _T01x4BaseCACycfc
47-
#Base.deinit!deallocator: _T01x4BaseCfD
44+
#Base.m1!1: (Base) -> () -> () : @_T01x4BaseC2m1yyF
45+
#Base.m2!1: (Base) -> () -> () : @_T01x4BaseC2m2yyF
46+
#Base.init!initializer.1: (Base.Type) -> () -> Base : @_T01x4BaseCACycfc
47+
#Base.deinit!deallocator: @_T01x4BaseCfD
4848
}
4949

5050
// CHECK-LABEL: sil_vtable Base {
51-
// CHECK-NEXT: #Base.m1!1: (Base) -> () -> () : _T01x4BaseC2m1yyF
52-
// CHECK-NEXT: #Base.m2!1: (Base) -> () -> () : _T01x4BaseC2m2yyF
53-
// CHECK-NEXT: #Base.init!initializer.1: (Base.Type) -> () -> Base : _T01x4BaseCACycfc
54-
// CHECK-NEXT: #Base.deinit!deallocator: _T01x4BaseCfD
51+
// CHECK-NEXT: #Base.m1!1: (Base) -> () -> () : @_T01x4BaseC2m1yyF
52+
// CHECK-NEXT: #Base.m2!1: (Base) -> () -> () : @_T01x4BaseC2m2yyF
53+
// CHECK-NEXT: #Base.init!initializer.1: (Base.Type) -> () -> Base : @_T01x4BaseCACycfc
54+
// CHECK-NEXT: #Base.deinit!deallocator: @_T01x4BaseCfD
5555
// CHECK-NEXT: }
5656

5757
sil_vtable Derived {
58-
#Base.m1!1: (Base) -> () -> () : _T01x4BaseC2m1yyF [inherited]
59-
#Base.m2!1: (Base) -> () -> () : _T01x7DerivedC2m2yyF [override]
60-
#Base.init!initializer.1: (Base.Type) -> () -> Base : _T01x7DerivedCACycfc [override]
61-
#Derived.m3!1: (Derived) -> () -> () : _T01x7DerivedC2m3yyF
62-
#Derived.deinit!deallocator: _T01x7DerivedCfD
58+
#Base.m1!1: (Base) -> () -> () : @_T01x4BaseC2m1yyF [inherited]
59+
#Base.m2!1: (Base) -> () -> () : @_T01x7DerivedC2m2yyF [override]
60+
#Base.init!initializer.1: (Base.Type) -> () -> Base : @_T01x7DerivedCACycfc [override]
61+
#Derived.m3!1: (Derived) -> () -> () : @_T01x7DerivedC2m3yyF
62+
#Derived.deinit!deallocator: @_T01x7DerivedCfD
6363
}
6464

6565
// CHECK-LABEL: sil_vtable Derived {
66-
// CHECK-NEXT: #Base.m1!1: (Base) -> () -> () : _T01x4BaseC2m1yyF [inherited]
67-
// CHECK-NEXT: #Base.m2!1: (Base) -> () -> () : _T01x7DerivedC2m2yyF [override]
68-
// CHECK-NEXT: #Base.init!initializer.1: (Base.Type) -> () -> Base : _T01x7DerivedCACycfc [override]
69-
// CHECK-NEXT: #Derived.m3!1: (Derived) -> () -> () : _T01x7DerivedC2m3yyF
70-
// CHECK-NEXT: #Derived.deinit!deallocator: _T01x7DerivedCfD
66+
// CHECK-NEXT: #Base.m1!1: (Base) -> () -> () : @_T01x4BaseC2m1yyF [inherited]
67+
// CHECK-NEXT: #Base.m2!1: (Base) -> () -> () : @_T01x7DerivedC2m2yyF [override]
68+
// CHECK-NEXT: #Base.init!initializer.1: (Base.Type) -> () -> Base : @_T01x7DerivedCACycfc [override]
69+
// CHECK-NEXT: #Derived.m3!1: (Derived) -> () -> () : @_T01x7DerivedC2m3yyF
70+
// CHECK-NEXT: #Derived.deinit!deallocator: @_T01x7DerivedCfD
7171
// CHECK-NEXT: }

0 commit comments

Comments
 (0)