@@ -1362,31 +1362,31 @@ class TypeRefBuilder {
1362
1362
return subject->subst (*this , Subs);
1363
1363
}
1364
1364
uint32_t addReflectionInfo (ReflectionInfo I) {
1365
- return DF .addReflectionInfo (I);
1365
+ return RDF .addReflectionInfo (I);
1366
1366
}
1367
1367
1368
1368
const std::vector<ReflectionInfo> &getReflectionInfos () {
1369
- return DF .getReflectionInfos ();
1369
+ return RDF .getReflectionInfos ();
1370
1370
}
1371
1371
1372
1372
public:
1373
1373
enum ForTesting_t { ForTesting };
1374
1374
1375
1375
// Only for testing. A TypeRefBuilder built this way will not be able to
1376
1376
// decode records in remote memory.
1377
- explicit TypeRefBuilder (ForTesting_t) : TC(*this ), DF (*this , nullptr ) {}
1377
+ explicit TypeRefBuilder (ForTesting_t) : TC(*this ), RDF (*this , nullptr ) {}
1378
1378
1379
1379
private:
1380
1380
// / Indexes of Reflection Infos we've already processed.
1381
1381
llvm::DenseSet<size_t > ProcessedReflectionInfoIndexes;
1382
1382
1383
1383
public:
1384
1384
RemoteRef<char > readTypeRef (uint64_t remoteAddr) {
1385
- return DF .readTypeRef (remoteAddr);
1385
+ return RDF .readTypeRef (remoteAddr);
1386
1386
}
1387
1387
template <typename Record, typename Field>
1388
1388
RemoteRef<char > readTypeRef (RemoteRef<Record> record, const Field &field) {
1389
- return DF .readTypeRef (record, field);
1389
+ return RDF .readTypeRef (record, field);
1390
1390
}
1391
1391
StringRef getTypeRefString (RemoteRef<char > record) {
1392
1392
return Demangle::makeSymbolicMangledNameStringRef (record.getLocalBuffer ());
@@ -1409,7 +1409,7 @@ class TypeRefBuilder {
1409
1409
using IntVariableReader =
1410
1410
std::function<llvm::Optional<uint64_t >(std::string, unsigned )>;
1411
1411
1412
- ReflectionTypeDescriptorFinder DF ;
1412
+ ReflectionTypeDescriptorFinder RDF ;
1413
1413
1414
1414
// These fields are captured from the MetadataReader template passed into the
1415
1415
// TypeRefBuilder struct, to isolate its template-ness from the rest of
@@ -1429,7 +1429,7 @@ class TypeRefBuilder {
1429
1429
template <typename Runtime>
1430
1430
TypeRefBuilder (remote::MetadataReader<Runtime, TypeRefBuilder> &reader,
1431
1431
remote::ExternalTypeRefCache *externalCache = nullptr )
1432
- : TC(*this ), DF (*this , externalCache),
1432
+ : TC(*this ), RDF (*this , externalCache),
1433
1433
PointerSize(sizeof (typename Runtime::StoredPointer)),
1434
1434
TypeRefDemangler([this , &reader](RemoteRef<char > string,
1435
1435
bool useOpaqueTypeSymbolicReferences)
@@ -1506,12 +1506,12 @@ class TypeRefBuilder {
1506
1506
const TypeRef *lookupTypeWitness (const std::string &MangledTypeName,
1507
1507
const std::string &Member,
1508
1508
StringRef Protocol) {
1509
- return DF .lookupTypeWitness (MangledTypeName, Member, Protocol);
1509
+ return RDF .lookupTypeWitness (MangledTypeName, Member, Protocol);
1510
1510
}
1511
1511
const TypeRef *lookupSuperclass (const TypeRef *TR);
1512
1512
1513
1513
RemoteRef<FieldDescriptor> getFieldTypeInfo (const TypeRef *TR) {
1514
- return DF .getFieldTypeInfo (TR);
1514
+ return RDF .getFieldTypeInfo (TR);
1515
1515
}
1516
1516
1517
1517
// / Get the parsed and substituted field types for a nominal type.
@@ -1521,24 +1521,24 @@ class TypeRefBuilder {
1521
1521
1522
1522
// / Get the primitive type lowering for a builtin type.
1523
1523
RemoteRef<BuiltinTypeDescriptor> getBuiltinTypeInfo (const TypeRef *TR) {
1524
- return DF .getBuiltinTypeInfo (TR);
1524
+ return RDF .getBuiltinTypeInfo (TR);
1525
1525
}
1526
1526
1527
1527
// / Get the raw capture descriptor for a remote capture descriptor
1528
1528
// / address.
1529
1529
RemoteRef<CaptureDescriptor> getCaptureDescriptor (uint64_t RemoteAddress) {
1530
- return DF .getCaptureDescriptor (RemoteAddress);
1530
+ return RDF .getCaptureDescriptor (RemoteAddress);
1531
1531
}
1532
1532
1533
1533
// / Get the unsubstituted capture types for a closure context.
1534
1534
ClosureContextInfo getClosureContextInfo (RemoteRef<CaptureDescriptor> CD) {
1535
- return DF .getClosureContextInfo (CD);
1535
+ return RDF .getClosureContextInfo (CD);
1536
1536
}
1537
1537
1538
1538
// / Get the multipayload enum projection information for a given TR
1539
1539
RemoteRef<MultiPayloadEnumDescriptor>
1540
1540
getMultiPayloadEnumInfo (const TypeRef *TR) {
1541
- return DF .getMultiPayloadEnumInfo (TR);
1541
+ return RDF .getMultiPayloadEnumInfo (TR);
1542
1542
}
1543
1543
1544
1544
private:
@@ -1573,15 +1573,15 @@ class TypeRefBuilder {
1573
1573
}
1574
1574
FieldTypeCollectionResult
1575
1575
collectFieldTypes (llvm::Optional<std::string> forMangledTypeName) {
1576
- return DF .collectFieldTypes (forMangledTypeName);
1576
+ return RDF .collectFieldTypes (forMangledTypeName);
1577
1577
}
1578
1578
1579
1579
public:
1580
1580
template <template <typename Runtime> class ObjCInteropKind ,
1581
1581
unsigned PointerSize>
1582
1582
AssociatedTypeCollectionResult
1583
1583
collectAssociatedTypes (llvm::Optional<std::string> forMangledTypeName) {
1584
- return DF .collectAssociatedTypes <ObjCInteropKind, PointerSize>(
1584
+ return RDF .collectAssociatedTypes <ObjCInteropKind, PointerSize>(
1585
1585
forMangledTypeName);
1586
1586
}
1587
1587
template <template <typename Runtime> class ObjCInteropKind ,
@@ -2076,12 +2076,12 @@ class TypeRefBuilder {
2076
2076
auto paramAddress = readRequirementTypeRefAddress (req.getParamOffset (),
2077
2077
(uintptr_t )(&req));
2078
2078
std::string demangledParamName =
2079
- nodeToString (demangleTypeRef (DF .readTypeRef (paramAddress)));
2079
+ nodeToString (demangleTypeRef (RDF .readTypeRef (paramAddress)));
2080
2080
2081
2081
// Read the substituted Type Name
2082
2082
auto typeAddress = readRequirementTypeRefAddress (
2083
2083
req.getSameTypeNameOffset (), (uintptr_t )(&req));
2084
- auto typeTypeRef = DF .readTypeRef (typeAddress);
2084
+ auto typeTypeRef = RDF .readTypeRef (typeAddress);
2085
2085
std::string demangledTypeName =
2086
2086
nodeToString (demangleTypeRef (typeTypeRef));
2087
2087
std::string mangledTypeName;
@@ -2291,12 +2291,12 @@ class TypeRefBuilder {
2291
2291
template <template <typename Runtime> class ObjCInteropKind ,
2292
2292
unsigned PointerSize>
2293
2293
ConformanceCollectionResult collectAllConformances () {
2294
- return DF .collectAllConformances <ObjCInteropKind, PointerSize>();
2294
+ return RDF .collectAllConformances <ObjCInteropKind, PointerSize>();
2295
2295
}
2296
2296
template <template <typename Runtime> class ObjCInteropKind ,
2297
2297
unsigned PointerSize>
2298
2298
void dumpAllSections (std::ostream &stream) {
2299
- DF .dumpAllSections <ObjCInteropKind, PointerSize>(stream);
2299
+ RDF .dumpAllSections <ObjCInteropKind, PointerSize>(stream);
2300
2300
}
2301
2301
};
2302
2302
0 commit comments