Skip to content

Commit 3d09a00

Browse files
CodaFiCodaFi
committed
CacheKind -> RequestFlags
1 parent 2b0ca2a commit 3d09a00

13 files changed

+173
-173
lines changed

‎include/swift/AST/AccessRequests.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class ValueDecl;
3333
class AccessLevelRequest :
3434
public SimpleRequest<AccessLevelRequest,
3535
AccessLevel(ValueDecl *),
36-
CacheKind::SeparatelyCached> {
36+
RequestFlags::SeparatelyCached> {
3737
public:
3838
using SimpleRequest::SimpleRequest;
3939

@@ -56,7 +56,7 @@ class AccessLevelRequest :
5656
class SetterAccessLevelRequest :
5757
public SimpleRequest<SetterAccessLevelRequest,
5858
AccessLevel(AbstractStorageDecl *),
59-
CacheKind::SeparatelyCached> {
59+
RequestFlags::SeparatelyCached> {
6060
public:
6161
using SimpleRequest::SimpleRequest;
6262

@@ -79,7 +79,7 @@ using DefaultAndMax = std::pair<AccessLevel, AccessLevel>;
7979
class DefaultAndMaxAccessLevelRequest :
8080
public SimpleRequest<DefaultAndMaxAccessLevelRequest,
8181
DefaultAndMax(ExtensionDecl *),
82-
CacheKind::SeparatelyCached> {
82+
RequestFlags::SeparatelyCached> {
8383
public:
8484
using SimpleRequest::SimpleRequest;
8585
private:

‎include/swift/AST/Evaluator.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -508,8 +508,6 @@ class Evaluator {
508508

509509
/// Returns the active dependency's source file, or \c nullptr if no
510510
/// dependency source is active.
511-
///
512-
/// If there is no active scope, the result always cascades.
513511
SourceFile *getActiveDependencySource() const {
514512
if (dependencySources.empty())
515513
return nullptr;

‎include/swift/AST/IRGenRequests.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ void reportEvaluatedRequest(UnifiedStatsReporter &stats,
117117
class IRGenSourceFileRequest
118118
: public SimpleRequest<IRGenSourceFileRequest,
119119
std::unique_ptr<llvm::Module>(IRGenDescriptor),
120-
CacheKind::Uncached|CacheKind::DependencySource> {
120+
RequestFlags::Uncached|RequestFlags::DependencySource> {
121121
public:
122122
using SimpleRequest::SimpleRequest;
123123

@@ -139,7 +139,7 @@ class IRGenSourceFileRequest
139139
class IRGenWholeModuleRequest
140140
: public SimpleRequest<IRGenWholeModuleRequest,
141141
std::unique_ptr<llvm::Module>(IRGenDescriptor),
142-
CacheKind::Uncached> {
142+
RequestFlags::Uncached> {
143143
public:
144144
using SimpleRequest::SimpleRequest;
145145

‎include/swift/AST/NameLookupRequests.h

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ class InheritedDeclsReferencedRequest :
8181
DirectlyReferencedTypeDecls(
8282
llvm::PointerUnion<TypeDecl *, ExtensionDecl *>,
8383
unsigned),
84-
CacheKind::Uncached> // FIXME: Cache these
84+
RequestFlags::Uncached> // FIXME: Cache these
8585
{
8686
public:
8787
using SimpleRequest::SimpleRequest;
@@ -125,7 +125,7 @@ class InheritedDeclsReferencedRequest :
125125
class UnderlyingTypeDeclsReferencedRequest :
126126
public SimpleRequest<UnderlyingTypeDeclsReferencedRequest,
127127
DirectlyReferencedTypeDecls(TypeAliasDecl *),
128-
CacheKind::Uncached> // FIXME: Cache these
128+
RequestFlags::Uncached> // FIXME: Cache these
129129
{
130130
public:
131131
using SimpleRequest::SimpleRequest;
@@ -147,7 +147,7 @@ class UnderlyingTypeDeclsReferencedRequest :
147147
class SuperclassDeclRequest :
148148
public SimpleRequest<SuperclassDeclRequest,
149149
ClassDecl *(NominalTypeDecl *),
150-
CacheKind::SeparatelyCached> {
150+
RequestFlags::SeparatelyCached> {
151151
public:
152152
using SimpleRequest::SimpleRequest;
153153

@@ -168,8 +168,8 @@ class SuperclassDeclRequest :
168168
class InheritedProtocolsRequest
169169
: public SimpleRequest<
170170
InheritedProtocolsRequest, ArrayRef<ProtocolDecl *>(ProtocolDecl *),
171-
CacheKind::SeparatelyCached | CacheKind::DependencySink |
172-
CacheKind::DependencySource> {
171+
RequestFlags::SeparatelyCached | RequestFlags::DependencySink |
172+
RequestFlags::DependencySource> {
173173
public:
174174
using SimpleRequest::SimpleRequest;
175175

@@ -198,7 +198,7 @@ class InheritedProtocolsRequest
198198
class HasMissingDesignatedInitializersRequest :
199199
public SimpleRequest<HasMissingDesignatedInitializersRequest,
200200
bool(ClassDecl *),
201-
CacheKind::SeparatelyCached> {
201+
RequestFlags::SeparatelyCached> {
202202
public:
203203
using SimpleRequest::SimpleRequest;
204204

@@ -220,7 +220,7 @@ class HasMissingDesignatedInitializersRequest :
220220
class ExtendedNominalRequest
221221
: public SimpleRequest<
222222
ExtendedNominalRequest, NominalTypeDecl *(ExtensionDecl *),
223-
CacheKind::SeparatelyCached | CacheKind::DependencySink> {
223+
RequestFlags::SeparatelyCached | RequestFlags::DependencySink> {
224224
public:
225225
using SimpleRequest::SimpleRequest;
226226

@@ -254,7 +254,7 @@ class SelfBoundsFromWhereClauseRequest :
254254
public SimpleRequest<SelfBoundsFromWhereClauseRequest,
255255
SelfBounds(llvm::PointerUnion<TypeDecl *,
256256
ExtensionDecl *>),
257-
CacheKind::Uncached> {
257+
RequestFlags::Uncached> {
258258
public:
259259
using SimpleRequest::SimpleRequest;
260260

@@ -272,7 +272,7 @@ class SelfBoundsFromWhereClauseRequest :
272272
class TypeDeclsFromWhereClauseRequest :
273273
public SimpleRequest<TypeDeclsFromWhereClauseRequest,
274274
DirectlyReferencedTypeDecls(ExtensionDecl *),
275-
CacheKind::Uncached> {
275+
RequestFlags::Uncached> {
276276
public:
277277
using SimpleRequest::SimpleRequest;
278278

@@ -289,7 +289,7 @@ class TypeDeclsFromWhereClauseRequest :
289289
class CustomAttrNominalRequest :
290290
public SimpleRequest<CustomAttrNominalRequest,
291291
NominalTypeDecl *(CustomAttr *, DeclContext *),
292-
CacheKind::Cached> {
292+
RequestFlags::Cached> {
293293
public:
294294
using SimpleRequest::SimpleRequest;
295295

@@ -308,8 +308,8 @@ class CustomAttrNominalRequest :
308308
/// Finds or synthesizes a destructor for the given class.
309309
class GetDestructorRequest
310310
: public SimpleRequest<GetDestructorRequest, DestructorDecl *(ClassDecl *),
311-
CacheKind::SeparatelyCached |
312-
CacheKind::DependencySource> {
311+
RequestFlags::SeparatelyCached |
312+
RequestFlags::DependencySource> {
313313
public:
314314
using SimpleRequest::SimpleRequest;
315315

@@ -334,7 +334,7 @@ class GetDestructorRequest
334334
class GenericParamListRequest :
335335
public SimpleRequest<GenericParamListRequest,
336336
GenericParamList *(GenericContext *),
337-
CacheKind::SeparatelyCached> {
337+
RequestFlags::SeparatelyCached> {
338338
public:
339339
using SimpleRequest::SimpleRequest;
340340

@@ -357,7 +357,7 @@ class ExpandASTScopeRequest
357357
: public SimpleRequest<ExpandASTScopeRequest,
358358
ast_scope::ASTScopeImpl *(ast_scope::ASTScopeImpl *,
359359
ast_scope::ScopeCreator *),
360-
CacheKind::SeparatelyCached> {
360+
RequestFlags::SeparatelyCached> {
361361
public:
362362
using SimpleRequest::SimpleRequest;
363363

@@ -417,8 +417,8 @@ SourceLoc extractNearestSourceLoc(const UnqualifiedLookupDescriptor &desc);
417417
class UnqualifiedLookupRequest
418418
: public SimpleRequest<UnqualifiedLookupRequest,
419419
LookupResult(UnqualifiedLookupDescriptor),
420-
CacheKind::Uncached | CacheKind::DependencySource |
421-
CacheKind::DependencySink> {
420+
RequestFlags::Uncached | RequestFlags::DependencySource |
421+
RequestFlags::DependencySink> {
422422
public:
423423
using SimpleRequest::SimpleRequest;
424424

@@ -444,7 +444,7 @@ class LookupInModuleRequest
444444
QualifiedLookupResult(
445445
const DeclContext *, DeclName, NLKind,
446446
namelookup::ResolutionKind, const DeclContext *),
447-
CacheKind::Uncached> {
447+
RequestFlags::Uncached> {
448448
public:
449449
using SimpleRequest::SimpleRequest;
450450

@@ -463,7 +463,7 @@ class AnyObjectLookupRequest
463463
: public SimpleRequest<AnyObjectLookupRequest,
464464
QualifiedLookupResult(const DeclContext *,
465465
DeclNameRef, NLOptions),
466-
CacheKind::Uncached | CacheKind::DependencySink> {
466+
RequestFlags::Uncached | RequestFlags::DependencySink> {
467467
public:
468468
using SimpleRequest::SimpleRequest;
469469

@@ -486,8 +486,8 @@ class ModuleQualifiedLookupRequest
486486
QualifiedLookupResult(const DeclContext *,
487487
ModuleDecl *, DeclNameRef,
488488
NLOptions),
489-
CacheKind::Uncached | CacheKind::DependencySource |
490-
CacheKind::DependencySink> {
489+
RequestFlags::Uncached | RequestFlags::DependencySource |
490+
RequestFlags::DependencySink> {
491491
public:
492492
using SimpleRequest::SimpleRequest;
493493

@@ -512,7 +512,7 @@ class QualifiedLookupRequest
512512
QualifiedLookupResult(const DeclContext *,
513513
SmallVector<NominalTypeDecl *, 4>,
514514
DeclNameRef, NLOptions),
515-
CacheKind::Uncached | CacheKind::DependencySource> {
515+
RequestFlags::Uncached | RequestFlags::DependencySource> {
516516
public:
517517
using SimpleRequest::SimpleRequest;
518518

@@ -567,7 +567,7 @@ SourceLoc extractNearestSourceLoc(const DirectLookupDescriptor &desc);
567567
class DirectLookupRequest
568568
: public SimpleRequest<DirectLookupRequest,
569569
TinyPtrVector<ValueDecl *>(DirectLookupDescriptor),
570-
CacheKind::Uncached|CacheKind::DependencySink> {
570+
RequestFlags::Uncached|RequestFlags::DependencySink> {
571571
public:
572572
using SimpleRequest::SimpleRequest;
573573

@@ -644,16 +644,16 @@ template <typename OperatorType>
644644
class LookupOperatorRequest
645645
: public SimpleRequest<LookupOperatorRequest<OperatorType>,
646646
OperatorType *(OperatorLookupDescriptor),
647-
CacheKind::Cached|CacheKind::DependencySink> {
647+
RequestFlags::Cached|RequestFlags::DependencySink> {
648648
using SimpleRequest<LookupOperatorRequest<OperatorType>,
649649
OperatorType *(OperatorLookupDescriptor),
650-
CacheKind::Cached |
651-
CacheKind::DependencySink>::SimpleRequest;
650+
RequestFlags::Cached |
651+
RequestFlags::DependencySink>::SimpleRequest;
652652

653653
private:
654654
friend SimpleRequest<LookupOperatorRequest<OperatorType>,
655655
OperatorType *(OperatorLookupDescriptor),
656-
CacheKind::Cached|CacheKind::DependencySink>;
656+
RequestFlags::Cached|RequestFlags::DependencySink>;
657657

658658
// Evaluation.
659659
OperatorType *evaluate(Evaluator &evaluator,
@@ -680,7 +680,7 @@ class DirectOperatorLookupRequest
680680
: public SimpleRequest<DirectOperatorLookupRequest,
681681
TinyPtrVector<OperatorDecl *>(
682682
OperatorLookupDescriptor, OperatorFixity),
683-
CacheKind::Uncached> {
683+
RequestFlags::Uncached> {
684684
public:
685685
using SimpleRequest::SimpleRequest;
686686

@@ -698,7 +698,7 @@ class DirectPrecedenceGroupLookupRequest
698698
: public SimpleRequest<DirectPrecedenceGroupLookupRequest,
699699
TinyPtrVector<PrecedenceGroupDecl *>(
700700
OperatorLookupDescriptor),
701-
CacheKind::Uncached> {
701+
RequestFlags::Uncached> {
702702
public:
703703
using SimpleRequest::SimpleRequest;
704704

@@ -742,7 +742,7 @@ SourceLoc extractNearestSourceLoc(const LookupConformanceDescriptor &desc);
742742
class LookupConformanceInModuleRequest
743743
: public SimpleRequest<LookupConformanceInModuleRequest,
744744
ProtocolConformanceRef(LookupConformanceDescriptor),
745-
CacheKind::Uncached|CacheKind::DependencySink> {
745+
RequestFlags::Uncached|RequestFlags::DependencySink> {
746746
public:
747747
using SimpleRequest::SimpleRequest;
748748

‎include/swift/AST/ParseRequests.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ void simple_display(llvm::raw_ostream &out, const FingerprintAndMembers &value);
4343
class ParseMembersRequest
4444
: public SimpleRequest<ParseMembersRequest,
4545
FingerprintAndMembers(IterableDeclContext *),
46-
CacheKind::Cached> {
46+
RequestFlags::Cached> {
4747
public:
4848
using SimpleRequest::SimpleRequest;
4949

@@ -63,7 +63,7 @@ class ParseMembersRequest
6363
class ParseAbstractFunctionBodyRequest :
6464
public SimpleRequest<ParseAbstractFunctionBodyRequest,
6565
BraceStmt *(AbstractFunctionDecl *),
66-
CacheKind::SeparatelyCached>
66+
RequestFlags::SeparatelyCached>
6767
{
6868
public:
6969
using SimpleRequest::SimpleRequest;
@@ -85,7 +85,7 @@ class ParseAbstractFunctionBodyRequest :
8585
class ParseSourceFileRequest
8686
: public SimpleRequest<
8787
ParseSourceFileRequest, ArrayRef<Decl *>(SourceFile *),
88-
CacheKind::SeparatelyCached | CacheKind::DependencySource> {
88+
RequestFlags::SeparatelyCached | RequestFlags::DependencySource> {
8989
public:
9090
using SimpleRequest::SimpleRequest;
9191

@@ -111,7 +111,7 @@ void simple_display(llvm::raw_ostream &out,
111111
class CodeCompletionSecondPassRequest
112112
: public SimpleRequest<CodeCompletionSecondPassRequest,
113113
bool(SourceFile *, CodeCompletionCallbacksFactory *),
114-
CacheKind::Uncached|CacheKind::DependencySource> {
114+
RequestFlags::Uncached|RequestFlags::DependencySource> {
115115
public:
116116
using SimpleRequest::SimpleRequest;
117117

‎include/swift/AST/SILGenRequests.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ SourceLoc extractNearestSourceLoc(const SILGenDescriptor &desc);
8282
class SILGenSourceFileRequest :
8383
public SimpleRequest<SILGenSourceFileRequest,
8484
std::unique_ptr<SILModule>(SILGenDescriptor),
85-
CacheKind::Uncached|CacheKind::DependencySource> {
85+
RequestFlags::Uncached|RequestFlags::DependencySource> {
8686
public:
8787
using SimpleRequest::SimpleRequest;
8888

@@ -104,7 +104,7 @@ class SILGenSourceFileRequest :
104104
class SILGenWholeModuleRequest :
105105
public SimpleRequest<SILGenWholeModuleRequest,
106106
std::unique_ptr<SILModule>(SILGenDescriptor),
107-
CacheKind::Uncached> {
107+
RequestFlags::Uncached> {
108108
public:
109109
using SimpleRequest::SimpleRequest;
110110

‎include/swift/AST/SILOptimizerRequests.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
#define SWIFT_SILOPTIMIZER_REQUESTS_H
1919

2020
#include "swift/AST/ASTTypeIDs.h"
21+
#include "swift/AST/EvaluatorDependencies.h"
2122
#include "swift/AST/SimpleRequest.h"
2223

2324
namespace swift {
@@ -51,7 +52,7 @@ llvm::hash_code hash_value(const SILPipelineExecutionDescriptor &desc);
5152
class ExecuteSILPipelineRequest
5253
: public SimpleRequest<ExecuteSILPipelineRequest,
5354
evaluator::SideEffect(SILPipelineExecutionDescriptor),
54-
CacheKind::Uncached> {
55+
RequestFlags::Uncached> {
5556
public:
5657
using SimpleRequest::SimpleRequest;
5758

0 commit comments

Comments
 (0)