@@ -1362,31 +1362,31 @@ class TypeRefBuilder {
13621362 return subject->subst (*this , Subs);
13631363 }
13641364 uint32_t addReflectionInfo (ReflectionInfo I) {
1365- return DF .addReflectionInfo (I);
1365+ return RDF .addReflectionInfo (I);
13661366 }
13671367
13681368 const std::vector<ReflectionInfo> &getReflectionInfos () {
1369- return DF .getReflectionInfos ();
1369+ return RDF .getReflectionInfos ();
13701370 }
13711371
13721372public:
13731373 enum ForTesting_t { ForTesting };
13741374
13751375 // Only for testing. A TypeRefBuilder built this way will not be able to
13761376 // 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 ) {}
13781378
13791379private:
13801380 // / Indexes of Reflection Infos we've already processed.
13811381 llvm::DenseSet<size_t > ProcessedReflectionInfoIndexes;
13821382
13831383public:
13841384 RemoteRef<char > readTypeRef (uint64_t remoteAddr) {
1385- return DF .readTypeRef (remoteAddr);
1385+ return RDF .readTypeRef (remoteAddr);
13861386 }
13871387 template <typename Record, typename Field>
13881388 RemoteRef<char > readTypeRef (RemoteRef<Record> record, const Field &field) {
1389- return DF .readTypeRef (record, field);
1389+ return RDF .readTypeRef (record, field);
13901390 }
13911391 StringRef getTypeRefString (RemoteRef<char > record) {
13921392 return Demangle::makeSymbolicMangledNameStringRef (record.getLocalBuffer ());
@@ -1409,7 +1409,7 @@ class TypeRefBuilder {
14091409 using IntVariableReader =
14101410 std::function<llvm::Optional<uint64_t >(std::string, unsigned )>;
14111411
1412- ReflectionTypeDescriptorFinder DF ;
1412+ ReflectionTypeDescriptorFinder RDF ;
14131413
14141414 // These fields are captured from the MetadataReader template passed into the
14151415 // TypeRefBuilder struct, to isolate its template-ness from the rest of
@@ -1429,7 +1429,7 @@ class TypeRefBuilder {
14291429 template <typename Runtime>
14301430 TypeRefBuilder (remote::MetadataReader<Runtime, TypeRefBuilder> &reader,
14311431 remote::ExternalTypeRefCache *externalCache = nullptr )
1432- : TC(*this ), DF (*this , externalCache),
1432+ : TC(*this ), RDF (*this , externalCache),
14331433 PointerSize(sizeof (typename Runtime::StoredPointer)),
14341434 TypeRefDemangler([this , &reader](RemoteRef<char > string,
14351435 bool useOpaqueTypeSymbolicReferences)
@@ -1506,12 +1506,12 @@ class TypeRefBuilder {
15061506 const TypeRef *lookupTypeWitness (const std::string &MangledTypeName,
15071507 const std::string &Member,
15081508 StringRef Protocol) {
1509- return DF .lookupTypeWitness (MangledTypeName, Member, Protocol);
1509+ return RDF .lookupTypeWitness (MangledTypeName, Member, Protocol);
15101510 }
15111511 const TypeRef *lookupSuperclass (const TypeRef *TR);
15121512
15131513 RemoteRef<FieldDescriptor> getFieldTypeInfo (const TypeRef *TR) {
1514- return DF .getFieldTypeInfo (TR);
1514+ return RDF .getFieldTypeInfo (TR);
15151515 }
15161516
15171517 // / Get the parsed and substituted field types for a nominal type.
@@ -1521,24 +1521,24 @@ class TypeRefBuilder {
15211521
15221522 // / Get the primitive type lowering for a builtin type.
15231523 RemoteRef<BuiltinTypeDescriptor> getBuiltinTypeInfo (const TypeRef *TR) {
1524- return DF .getBuiltinTypeInfo (TR);
1524+ return RDF .getBuiltinTypeInfo (TR);
15251525 }
15261526
15271527 // / Get the raw capture descriptor for a remote capture descriptor
15281528 // / address.
15291529 RemoteRef<CaptureDescriptor> getCaptureDescriptor (uint64_t RemoteAddress) {
1530- return DF .getCaptureDescriptor (RemoteAddress);
1530+ return RDF .getCaptureDescriptor (RemoteAddress);
15311531 }
15321532
15331533 // / Get the unsubstituted capture types for a closure context.
15341534 ClosureContextInfo getClosureContextInfo (RemoteRef<CaptureDescriptor> CD) {
1535- return DF .getClosureContextInfo (CD);
1535+ return RDF .getClosureContextInfo (CD);
15361536 }
15371537
15381538 // / Get the multipayload enum projection information for a given TR
15391539 RemoteRef<MultiPayloadEnumDescriptor>
15401540 getMultiPayloadEnumInfo (const TypeRef *TR) {
1541- return DF .getMultiPayloadEnumInfo (TR);
1541+ return RDF .getMultiPayloadEnumInfo (TR);
15421542 }
15431543
15441544private:
@@ -1573,15 +1573,15 @@ class TypeRefBuilder {
15731573 }
15741574 FieldTypeCollectionResult
15751575 collectFieldTypes (llvm::Optional<std::string> forMangledTypeName) {
1576- return DF .collectFieldTypes (forMangledTypeName);
1576+ return RDF .collectFieldTypes (forMangledTypeName);
15771577 }
15781578
15791579public:
15801580 template <template <typename Runtime> class ObjCInteropKind ,
15811581 unsigned PointerSize>
15821582 AssociatedTypeCollectionResult
15831583 collectAssociatedTypes (llvm::Optional<std::string> forMangledTypeName) {
1584- return DF .collectAssociatedTypes <ObjCInteropKind, PointerSize>(
1584+ return RDF .collectAssociatedTypes <ObjCInteropKind, PointerSize>(
15851585 forMangledTypeName);
15861586 }
15871587 template <template <typename Runtime> class ObjCInteropKind ,
@@ -2076,12 +2076,12 @@ class TypeRefBuilder {
20762076 auto paramAddress = readRequirementTypeRefAddress (req.getParamOffset (),
20772077 (uintptr_t )(&req));
20782078 std::string demangledParamName =
2079- nodeToString (demangleTypeRef (DF .readTypeRef (paramAddress)));
2079+ nodeToString (demangleTypeRef (RDF .readTypeRef (paramAddress)));
20802080
20812081 // Read the substituted Type Name
20822082 auto typeAddress = readRequirementTypeRefAddress (
20832083 req.getSameTypeNameOffset (), (uintptr_t )(&req));
2084- auto typeTypeRef = DF .readTypeRef (typeAddress);
2084+ auto typeTypeRef = RDF .readTypeRef (typeAddress);
20852085 std::string demangledTypeName =
20862086 nodeToString (demangleTypeRef (typeTypeRef));
20872087 std::string mangledTypeName;
@@ -2291,12 +2291,12 @@ class TypeRefBuilder {
22912291 template <template <typename Runtime> class ObjCInteropKind ,
22922292 unsigned PointerSize>
22932293 ConformanceCollectionResult collectAllConformances () {
2294- return DF .collectAllConformances <ObjCInteropKind, PointerSize>();
2294+ return RDF .collectAllConformances <ObjCInteropKind, PointerSize>();
22952295 }
22962296 template <template <typename Runtime> class ObjCInteropKind ,
22972297 unsigned PointerSize>
22982298 void dumpAllSections (std::ostream &stream) {
2299- DF .dumpAllSections <ObjCInteropKind, PointerSize>(stream);
2299+ RDF .dumpAllSections <ObjCInteropKind, PointerSize>(stream);
23002300 }
23012301};
23022302
0 commit comments