8000 Fix panic for top level if and else if by RuairidhWilliamson · Pull Request #19 · wilsonzlin/minify-js · GitHub
[go: up one dir, main page]
Skip to content

Fix panic for top level if and else if #19

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.

Sign up for GitHub

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

Open
RuairidhWilliamson wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix panic for top level if and else if #19

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
34ac8a6
Fix top level if panic
RuairidhWilliamson Jan 28, 2024
bbd1fc4
Fix else if assertion fail
RuairidhWilliamson Jan 28, 2024
8637df1
Fix assertion logic
RuairidhWilliamson Mar 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions rust/src/minify/pass1.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,7 +376,7 @@ impl<'a, 'b> Visitor<'a> for Pass1<'a, 'b> {

match (cons_ok, alt_ok) {
(true, None) => {
let closure_scope = scope.find_self_or_ancestor(|t| t.is_closure()).unwrap();
let closure_scope = scope.find_self_or_ancestor(|t| t.is_closure()).unwrap_or(scope);
let cons_expr = process_if_branch(self.ctx.session, scope, consequent);
let min_scope = self
.ctx
Expand Down Expand Up @@ -404,7 +404,7 @@ impl<'a, 'b> Visitor<'a> for Pass1<'a, 'b> {
}
}
(true, Some(true)) => {
let closure_scope = scope.find_self_or_ancestor(|t| t.is_closure()).unwrap();
let closure_scope = scope.find_self_or_ancestor(|t| t.is_closure()).unwrap_or(scope);
let cons_expr = process_if_branch(self.ctx.session, scope, consequent);
let alt_expr = process_if_branch(self.ctx.session, scope, alternate.as_mut().unwrap());
let min_scope = self
Expand All @@ -419,7 +419,7 @@ impl<'a, 'b> Visitor<'a> for Pass1<'a, 'b> {
.hoisted_vars
.extend_from_slice(&alt_expr.hoisted_vars);
// Due to normalisation, it's not possible for an `if-else` to return in either branch, because one branch would've been unwrapped.
assert!(cons_expr.returns && alt_expr.returns);
assert!(cons_expr.returns == alt_expr.returns);
let test = test.take(self.ctx.session);
let consequent = cons_expr.expression;
let alternate = alt_expr.expression;
Expand Down
0