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.

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(semantic): transform checker compare scope parents #5055

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
53 changes: 53 additions & 0 deletions crates/oxc_semantic/src/post_transform_checker.rs
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ use oxc_syntax::{
scope::{ScopeFlags, ScopeId},
symbol::SymbolId,
};
use rustc_hash::FxHashMap;

use crate::{ScopeTree, SemanticBuilder, SymbolTable};

Expand Down Expand Up @@ -141,8 +142,12 @@ pub fn check_semantic_after_transform(
let mut checker = PostTransformChecker {
after_transform: data_after_transform,
rebuilt: data_rebuilt,
scope_ids_map: FxHashMap::default(),
symbol_ids_map: FxHashMap::default(),
reference_ids_map: FxHashMap::default(),
errors: Errors::default(),
};
checker.create_mappings();
checker.check_scopes();
checker.check_symbols();
checker.check_references();
Expand All @@ -153,6 +158,10 @@ pub fn check_semantic_after_transform(
struct PostTransformChecker<'s> {
after_transform: SemanticData<'s>,
rebuilt: SemanticData<'s>,
// Mappings from after transform ID to rebuilt ID
scope_ids_map: FxHashMap<ScopeId, ScopeId>,
symbol_ids_map: FxHashMap<SymbolId, SymbolId>,
reference_ids_map: FxHashMap<ReferenceId, ReferenceId>,
errors: Errors,
}

Expand Down Expand Up @@ -265,6 +274,34 @@ rebuilt : {value_rebuilt}
}

impl<'s> PostTransformChecker<'s> {
fn create_mappings(&mut self) {
// Scope IDs
for (&scope_id_after_transform, &scope_id_rebuilt) in
self.after_transform.ids.scope_ids.iter().zip(self.rebuilt.ids.scope_ids.iter())
{
let (Some(scope_id_after_transform), Some(scope_id_rebuilt)) =
(scope_id_after_transform, scope_id_rebuilt)
else {
continue;
};
self.scope_ids_map.insert(scope_id_after_transform, scope_id_rebuilt);
}

// Symbol IDs
for (&symbol_id_after_transform, &symbol_id_rebuilt) in
self.after_transform.ids.symbol_ids.iter().zip(self.rebuilt.ids.symbol_ids.iter())
{
self.symbol_ids_map.insert(symbol_id_after_transform, symbol_id_rebuilt);
}

// Reference IDs
for (&reference_id_after_transform, &reference_id_rebuilt) in
self.after_transform.ids.reference_ids.iter().zip(self.rebuilt.ids.reference_ids.iter())
{
self.reference_ids_map.insert(reference_id_after_transform, reference_id_rebuilt);
}
}

fn check_scopes(&mut self) {
if self.get_static_pair(|data| data.ids.scope_ids.len()).is_mismatch() {
self.errors.push("Scopes mismatch after transform");
Expand Down Expand Up @@ -320,6 +357,22 @@ impl<'s> PostTransformChecker<'s> {
if flags.is_mismatch() {
self.errors.push_mismatch("Scope flags mismatch", scope_ids, flags);
}

// Check parents match
let parent_ids =
self.get_pair(scope_ids, |data, scope_id| data.scopes.get_parent_id(scope_id));
let is_match = match parent_ids.into_parts() {
(Some(parent_id_after_transform), Some(parent_id_rebuilt)) => {
let parent_id_after_transform =
self.scope_ids_map.get(&parent_id_after_transform);
parent_id_after_transform == Some(&parent_id_rebuilt)
}
(None, None) => true,
_ => false,
};
if !is_match {
self.errors.push_mismatch("Scope parent mismatch", scope_ids, parent_ids);
}
}
}

Expand Down
8 changes: 8 additions & 0 deletions tasks/transform_conformance/babel.snap.md
Original file line number Diff line number Diff line change
Expand Up @@ -1659,6 +1659,10 @@ preset-env: unknown field `shippedProposals`, expected `targets` or `bugfixes`
| after transform: ScopeId(2): []
| rebuilt : ScopeId(3): ["_unused"]

x Scope parent mismatch:
| after transform: ScopeId(2): Some(ScopeId(0))
| rebuilt : ScopeId(3): Some(ScopeId(2))


* optional-catch-bindings/try-catch-finally-no-binding/input.js
x Bindings mismatch:
Expand All @@ -1673,6 +1677,10 @@ preset-env: unknown field `shippedProposals`, expected `targets` or `bugfixes`
| after transform: ScopeId(2): []
| rebuilt : ScopeId(3): ["_unused"]

x Scope parent mismatch:
| after transform: ScopeId(2): Some(ScopeId(0))
| rebuilt : ScopeId(3): Some(ScopeId(2))



# babel-plugin-transform-exponentiation-operator (3/4)
Expand Down
4 changes: 4 additions & 0 deletions tasks/transform_conformance/oxc.snap.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ Passed: 9/35
| after transform: ScopeId(2): []
| rebuilt : ScopeId(3): ["_unused2"]

x Scope parent mismatch:
| after transform: ScopeId(2): Some(ScopeId(0))
| rebuilt : ScopeId(3): Some(ScopeId(2))



# babel-plugin-transform-typescript (3/7)
Expand Down