Skip to content

Commit 2e0bfb7

Browse files
committed
Factor out lookInModuleScope
1 parent 68be308 commit 2e0bfb7

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

lib/AST/UnqualifiedLookup.cpp

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,8 @@ class UnqualifiedLookupFactory {
226226

227227
private:
228228
bool useASTScopesForExperimentalLookup() const;
229-
229+
230+
void lookInModuleScope(DCAndResolvedIsCascadingUse dcAndIsCascadingUse);
230231

231232
#pragma mark ASTScope-based-lookup declarations
232233

@@ -407,11 +408,14 @@ void UnqualifiedLookupFactory::performUnqualifiedLookup() {
407408
Optional<DCAndResolvedIsCascadingUse> dcAndIsCascadingUse = useASTScopesForExperimentalLookup()
408409
? experimentallyLookInASTScopes(DC, isCascadingUseInitial)
409410
: lookInDeclContexts(DC, isCascadingUseInitial);
410-
if (!dcAndIsCascadingUse.hasValue())
411-
return;
411+
if (dcAndIsCascadingUse.hasValue())
412+
lookInModuleScope(dcAndIsCascadingUse.getValue());
413+
}
412414

413-
DeclContext *const DC = dcAndIsCascadingUse.getValue().DC;
414-
const bool isCascadingUse = dcAndIsCascadingUse.getValue().isCascadingUse;
415+
void UnqualifiedLookupFactory::lookInModuleScope(
416+
DCAndResolvedIsCascadingUse dcAndIsCascadingUse) {
417+
DeclContext *const DC = dcAndIsCascadingUse.DC;
418+
const bool isCascadingUse = dcAndIsCascadingUse.isCascadingUse;
415419

416420
recordDependencyOnTopLevelName(DC, Name, isCascadingUse);
417421

0 commit comments

Comments
 (0)