Skip to content

Commit c3fd558

Browse files
committed
AST: Change some writeDependencySink() methods to take the result by const reference
1 parent a940c39 commit c3fd558

File tree

5 files changed

+22
-17
lines changed

5 files changed

+22
-17
lines changed

include/swift/AST/NameLookupRequests.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -406,7 +406,7 @@ class UnqualifiedLookupRequest
406406
public:
407407
// Incremental dependencies
408408
void writeDependencySink(evaluator::DependencyCollector &tracker,
409-
LookupResult res) const;
409+
const LookupResult &res) const;
410410
};
411411

412412
using QualifiedLookupResult = SmallVector<ValueDecl *, 4>;
@@ -434,7 +434,7 @@ class LookupInModuleRequest
434434
public:
435435
// Incremental dependencies
436436
void writeDependencySink(evaluator::DependencyCollector &tracker,
437-
QualifiedLookupResult l) const;
437+
const QualifiedLookupResult &l) const;
438438
};
439439

440440
/// Perform \c AnyObject lookup for a given member.
@@ -457,7 +457,7 @@ class AnyObjectLookupRequest
457457
public:
458458
// Incremental dependencies
459459
void writeDependencySink(evaluator::DependencyCollector &tracker,
460-
QualifiedLookupResult l) const;
460+
const QualifiedLookupResult &l) const;
461461
};
462462

463463
class ModuleQualifiedLookupRequest
@@ -482,7 +482,7 @@ class ModuleQualifiedLookupRequest
482482
public:
483483
// Incremental dependencies
484484
void writeDependencySink(evaluator::DependencyCollector &tracker,
485-
QualifiedLookupResult lookupResult) const;
485+
const QualifiedLookupResult &lookupResult) const;
486486
};
487487

488488
class QualifiedLookupRequest
@@ -555,7 +555,7 @@ class DirectLookupRequest
555555
public:
556556
// Incremental dependencies
557557
void writeDependencySink(evaluator::DependencyCollector &tracker,
558-
TinyPtrVector<ValueDecl *> result) const;
558+
const TinyPtrVector<ValueDecl *> &result) const;
559559
};
560560

561561
class OperatorLookupDescriptor final {
@@ -636,7 +636,7 @@ class DirectOperatorLookupRequest
636636
public:
637637
// Incremental dependencies.
638638
void writeDependencySink(evaluator::DependencyCollector &tracker,
639-
TinyPtrVector<OperatorDecl *> ops) const;
639+
const TinyPtrVector<OperatorDecl *> &ops) const;
640640
};
641641

642642
/// Looks up an precedencegroup in a given file or module without looking
@@ -659,7 +659,7 @@ class DirectPrecedenceGroupLookupRequest
659659
public:
660660
// Incremental dependencies.
661661
void writeDependencySink(evaluator::DependencyCollector &tracker,
662-
TinyPtrVector<PrecedenceGroupDecl *> groups) const;
662+
const TinyPtrVector<PrecedenceGroupDecl *> &groups) const;
663663
};
664664

665665
class LookupConformanceDescriptor final {

include/swift/AST/TypeCheckRequests.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2504,7 +2504,7 @@ class LookupAllConformancesInContextRequest
25042504

25052505
// Incremental dependencies
25062506
void writeDependencySink(evaluator::DependencyCollector &tracker,
2507-
ProtocolConformanceLookupResult r) const;
2507+
const ProtocolConformanceLookupResult &r) const;
25082508
};
25092509

25102510
class CheckRedeclarationRequest

