Skip to content

Commit 244185c

Browse files
committed
[NFC] AST: Rename BraceHasReturnRequest to BraceHasExplicitReturnStmtRequest
1 parent c7ea672 commit 244185c

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

include/swift/AST/TypeCheckRequests.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3050,9 +3050,9 @@ class AssociatedConformanceRequest
30503050
void cacheResult(ProtocolConformanceRef value) const;
30513051
};
30523052

3053-
class BraceHasReturnRequest
3054-
: public SimpleRequest<BraceHasReturnRequest, bool(const BraceStmt *),
3055-
RequestFlags::Cached> {
3053+
class BraceHasExplicitReturnStmtRequest
3054+
: public SimpleRequest<BraceHasExplicitReturnStmtRequest,
3055+
bool(const BraceStmt *), RequestFlags::Cached> {
30563056
public:
30573057
using SimpleRequest::SimpleRequest;
30583058

include/swift/AST/TypeCheckerTypeIDZone.def

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,7 @@ SWIFT_REQUEST(TypeChecker, HasUserDefinedDesignatedInitRequest,
383383
bool(NominalTypeDecl *), Cached, NoLocationInfo)
384384
SWIFT_REQUEST(TypeChecker, HasMemberwiseInitRequest,
385385
bool(StructDecl *), Cached, NoLocationInfo)
386-
SWIFT_REQUEST(TypeChecker, BraceHasReturnRequest,
386+
SWIFT_REQUEST(TypeChecker, BraceHasExplicitReturnStmtRequest,
387387
bool(const BraceStmt *),
388388
Cached, NoLocationInfo)
389389
SWIFT_REQUEST(TypeChecker, ResolveImplicitMemberRequest,

lib/Sema/BuilderTransform.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1266,8 +1266,8 @@ class ReturnStmtFinder : public ASTWalker {
12661266
};
12671267
} // end anonymous namespace
12681268

1269-
bool BraceHasReturnRequest::evaluate(Evaluator &evaluator,
1270-
const BraceStmt *BS) const {
1269+
bool BraceHasExplicitReturnStmtRequest::evaluate(Evaluator &evaluator,
1270+
const BraceStmt *BS) const {
12711271
return !ReturnStmtFinder::find(BS).empty();
12721272
}
12731273

@@ -1278,7 +1278,8 @@ bool AnyFunctionRef::bodyHasExplicitReturnStmt() const {
12781278
}
12791279

12801280
auto &ctx = getAsDeclContext()->getASTContext();
1281-
return evaluateOrDefault(ctx.evaluator, BraceHasReturnRequest{body}, false);
1281+
return evaluateOrDefault(ctx.evaluator,
1282+
BraceHasExplicitReturnStmtRequest{body}, false);
12821283
}
12831284

12841285
std::vector<ReturnStmt *> TypeChecker::findReturnStatements(AnyFunctionRef fn) {

0 commit comments

Comments
 (0)