fix(control-flow): mark exprs as may_throw = true even when scope.end is already set
#721
Conversation
This file contains 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
magurotuna
commented
Jun 7, 2021
Comment on lines
+862
to
+888
| #[test] | ||
| fn issue_716() { | ||
| let src = r#" | ||
| function foo() { | ||
| if (bool) {} else {} | ||
| try { | ||
| bar(); | ||
| return 42; | ||
| } catch (err) { | ||
| console.error(err); | ||
| } | ||
| } | ||
| "#; | ||
| let flow = analyze_flow(src); | ||
| assert_flow!(flow, 1, false, Some(End::Continue)); // function | ||
| assert_flow!(flow, 16, false, Some(End::Continue)); // BlockStmt of `foo` | ||
| assert_flow!(flow, 20, false, Some(End::Continue)); // if stmt | ||
| assert_flow!(flow, 30, false, Some(End::Continue)); // BlockStmt of if | ||
| assert_flow!(flow, 38, false, Some(End::Continue)); // BlockStmt of else | ||
| assert_flow!(flow, 43, false, Some(End::Continue)); // try stmt | ||
| assert_flow!(flow, 47, false, Some(End::forced_return())); // BlockStmt of try | ||
| assert_flow!(flow, 53, false, None); // `bar();` | ||
| assert_flow!(flow, 64, false, Some(End::forced_return())); // return stmt | ||
| assert_flow!(flow, 79, false, Some(End::Continue)); // catch clause | ||
| assert_flow!(flow, 91, false, Some(End::Continue)); // BlockStmt of catch | ||
| assert_flow!(flow, 97, false, None); // `console.error(err);` | ||
| } |
There was a problem hiding this comment.
Added a test to ensure the control-flow analyzer works as expected.
magurotuna
commented
Jun 7, 2021
Comment on lines
+478
to
+493
| // https://github.com/denoland/deno_lint/issues/716 | ||
| r#" | ||
| function foo(trueOrFalse: boolean) { | ||
| if (trueOrFalse) { | ||
| // noop | ||
| } else { | ||
| // noop | ||
| } | ||
| try { | ||
| bar(); | ||
| return 42; | ||
| } catch (err) { | ||
| console.error(err); | ||
| } | ||
| } | ||
| "#, |
There was a problem hiding this comment.
Also added a direct regression test.
magurotuna
commented
Jun 7, 2021
| fn visit_expr(&mut self, n: &Expr, _: &dyn Node) { | ||
| n.visit_children_with(self); | ||
|
|
||
| if matches!(self.scope.end, None | Some(End::Continue)) { |
There was a problem hiding this comment.
The only change for the implementation is here.
Previously this line looked like if self.scope.end.is_none() {. Actually we should set self.scope.may_throw to true in the case of Some(End::Continue) too.
bartlomieju
approved these changes
Jun 7, 2021
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.
This PR fixes a false positive that occurs in situations where a try-catch block follows a if-else block.
In addition, I separated
control_flow.rsinto two files because there are so many test cases, making it less easy for us to navigate the implementation and the tests in the editor.This refactor makes the essential diff hard to find, so I'm going to add some comments to spot where it is.
Fixes #716