Skip to content

Commit 0098569

Browse files
committed
[Parse] Return 'const' pointer from AvailabilityMacroArgumentsRequest
Because it shouldn't be modified.
1 parent 9078714 commit 0098569

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

include/swift/AST/ParseRequests.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ class EvaluateIfConditionRequest
196196
/// Parse the '-define-availability' arguments.
197197
class AvailabilityMacroArgumentsRequest
198198
: public SimpleRequest<AvailabilityMacroArgumentsRequest,
199-
AvailabilityMacroMap *(ASTContext *),
199+
const AvailabilityMacroMap *(ASTContext *),
200200
RequestFlags::Cached> {
201201
public:
202202
using SimpleRequest::SimpleRequest;
@@ -205,7 +205,8 @@ class AvailabilityMacroArgumentsRequest
205205
friend SimpleRequest;
206206

207207
// Evaluation.
208-
AvailabilityMacroMap *evaluate(Evaluator &evaluator, ASTContext *ctx) const;
208+
const AvailabilityMacroMap *evaluate(Evaluator &evaluator,
209+
ASTContext *ctx) const;
209210

210211
public:
211212
// Caching.

include/swift/AST/ParseTypeIDZone.def

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,5 +35,5 @@ SWIFT_REQUEST(Parse, EvaluateIfConditionRequest,
3535
(std::pair<bool, bool>)(SourceFile *, SourceRange, bool), Uncached,
3636
NoLocationInfo)
3737
SWIFT_REQUEST(Parse, AvailabilityMacroArgumentsRequest,
38-
(AvailabilityMacroMap *)(ASTContext *), Cached,
38+
(const AvailabilityMacroMap *)(ASTContext *), Cached,
3939
NoLocationInfo)

lib/Parse/ParseRequests.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -591,7 +591,7 @@ bool parseAvailabilityMacroDefinition(
591591

592592
} // namespace
593593

594-
AvailabilityMacroMap *
594+
const AvailabilityMacroMap *
595595
AvailabilityMacroArgumentsRequest::evaluate(Evaluator &evaluator,
596596
ASTContext *ctx) const {
597597
SourceManager &SM = ctx->SourceMgr;

0 commit comments

Comments
 (0)