Skip to content

Commit fe5dacb

Browse files
CodaFiCodaFi
committed
Remove unnecessary dependency sources
1 parent 9e7964f commit fe5dacb

File tree

4 files changed

+8
-81
lines changed

4 files changed

+8
-81
lines changed

‎include/swift/AST/NameLookupRequests.h

Lines changed: 5 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -169,8 +169,7 @@ class SuperclassDeclRequest :
169169
class InheritedProtocolsRequest
170170
: public SimpleRequest<
171171
InheritedProtocolsRequest, ArrayRef<ProtocolDecl *>(ProtocolDecl *),
172-
RequestFlags::SeparatelyCached | RequestFlags::DependencySink |
173-
RequestFlags::DependencySource> {
172+
RequestFlags::SeparatelyCached | RequestFlags::DependencySink> {
174173
public:
175174
using SimpleRequest::SimpleRequest;
176175

@@ -189,8 +188,6 @@ class InheritedProtocolsRequest
189188

190189
public:
191190
// Incremental dependencies
192-
evaluator::DependencySource
193-
readDependencySource(const evaluator::DependencyRecorder &e) const;
194191
void writeDependencySink(evaluator::DependencyCollector &tracker,
195192
ArrayRef<ProtocolDecl *> result) const;
196193
};
@@ -310,8 +307,7 @@ class CustomAttrNominalRequest :
310307
/// Finds or synthesizes a destructor for the given class.
311308
class GetDestructorRequest
312309
: public SimpleRequest<GetDestructorRequest, DestructorDecl *(ClassDecl *),
313-
RequestFlags::SeparatelyCached |
314-
RequestFlags::DependencySource> {
310+
RequestFlags::SeparatelyCached> {
315311
public:
316312
using SimpleRequest::SimpleRequest;
317313

@@ -327,11 +323,6 @@ class GetDestructorRequest
327323
bool isCached() const { return true; }
328324
Optional<DestructorDecl *> getCachedResult() const;
329325
void cacheResult(DestructorDecl *value) const;
330-
331-
public:
332-
// Incremental dependencies.
333-
evaluator::DependencySource
334-
readDependencySource(const evaluator::DependencyRecorder &) const;
335326
};
336327

337328
class GenericParamListRequest :
@@ -420,7 +411,7 @@ SourceLoc extractNearestSourceLoc(const UnqualifiedLookupDescriptor &desc);
420411
class UnqualifiedLookupRequest
421412
: public SimpleRequest<UnqualifiedLookupRequest,
422413
LookupResult(UnqualifiedLookupDescriptor),
423-
RequestFlags::Uncached | RequestFlags::DependencySource |
414+
RequestFlags::Uncached |
424415
RequestFlags::DependencySink> {
425416
public:
426417
using SimpleRequest::SimpleRequest;
@@ -434,8 +425,6 @@ class UnqualifiedLookupRequest
434425

435426
public:
436427
// Incremental dependencies
437-
evaluator::DependencySource
438-
readDependencySource(const evaluator::DependencyRecorder &) const;
439428
void writeDependencySink(evaluator::DependencyCollector &tracker,
440429
LookupResult res) const;
441430
};
@@ -495,7 +484,7 @@ class ModuleQualifiedLookupRequest
495484
QualifiedLookupResult(const DeclContext *,
496485
ModuleDecl *, DeclNameRef,
497486
NLOptions),
498-
RequestFlags::Uncached | RequestFlags::DependencySource |
487+
RequestFlags::Uncached |
499488
RequestFlags::DependencySink> {
500489
public:
501490
using SimpleRequest::SimpleRequest;
@@ -511,8 +500,6 @@ class ModuleQualifiedLookupRequest
511500

512501
public:
513502
// Incremental dependencies
514-
evaluator::DependencySource
515-
readDependencySource(const evaluator::DependencyRecorder &) const;
516503
void writeDependencySink(evaluator::DependencyCollector &tracker,
517504
QualifiedLookupResult lookupResult) const;
518505
};
@@ -522,7 +509,7 @@ class QualifiedLookupRequest
522509
QualifiedLookupResult(const DeclContext *,
523510
SmallVector<NominalTypeDecl *, 4>,
524511
DeclNameRef, NLOptions),
525-
RequestFlags::Uncached | RequestFlags::DependencySource> {
512+
RequestFlags::Uncached> {
526513
public:
527514
using SimpleRequest::SimpleRequest;
528515

@@ -535,11 +522,6 @@ class QualifiedLookupRequest
535522
SmallVector<NominalTypeDecl *, 4> decls,
536523
DeclNameRef name,
537524
NLOptions opts) const;
538-
539-
public:
540-
// Incremental dependencies.
541-
evaluator::DependencySource
542-
readDependencySource(const evaluator::DependencyRecorder &) const;
543525
};
544526

545527
/// The input type for a direct lookup request.

‎include/swift/AST/TypeCheckRequests.h

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,7 @@ class InheritedTypeRequest
9595
class SuperclassTypeRequest
9696
: public SimpleRequest<
9797
SuperclassTypeRequest, Type(NominalTypeDecl *, TypeResolutionStage),
98-
RequestFlags::SeparatelyCached | RequestFlags::DependencySink |
99-
RequestFlags::DependencySource> {
98+
RequestFlags::SeparatelyCached | RequestFlags::DependencySink> {
10099
public:
101100
using SimpleRequest::SimpleRequest;
102101

@@ -120,8 +119,6 @@ class SuperclassTypeRequest
120119

121120
public:
122121
// Incremental dependencies
123-
evaluator::DependencySource
124-
readDependencySource(const evaluator::DependencyRecorder &e) const;
125122
void writeDependencySink(evaluator::DependencyCollector &tracker,
126123
Type t) const;
127124
};
@@ -2369,8 +2366,7 @@ class LookupAllConformancesInContextRequest
23692366
ProtocolConformanceLookupResult(
23702367
const IterableDeclContext *),
23712368
RequestFlags::Cached |
2372-
RequestFlags::DependencySink |
2373-
RequestFlags::DependencySource> {
2369+
RequestFlags::DependencySink> {
23742370
public:
23752371
using SimpleRequest::SimpleRequest;
23762372

@@ -2385,8 +2381,6 @@ class LookupAllConformancesInContextRequest
23852381
bool isCached() const { return true; }
23862382

23872383
// Incremental dependencies
2388-
evaluator::DependencySource
2389-
readDependencySource(const evaluator::DependencyRecorder &eval) const;
23902384
void writeDependencySink(evaluator::DependencyCollector &tracker,
23912385
ProtocolConformanceLookupResult r) const;
23922386
};

‎lib/AST/NameLookupRequests.cpp

Lines changed: 1 addition & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -88,18 +88,6 @@ void InheritedProtocolsRequest::cacheResult(ArrayRef<ProtocolDecl *> PDs) const
8888
proto->setInheritedProtocolsValid();
8989
}
9090

91-
evaluator::DependencySource InheritedProtocolsRequest::readDependencySource(
92-
const evaluator::DependencyRecorder &e) const {
93-
auto *PD = std::get<0>(getStorage());
94-
// Ignore context changes for protocols outside our module. This
95-
// prevents transitive cascading edges when e.g. our private
96-
// type conforms to Hashable which itself looks up Equatable during
97-
// qualified lookup.
98-
if (!PD->getParentSourceFile())
99-
return nullptr;
100-
return e.getActiveDependencySourceOrNull();
101-
}
102-
10391
void InheritedProtocolsRequest::writeDependencySink(
10492
evaluator::DependencyCollector &tracker,
10593
ArrayRef<ProtocolDecl *> PDs) const {
@@ -204,11 +192,6 @@ void GetDestructorRequest::cacheResult(DestructorDecl *value) const {
204192
classDecl->addMember(value);
205193
}
206194

207-
evaluator::DependencySource GetDestructorRequest::readDependencySource(
208-
const evaluator::DependencyRecorder &eval) const {
209-
return eval.getActiveDependencySourceOrNull();
210-
}
211-
212195
//----------------------------------------------------------------------------//
213196
// GenericParamListRequest computation.
214197
//----------------------------------------------------------------------------//
@@ -355,15 +338,9 @@ swift::extractNearestSourceLoc(const LookupConformanceDescriptor &desc) {
355338
}
356339

357340
//----------------------------------------------------------------------------//
358-
// LookupInModuleRequest computation.
341+
// ModuleQualifiedLookupRequest computation.
359342
//----------------------------------------------------------------------------//
360343

361-
evaluator::DependencySource ModuleQualifiedLookupRequest::readDependencySource(
362-
const evaluator::DependencyRecorder &eval) const {
363-
auto *DC = std::get<0>(getStorage());
364-
return DC->getParentSourceFile();
365-
}
366-
367344
void ModuleQualifiedLookupRequest::writeDependencySink(
368345
evaluator::DependencyCollector &reqTracker, QualifiedLookupResult l) const {
369346
auto *DC = std::get<0>(getStorage());
@@ -409,27 +386,12 @@ void LookupConformanceInModuleRequest::writeDependencySink(
409386
// UnqualifiedLookupRequest computation.
410387
//----------------------------------------------------------------------------//
411388

412-
evaluator::DependencySource UnqualifiedLookupRequest::readDependencySource(
413-
const evaluator::DependencyRecorder &) const {
414-
return std::get<0>(getStorage()).DC->getParentSourceFile();
415-
}
416-
417389
void UnqualifiedLookupRequest::writeDependencySink(
418390
evaluator::DependencyCollector &track, LookupResult res) const {
419391
auto &desc = std::get<0>(getStorage());
420392
track.addTopLevelName(desc.Name.getBaseName());
421393
}
422394

423-
//----------------------------------------------------------------------------//
424-
// QualifiedLookupRequest computation.
425-
//----------------------------------------------------------------------------//
426-
427-
evaluator::DependencySource QualifiedLookupRequest::readDependencySource(
428-
const evaluator::DependencyRecorder &) const {
429-
auto *DC = std::get<0>(getStorage())->getModuleScopeContext();
430-
return dyn_cast<SourceFile>(DC);
431-
}
432-
433395
// Define request evaluation functions for each of the name lookup requests.
434396
static AbstractRequestFunction *nameLookupRequestFunctions[] = {
435397
#define SWIFT_REQUEST(Zone, Name, Sig, Caching, LocOptions) \

‎lib/AST/TypeCheckRequests.cpp

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -157,11 +157,6 @@ void SuperclassTypeRequest::cacheResult(Type value) const {
157157
protocolDecl->LazySemanticInfo.SuperclassType.setPointerAndInt(value, true);
158158
}
159159

160-
evaluator::DependencySource SuperclassTypeRequest::readDependencySource(
161-
const evaluator::DependencyRecorder &e) const {
162-
return e.getActiveDependencySourceOrNull();
163-
}
164-
165160
void SuperclassTypeRequest::writeDependencySink(
166161
evaluator::DependencyCollector &tracker, Type value) const {
167162
if (!value)
@@ -1309,12 +1304,6 @@ void CheckRedeclarationRequest::writeDependencySink(
13091304
// LookupAllConformancesInContextRequest computation.
13101305
//----------------------------------------------------------------------------//
13111306

1312-
evaluator::DependencySource
1313-
LookupAllConformancesInContextRequest::readDependencySource(
1314-
const evaluator::DependencyRecorder &collector) const {
1315-
return collector.getActiveDependencySourceOrNull();
1316-
}
1317-
13181307
void LookupAllConformancesInContextRequest::writeDependencySink(
13191308
evaluator::DependencyCollector &tracker,
13201309
ProtocolConformanceLookupResult conformances) const {

0 commit comments

Comments
 (0)