Parser: calculating interface hash only for primary files. #19196
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
|
@swift-ci please smoke test |
jrose-apple
reviewed
Sep 7, 2018
include/swift/AST/Module.h
Outdated
| @@ -1117,20 +1118,23 @@ class SourceFile final : public FileUnit { | |||
| /// Set the root refinement context for the file. | |||
| void setTypeRefinementContext(TypeRefinementContext *TRC); | |||
|
|
|||
| void initInterfaceHashIfEmpty() { | |||
There was a problem hiding this comment.
This doesn't seem right to me. I'd expect something like enableInterfaceHash(), which would assert if it were already enabled.
include/swift/Subsystems.h
Outdated
| @@ -117,6 +117,7 @@ namespace swift { | |||
| /// | |||
| /// \return true if the parser found code with side effects. | |||
| bool parseIntoSourceFile(SourceFile &SF, unsigned BufferID, bool *Done, | |||
| bool CollectInterfaceHash, | |||
There was a problem hiding this comment.
…and then you wouldn't need this.
nkcsgexi
force-pushed
the
is-primary-parse
branch
from
c4513ff to
0b3b52b
Compare
|
@swift-ci please smoke test |
jrose-apple
reviewed
Sep 7, 2018
lib/Frontend/Frontend.cpp
Outdated
| @@ -745,7 +745,8 @@ void CompilerInstance::parseLibraryFile( | |||
| auto &Diags = NextInput->getASTContext().Diags; | |||
| auto DidSuppressWarnings = Diags.getSuppressWarnings(); | |||
| Diags.setSuppressWarnings(DidSuppressWarnings || !IsPrimary); | |||
|
|
|||
| if (IsPrimary) | |||
| NextInput->enableInterfaceHash(); | |||
There was a problem hiding this comment.
I think you can simplify this by doing it even earlier, in CompilerInstance::createSourceFileForMainModule.
There was a problem hiding this comment.
I've put it in recordPrimarySourceFile.
nkcsgexi
force-pushed
the
is-primary-parse
branch
from
0b3b52b to
fe0046b
Compare
|
@swift-ci please smoke test |
jrose-apple
approved these changes
Sep 7, 2018
|
@swift-ci please smoke test OS X Platform |
1 similar comment
|
@swift-ci please smoke test OS X Platform |
rintaro
approved these changes
Sep 8, 2018
|
@swift-ci please smoke test |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Per discussion we had in #19192, we only need to collect interface hashes for primary files. This change allows parser to consume tokens out of order for non-primary files.