Skip to content

Commit a82140b

Browse files
committed
[NFC] IRGen: Renamed method.
Not all metadata that the OutliningMetdataCollector collects is for layout anymore.
1 parent 765d23b commit a82140b

File tree

7 files changed

+10
-10
lines changed

7 files changed

+10
-10
lines changed

lib/IRGen/GenArchetype.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ class OpaqueArchetypeTypeInfo
135135
void collectMetadataForOutlining(OutliningMetadataCollector &collector,
136136
SILType T) const override {
137137
// We'll need formal type metadata for this archetype.
138-
collector.collectTypeMetadataForLayout(T);
138+
collector.collectTypeMetadata(T);
139139
}
140140

141141
TypeLayoutEntry

lib/IRGen/GenEnum.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -631,7 +631,7 @@ namespace {
631631
return;
632632
getSingleton()->collectMetadataForOutlining(collector,
633633
getSingletonType(collector.IGF.IGM, T));
634-
collector.collectTypeMetadataForLayout(T);
634+
collector.collectTypeMetadata(T);
635635
}
636636

637637
void reexplode(Explosion &src, Explosion &dest)
@@ -3239,7 +3239,7 @@ namespace {
32393239
auto payloadT = getPayloadType(IGM, T);
32403240
getPayloadTypeInfo().collectMetadataForOutlining(collector, payloadT);
32413241
}
3242-
collector.collectTypeMetadataForLayout(T);
3242+
collector.collectTypeMetadata(T);
32433243
}
32443244

32453245
void storeTag(IRGenFunction &IGF,
@@ -5134,7 +5134,7 @@ namespace {
51345134
auto &payloadTI = *payloadCasePair.ti;
51355135
payloadTI.collectMetadataForOutlining(collector, payloadT);
51365136
}
5137-
collector.collectTypeMetadataForLayout(T);
5137+
collector.collectTypeMetadata(T);
51385138
}
51395139

51405140
void destroy(IRGenFunction &IGF, Address addr, SILType T,
@@ -6051,7 +6051,7 @@ namespace {
60516051

60526052
void collectMetadataForOutlining(OutliningMetadataCollector &collector,
60536053
SILType T) const override {
6054-
collector.collectTypeMetadataForLayout(T);
6054+
collector.collectTypeMetadata(T);
60556055
}
60566056

60576057
void destroy(IRGenFunction &IGF, Address addr, SILType T,

lib/IRGen/GenRecord.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -492,7 +492,7 @@ class RecordTypeInfoImpl : public Base,
492492
auto fType = field.getType(collector.IGF.IGM, T);
493493
field.getTypeInfo().collectMetadataForOutlining(collector, fType);
494494
}
495-
collector.collectTypeMetadataForLayout(T);
495+
collector.collectTypeMetadata(T);
496496
}
497497
};
498498

lib/IRGen/NonFixedTypeInfo.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ class BitwiseCopyableTypeInfo
193193
void collectMetadataForOutlining(OutliningMetadataCollector &collector,
194194
SILType T) const override {
195195
// We'll need formal type metadata for this archetype.
196-
collector.collectTypeMetadataForLayout(T);
196+
collector.collectTypeMetadata(T);
197197
}
198198

199199
TypeLayoutEntry *buildTypeLayoutEntry(IRGenModule &IGM, SILType T,

lib/IRGen/Outlining.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
using namespace swift;
3333
using namespace irgen;
3434

35-
void OutliningMetadataCollector::collectTypeMetadataForLayout(SILType ty) {
35+
void OutliningMetadataCollector::collectTypeMetadata(SILType ty) {
3636
// If the type has no archetypes, we can emit it from scratch in the callee.
3737
if (!ty.hasArchetype()) {
3838
return;

lib/IRGen/Outlining.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ class OutliningMetadataCollector {
7373
DeinitIsNeeded_t needsDeinitTypes)
7474
: IGF(IGF), needsLayout(needsLayout), needsDeinit(needsDeinitTypes) {}
7575

76-
void collectTypeMetadataForLayout(SILType type);
76+
void collectTypeMetadata(SILType type);
7777

7878
void emitCallToOutlinedCopy(Address dest, Address src,
7979
SILType T, const TypeInfo &ti,

lib/IRGen/ResilientTypeInfo.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ class ResilientTypeInfo : public WitnessSizedTypeInfo<Impl> {
158158

159159
void collectMetadataForOutlining(OutliningMetadataCollector &collector,
160160
SILType T) const override {
161-
collector.collectTypeMetadataForLayout(T);
161+
collector.collectTypeMetadata(T);
162162
}
163163
};
164164

0 commit comments

Comments
 (0)