Disable parse-time name lookup in swift-ide-test #34739
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Contributor
Author
|
@swift-ci Please smoke test |
1 similar comment
Contributor
Author
|
@swift-ci Please smoke test |
rintaro
approved these changes
Nov 14, 2020
lib/Parse/ParseGeneric.cpp
Outdated
Comment on lines
404
to
407
Member
There was a problem hiding this comment.
I think we can just return result here
rintaro
reviewed
Nov 14, 2020
include/swift/AST/GenericParamList.h
Outdated
Comment on lines
324
to
325
Member
There was a problem hiding this comment.
How about
if (WhereLoc.isInvalid())
return SourceRange();
if (Requirements.empty())
return WhereLoc;
We have two ways of knowing if we're inside of an inactive #if clause. Refactor the only two places that called getScopeInfo().isInactiveConfigBlock() to check InInactiveClauseEnvironment instead. This removes the last remaining usage of Scope that's not related to parse-time name lookup.
Also, store the end location of the where clause explicitly, so that we can recover it even if there are no requirements. This fixes one of the failing tests when parser lookup is disabled in swift-ide-test by ensuring that the source range of the function extends to the end of the 'where' clause, even though the 'where' clause has a code completion token in it.
slavapestov
force-pushed
the
swift-ide-test-parser-lookup
branch
from
ca1e4a6 to
74e72a6
Compare
Contributor
Author
|
Thanks for the review, @rintaro! |
Contributor
Author
|
@swift-ci Please smoke test |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I have some leftover patches from my work on ASTScope. A couple of places that create an ASTContext without a CompilerInvocation still had parser lookup enabled; swift-ide-test is one of them.