averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

[Gardening] Remove some parameters obviated by OperatorLookup::map_ptr

Browse Source
This commit is contained in:
Robert Widmann
2020-03-21 11:34:52 -07:00
parent c136a0b190
commit 425bd50f76
1 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
lib/AST/Module.cpp
View File

@@ -1014,8 +1014,7 @@ void SourceFile::setSyntaxRoot(syntax::SourceFileSyntax &&Root) {
template<typename OP_DECL> template<typename OP_DECL>
static Optional<OP_DECL *> static Optional<OP_DECL *>
lookupOperatorDeclForName(ModuleDecl *M, SourceLoc Loc, Identifier Name, lookupOperatorDeclForName(ModuleDecl *M, SourceLoc Loc, Identifier Name);
OperatorMap<OP_DECL *> SourceFile::*OP_MAP);
template<typename OP_DECL> template<typename OP_DECL>
using ImportedOperatorsMap = llvm::SmallDenseMap<OP_DECL*, bool, 16>; using ImportedOperatorsMap = llvm::SmallDenseMap<OP_DECL*, bool, 16>;
@@ -1066,8 +1065,7 @@ checkOperatorConflicts(const SourceFile &SF, SourceLoc loc,
template <typename OP_DECL> template <typename OP_DECL>
static Optional<OP_DECL *> static Optional<OP_DECL *>
lookupOperatorDeclForName(const FileUnit &File, SourceLoc Loc, lookupOperatorDeclForName(const FileUnit &File, SourceLoc Loc,
Identifier Name, bool includePrivate, Identifier Name, bool includePrivate) {
OperatorMap<OP_DECL *> SourceFile::*OP_MAP) {
switch (File.getKind()) { switch (File.getKind()) {
case FileUnitKind::Builtin: case FileUnitKind::Builtin:
// The Builtin module declares no operators. // The Builtin module declares no operators.
@@ -1084,6 +1082,7 @@ lookupOperatorDeclForName(const FileUnit &File, SourceLoc Loc,
assert(SF.ASTStage >= SourceFile::NameBound); assert(SF.ASTStage >= SourceFile::NameBound);
// Look for an operator declaration in the current module. // Look for an operator declaration in the current module.
const auto OP_MAP = OperatorLookup<OP_DECL>::map_ptr;
auto found = (SF.*OP_MAP).find(Name); auto found = (SF.*OP_MAP).find(Name);
if (found != (SF.*OP_MAP).end() && (includePrivate || found->second.getInt())) if (found != (SF.*OP_MAP).end() && (includePrivate || found->second.getInt()))
return found->second.getPointer(); return found->second.getPointer();
@@ -1105,7 +1104,7 @@ lookupOperatorDeclForName(const FileUnit &File, SourceLoc Loc,
continue; continue;
Optional<OP_DECL *> maybeOp = Optional<OP_DECL *> maybeOp =
lookupOperatorDeclForName(imported.module.second, Loc, Name, OP_MAP); lookupOperatorDeclForName<OP_DECL>(imported.module.second, Loc, Name);
if (!maybeOp) if (!maybeOp)
return None; return None;
@@ -1138,12 +1137,10 @@ lookupOperatorDeclForName(const FileUnit &File, SourceLoc Loc,
template<typename OP_DECL> template<typename OP_DECL>
static Optional<OP_DECL *> static Optional<OP_DECL *>
lookupOperatorDeclForName(ModuleDecl *M, SourceLoc Loc, Identifier Name, lookupOperatorDeclForName(ModuleDecl *M, SourceLoc Loc, Identifier Name) {
OperatorMap<OP_DECL *> SourceFile::*OP_MAP)
{
OP_DECL *result = nullptr; OP_DECL *result = nullptr;
for (const FileUnit *File : M->getFiles()) { for (const FileUnit *File : M->getFiles()) {
auto next = lookupOperatorDeclForName(*File, Loc, Name, false, OP_MAP); auto next = lookupOperatorDeclForName<OP_DECL>(*File, Loc, Name, false);
if (!next.hasValue()) if (!next.hasValue())
return next; return next;
@@ -1159,9 +1156,9 @@ lookupOperatorDeclForName(ModuleDecl *M, SourceLoc Loc, Identifier Name,
template <typename OperatorType> template <typename OperatorType>
llvm::Expected<OperatorType *> LookupOperatorRequest<OperatorType>::evaluate( llvm::Expected<OperatorType *> LookupOperatorRequest<OperatorType>::evaluate(
Evaluator &evaluator, OperatorLookupDescriptor desc) const { Evaluator &evaluator, OperatorLookupDescriptor desc) const {
auto result = lookupOperatorDeclForName(*desc.SF, desc.diagLoc, desc.name, auto result = lookupOperatorDeclForName<OperatorType>(*desc.SF, desc.diagLoc,
/*includePrivate*/ true, desc.name,
OperatorLookup<OperatorType>::map_ptr); /*includePrivate*/ true);
if (!result.hasValue()) if (!result.hasValue())
return nullptr; return nullptr;
if (auto *tracker = desc.SF->getReferencedNameTracker()) { if (auto *tracker = desc.SF->getReferencedNameTracker()) {
@@ -1172,9 +1169,9 @@ llvm::Expected<OperatorType *> LookupOperatorRequest<OperatorType>::evaluate(
} }
} }
if (!result.getValue()) { if (!result.getValue()) {
result = lookupOperatorDeclForName(desc.SF->getParentModule(), desc.diagLoc, result = lookupOperatorDeclForName<OperatorType>(desc.SF->getParentModule(),
desc.name, desc.diagLoc,
OperatorLookup<OperatorType>::map_ptr); desc.name);
} }
return result.hasValue() ? result.getValue() : nullptr; return result.hasValue() ? result.getValue() : nullptr;
} }
@@ -1183,7 +1180,7 @@ llvm::Expected<OperatorType *> LookupOperatorRequest<OperatorType>::evaluate(
#define LOOKUP_OPERATOR(Kind) \ #define LOOKUP_OPERATOR(Kind) \
Kind##Decl *ModuleDecl::lookup##Kind(Identifier name, SourceLoc loc) { \ Kind##Decl *ModuleDecl::lookup##Kind(Identifier name, SourceLoc loc) { \
auto result = \ auto result = \
lookupOperatorDeclForName(this, loc, name, &SourceFile::Kind##s); \ lookupOperatorDeclForName<Kind##Decl>(this, loc, name); \
return result ? *result : nullptr; \ return result ? *result : nullptr; \
} \ } \
template llvm::Expected<Kind##Decl *> \ template llvm::Expected<Kind##Decl *> \