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.

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

Jump to bottom

fix(es/compat): Visit assign expr in generator #7932

Merged
merged 1 commit into from
Sep 10, 2023
+103 −61
Merged

fix(es/compat): Visit assign expr in generator #7932

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
120 changes: 59 additions & 61 deletions crates/swc_ecma_transforms_compat/src/es2015/generator.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -572,72 +572,70 @@ impl VisitMut for Generator {
e.visit_mut_children_with(self);
}

Expr::Assign(node) => {
if contains_yield(&node.right) {
match node.left.as_expr_mut() {
Some(Expr::Member(left)) => {
match &mut left.prop {
MemberProp::Ident(..) | MemberProp::PrivateName(..) => {
// a.b = yield;
//
// [intermediate]
// .local _a
// _a = a;
// .yield resumeLabel
// .mark resumeLabel
// _a.b = %sent%;

left.obj.visit_mut_with(self);
let obj = self.cache_expression(left.obj.take());

left.obj = Box::new(Expr::Ident(obj));
}
MemberProp::Computed(prop) => {
// [source]
// a[b] = yield;
//
// [intermediate]
// .local _a, _b
// _a = a;
// _b = b;
// .yield resumeLabel
// .mark resumeLabel
// _a[_b] = %sent%;
let prop_span = prop.span;

left.obj.visit_mut_with(self);
let obj = self.cache_expression(left.obj.take());

prop.visit_mut_with(self);
let prop = self.cache_expression(prop.expr.take());

left.obj = Box::new(Expr::Ident(obj));
left.prop = MemberProp::Computed(ComputedPropName {
span: prop_span,
expr: Box::new(Expr::Ident(prop)),
});
}
Expr::Assign(node) if contains_yield(&node.right) => {
match node.left.as_expr_mut() {
Some(Expr::Member(left)) => {
match &mut left.prop {
MemberProp::Ident(..) | MemberProp::PrivateName(..) => {
// a.b = yield;
//
// [intermediate]
// .local _a
// _a = a;
// .yield resumeLabel
// .mark resumeLabel
// _a.b = %sent%;

left.obj.visit_mut_with(self);
let obj = self.cache_expression(left.obj.take());

left.obj = Box::new(Expr::Ident(obj));
}
MemberProp::Computed(prop) => {
// [source]
// a[b] = yield;
//
// [intermediate]
// .local _a, _b
// _a = a;
// _b = b;
// .yield resumeLabel
// .mark resumeLabel
// _a[_b] = %sent%;
let prop_span = prop.span;

left.obj.visit_mut_with(self);
let obj = self.cache_expression(left.obj.take());

prop.visit_mut_with(self);
let prop = self.cache_expression(prop.expr.take());

left.obj = Box::new(Expr::Ident(obj));
left.prop = MemberProp::Computed(ComputedPropName {
span: prop_span,
expr: Box::new(Expr::Ident(prop)),
});
}
// [source]
}
_ => {
node.left.visit_mut_with(self);
}
// [source]
}
_ => {
node.left.visit_mut_with(self);
}
if node.op != op!("=") {
let left_of_right = self.cache_expression(node.left.take().expect_expr());
}
if node.op != op!("=") {
let left_of_right = self.cache_expression(node.left.take().expect_expr());

node.right.visit_mut_with(self);
node.right.visit_mut_with(self);

*e = Expr::Assign(AssignExpr {
span: node.right.span(),
op: node.op,
left: left_of_right.into(),
right: node.right.take(),
});
} else {
node.right.visit_mut_with(self);
}
*e = Expr::Assign(AssignExpr {
span: node.right.span(),
op: node.op,
left: left_of_right.into(),
right: node.right.take(),
});
} else {
node.right.visit_mut_with(self);
}
}

Expand Down
44 changes: 44 additions & 0 deletions crates/swc_ecma_transforms_compat/tests/es2015_generator.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1937,3 +1937,47 @@ test_exec!(
await res;
"
);

test!(
Syntax::default(),
|_| {
let mark = Mark::fresh(Mark::root());
es2015::<SingleThreadedComments>(mark, None, Default::default())
},
issue_7809,
r#"
function a(fn) {
return _a.apply(this, arguments);
}
function _a() {
_a = _async_to_generator(function*(fn) {
(yield fn()).a = 1;
});
return _a.apply(this, arguments);
}
"#,
r#"
function a(fn) {
return _a.apply(this, arguments);
}
function _a() {
_a = _async_to_generator(function(fn) {
return _ts_generator(this, function(_state) {
switch(_state.label){
case 0:
return [
4,
fn()
];
case 1:
_state.sent().a = 1;
return [
2
];
}
});
});
return _a.apply(this, arguments);
}
"#
);
Loading