lib/AST/Module.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1104,7 +1104,7 @@ syntax::SourceFileSyntax SourceFile::getSyntaxRoot() const {
11041104

11051105
void DirectOperatorLookupRequest::writeDependencySink(
11061106
evaluator::DependencyCollector &reqTracker,
1107-
TinyPtrVector<OperatorDecl *> ops) const {
1107+
const TinyPtrVector<OperatorDecl *> &ops) const {
11081108
auto &desc = std::get<0>(getStorage());
11091109
reqTracker.addTopLevelName(desc.name);
11101110
}
@@ -1139,7 +1139,7 @@ void SourceFile::lookupOperatorDirect(
11391139

11401140
void DirectPrecedenceGroupLookupRequest::writeDependencySink(
11411141
evaluator::DependencyCollector &reqTracker,
1142-
TinyPtrVector<PrecedenceGroupDecl *> groups) const {
1142+
const TinyPtrVector<PrecedenceGroupDecl *> &groups) const {
11431143
auto &desc = std::get<0>(getStorage());
11441144
reqTracker.addTopLevelName(desc.name);
11451145
}

lib/AST/NameLookupRequests.cpp

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,8 @@ void ExtendedNominalRequest::cacheResult(NominalTypeDecl *value) const {
175175
}
176176

177177
void ExtendedNominalRequest::writeDependencySink(
178-
evaluator::DependencyCollector &tracker, NominalTypeDecl *value) const {
178+
evaluator::DependencyCollector &tracker,
179+
NominalTypeDecl *value) const {
179180
if (!value)
180181
return;
181182

@@ -303,7 +304,7 @@ SourceLoc swift::extractNearestSourceLoc(const OperatorLookupDescriptor &desc) {
303304

304305
void DirectLookupRequest::writeDependencySink(
305306
evaluator::DependencyCollector &tracker,
306-
TinyPtrVector<ValueDecl *> result) const {
307+
const TinyPtrVector<ValueDecl *> &result) const {
307308
auto &desc = std::get<0>(getStorage());
308309
tracker.addUsedMember(desc.DC, desc.Name.getBaseName());
309310
}
@@ -313,7 +314,8 @@ void DirectLookupRequest::writeDependencySink(
313314
//----------------------------------------------------------------------------//
314315

315316
void LookupInModuleRequest::writeDependencySink(
316-
evaluator::DependencyCollector &reqTracker, QualifiedLookupResult l) const {
317+
evaluator::DependencyCollector &reqTracker,
318+
const QualifiedLookupResult &l) const {
317319
auto *DC = std::get<0>(getStorage());
318320
auto member = std::get<1>(getStorage());
319321

@@ -340,7 +342,8 @@ void swift::simple_display(llvm::raw_ostream &out,
340342
}
341343

342344
void AnyObjectLookupRequest::writeDependencySink(
343-
evaluator::DependencyCollector &reqTracker, QualifiedLookupResult l) const {
345+
evaluator::DependencyCollector &reqTracker,
346+
const QualifiedLookupResult &l) const {
344347
auto member = std::get<1>(getStorage());
345348
reqTracker.addDynamicLookupName(member.getBaseName());
346349
}
@@ -355,7 +358,8 @@ swift::extractNearestSourceLoc(const LookupConformanceDescriptor &desc) {
355358
//----------------------------------------------------------------------------//
356359

357360
void ModuleQualifiedLookupRequest::writeDependencySink(
358-
evaluator::DependencyCollector &reqTracker, QualifiedLookupResult l) const {
361+
evaluator::DependencyCollector &reqTracker,
362+
const QualifiedLookupResult &l) const {
359363
auto *module = std::get<1>(getStorage());
360364
auto member = std::get<2>(getStorage());
361365

@@ -395,7 +399,8 @@ void LookupConformanceInModuleRequest::writeDependencySink(
395399
//----------------------------------------------------------------------------//
396400

397401
void UnqualifiedLookupRequest::writeDependencySink(
398-
evaluator::DependencyCollector &track, LookupResult res) const {
402+
evaluator::DependencyCollector &track,
403+
const LookupResult &res) const {
399404
auto &desc = std::get<0>(getStorage());
400405
track.addTopLevelName(desc.Name.getBaseName());
401406
}

lib/AST/TypeCheckRequests.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1290,7 +1290,7 @@ void CheckRedeclarationRequest::writeDependencySink(
12901290

12911291
void LookupAllConformancesInContextRequest::writeDependencySink(
12921292
evaluator::DependencyCollector &tracker,
1293-
ProtocolConformanceLookupResult conformances) const {
1293+
const ProtocolConformanceLookupResult &conformances) const {
12941294
for (auto conformance : conformances) {
12951295
tracker.addPotentialMember(conformance->getProtocol());
12961296
}

0 commit comments

Comments
 (0)