Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

No merge for redirected source files in initializeTypeChecker #25463

Merged
merged 1 commit into from
Jul 5, 2018

Conversation

sandersn
Copy link
Member

@sandersn sandersn commented Jul 5, 2018

Previously, redirected source files merged the same way as other source files, effectively causing the target of the redirection to be merged twice. mergeSymbol now has an assert (source===target) that disallows this double merge, so this PR makes sure not to merge redirected source files.

This change doesn't apply to the preceding binding loop, since the binder handles already-bound source files correctly.

Fixes #25410
Fixes #25339

Previously, redirected source files merged the same way as other source
files, effectively causing the target of the redirection to be merged
twice. mergeSymbol now has an assert (`source===target`) that catches
this condition, so this change makes sure to skip redirected source
files.

This change doesn't apply to the preceding binding loop, since the
binder handles already-bound source files correctly.
@sandersn sandersn requested review from mhegazy and a user July 5, 2018 20:22
@sandersn sandersn merged commit 065e695 into master Jul 5, 2018
@sandersn sandersn deleted the skip-redirected-source-files-in-checker-init branch July 5, 2018 20:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants