Repository navigation
Make the fine-grained mergechecker work again - #8313
Merged
Merged
Conversation
This fixes some stuff in the mergechecker that breaks with current mypy's and also some bugs that the mergechecker caught. The entire fine-grained test suite now passes with the merge checker on, which I don't think has ever been true before. This means that we could turn it on by default, but it doubles the runtime of the fine-grained tests (from 90s CPU time to 180s CPU time on my laptop), so I've left it off for now. The motivation here is that I knew intersect_callable's creation of types during typechecking used to run afoul of the consistency checker and so I was nervous that #8305 would cause more problems by adding more logic of that kind. It no longer does, probably as a result of the semantic analyzer rewrite, so I think we are in the clear on that.
ilevkivskyi
approved these changes
Jan 23, 2020
ilevkivskyi
left a comment
ilevkivskyi
left a comment
Member
There was a problem hiding this comment.
Great! I just have one suggestion.
| # Clear out some stale data to avoid memory leaks and astmerge | ||
| # validity check confusion | ||
| analyzer.statement = None | ||
| delattr(analyzer, 'cur_mod_node') |
Member
There was a problem hiding this comment.
Why not del analyzer.cur_mod_node?
Collaborator
Author
There was a problem hiding this comment.
Because I forgot how to write python apparently
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
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.
This fixes some stuff in the mergechecker that breaks with current
mypy's and also some bugs that the mergechecker caught. The entire
fine-grained test suite now passes with the merge checker on, which I
don't think has ever been true before.
This means that we could turn it on by default, but it doubles the
runtime of the fine-grained tests (from 90s CPU time to 180s CPU time
on my laptop), so I've left it off for now.
The motivation here is that I knew intersect_callable's creation of
types during typechecking used to run afoul of the consistency checker
and so I was nervous that #8305 would cause more problems by adding
more logic of that kind. It no longer does, probably as a result of
the semantic analyzer rewrite, so I think we are in the clear on that.