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

fix(transformer): exponentiation transform: fix duplicate symbols #6300

Merged
merged 1 commit into from
Oct 6, 2024
Merged

fix(transformer): exponentiation transform: fix duplicate symbols #6300

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
30 changes: 13 additions & 17 deletions crates/oxc_transformer/src/es2016/exponentiation_operator.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,17 +146,14 @@ impl<'a, 'ctx> ExponentiationOperator<'a, 'ctx> {
nodes: &mut Vec<'a, Expression<'a>>,
ctx: &mut TraverseCtx<'a>,
) -> Option<Exploded<'a>> {
let node = node.as_simple_assignment_target_mut()?;
let obj = self.get_obj_ref(node, nodes, ctx)?;
let (reference, uid) = match node {
SimpleAssignmentTarget::AssignmentTargetIdentifier(ident) => {
let reference =
AssignmentTarget::AssignmentTargetIdentifier(ctx.ast.alloc(
ctx.clone_identifier_reference(ident.as_ref(), ReferenceFlags::Write),
));
(reference, obj)
AssignmentTarget::AssignmentTargetIdentifier(_) => {
let obj = self.get_obj_ref(node, nodes, ctx).unwrap();
let ident = ctx.ast.move_assignment_target(node);
(ident, obj)
}
match_member_expression!(SimpleAssignmentTarget) => {
match_member_expression!(AssignmentTarget) => {
let obj = self.get_obj_ref(node, nodes, ctx).unwrap();
let member_expr = node.to_member_expression_mut();
let computed = member_expr.is_computed();
let prop = self.get_prop_ref(member_expr, nodes, ctx)?;
Expand Down Expand Up @@ -202,12 +199,12 @@ impl<'a, 'ctx> ExponentiationOperator<'a, 'ctx> {
/// Make sure side-effects of evaluating `obj` of `obj.ref` and `obj[ref]` only happen once.
fn get_obj_ref(
&mut self,
node: &mut SimpleAssignmentTarget<'a>,
node: &mut AssignmentTarget<'a>,
nodes: &mut Vec<'a, Expression<'a>>,
ctx: &mut TraverseCtx<'a>,
) -> Option<Expression<'a>> {
let reference = match node {
SimpleAssignmentTarget::AssignmentTargetIdentifier(ident) => {
AssignmentTarget::AssignmentTargetIdentifier(ident) => {
let reference = ctx.symbols().get_reference(ident.reference_id().unwrap());
if let Some(symbol_id) = reference.symbol_id() {
// this variable is declared in scope so we can be 100% sure
Expand All @@ -229,12 +226,11 @@ impl<'a, 'ctx> ExponentiationOperator<'a, 'ctx> {
ReferenceFlags::Read,
))
}
match_member_expression!(SimpleAssignmentTarget) => {
let expr = match node {
SimpleAssignmentTarget::ComputedMemberExpression(e) => &mut e.object,
SimpleAssignmentTarget::StaticMemberExpression(e) => &mut e.object,
SimpleAssignmentTarget::PrivateFieldExpression(e) => &mut e.object,
_ => unreachable!(),
match_member_expression!(AssignmentTarget) => {
let expr = match node.to_member_expression_mut() {
MemberExpression::ComputedMemberExpression(e) => &mut e.object,
MemberExpression::StaticMemberExpression(e) => &mut e.object,
MemberExpression::PrivateFieldExpression(e) => &mut e.object,
};
let expr = ctx.ast.move_expression(expr);
// the object reference that we need to save is locally declared
Expand Down
6 changes: 0 additions & 6 deletions tasks/transform_conformance/snapshots/babel.snap.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1630,12 +1630,6 @@ x Output mismatch

# babel-plugin-transform-exponentiation-operator (1/4)
* exponentiation-operator/assignment/input.js
Symbol reference IDs mismatch for "num":
after transform: SymbolId(0): [ReferenceId(0), ReferenceId(1), ReferenceId(2)]
rebuilt : SymbolId(0): [ReferenceId(0), ReferenceId(2)]
Reference flags mismatch for "num":
after transform: ReferenceId(2): ReferenceFlags(Write)
rebuilt : ReferenceId(0): ReferenceFlags(Read | Write)
Reference flags mismatch for "num":
after transform: ReferenceId(1): ReferenceFlags(Write)
rebuilt : ReferenceId(2): ReferenceFlags(Read)
Expand Down