dan/oxc
1
0
Fork 0
mirror of https://github.com/danbulant/oxc synced 2026-05-24 12:21:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor(semantic): populate declarations field in SymbolTable::create_symbol (#4461)

Browse source 
`declarations` field of `SymbolTable` is part of SoA group, where all `Vec`s in the group are indexed by `SymbolId`. Populate `declarations` field along with the rest in `create_symbol`, to prevent them getting out of sync. This will prevent bugs like the one fixed in #4460.
This commit is contained in:
overlookmotel 2024-07-26 00:14:32 +00:00
parent c04b9aa5db
commit f17254ae2a
4 changed files with 19 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
crates/oxc_semantic/src/builder.rs
View file

@ -343,8 +343,13 @@ impl<'a> SemanticBuilder<'a> {
let includes = includes | self.current_symbol_flags; let includes = includes | self.current_symbol_flags;
let name = CompactStr::new(name); let name = CompactStr::new(name);
let symbol_id = self.symbols.create_symbol(span, name.clone(), includes, scope_id); let symbol_id = self.symbols.create_symbol(
self.symbols.add_declaration(self.current_node_id); span,
name.clone(),
includes,
scope_id,
self.current_node_id,
);
self.scope.add_binding(scope_id, name, symbol_id); self.scope.add_binding(scope_id, name, symbol_id);
symbol_id symbol_id
} }
@ -402,9 +407,13 @@ impl<'a> SemanticBuilder<'a> {
) -> SymbolId { ) -> SymbolId {
let includes = includes | self.current_symbol_flags; let includes = includes | self.current_symbol_flags;
let name = CompactStr::new(name); let name = CompactStr::new(name);
let symbol_id = let symbol_id = self.symbols.create_symbol(
self.symbols.create_symbol(span, name.clone(), includes, self.current_scope_id); span,
self.symbols.add_declaration(self.current_node_id); name.clone(),
includes,
self.current_scope_id,
self.current_node_id,
);
self.scope.get_bindings_mut(scope_id).insert(name, symbol_id); self.scope.get_bindings_mut(scope_id).insert(name, symbol_id);
symbol_id symbol_id
} }

6
crates/oxc_semantic/src/symbol.rs
View file

@ -120,19 +120,17 @@ impl SymbolTable {
name: CompactStr, name: CompactStr,
flag: SymbolFlags, flag: SymbolFlags,
scope_id: ScopeId, scope_id: ScopeId,
node_id: AstNodeId,
) -> SymbolId { ) -> SymbolId {
self.spans.push(span); self.spans.push(span);
self.names.push(name); self.names.push(name);
self.flags.push(flag); self.flags.push(flag);
self.scope_ids.push(scope_id); self.scope_ids.push(scope_id);
self.declarations.push(node_id);
self.resolved_references.push(vec![]); self.resolved_references.push(vec![]);
self.redeclare_variables.push(vec![]) self.redeclare_variables.push(vec![])
} }
pub fn add_declaration(&mut self, node_id: AstNodeId) {
self.declarations.push(node_id);
}
pub fn add_redeclare_variable(&mut self, symbol_id: SymbolId, span: Span) { pub fn add_redeclare_variable(&mut self, symbol_id: SymbolId, span: Span) {
self.redeclare_variables[symbol_id].push(span); self.redeclare_variables[symbol_id].push(span);
} }

2
crates/oxc_transformer/src/typescript/enum.rs
View file

@ -80,8 +80,8 @@ impl<'a> TypeScriptEnum<'a> {
enum_name.to_compact_str(), enum_name.to_compact_str(),
SymbolFlags::FunctionScopedVariable, SymbolFlags::FunctionScopedVariable,
func_scope_id, func_scope_id,
AstNodeId::DUMMY,
); );
ctx.symbols_mut().add_declaration(AstNodeId::DUMMY);
let ident = BindingIdentifier { let ident = BindingIdentifier {
span: decl.id.span, span: decl.id.span,
name: decl.id.name.clone(), name: decl.id.name.clone(),

4
crates/oxc_traverse/src/context/scoping.rs
View file

@ -245,8 +245,8 @@ impl TraverseScoping {
let name = CompactStr::new(&self.find_uid_name(name)); let name = CompactStr::new(&self.find_uid_name(name));
// Add binding to scope // Add binding to scope
let symbol_id = self.symbols.create_symbol(SPAN, name.clone(), flags, scope_id); let symbol_id =
self.symbols.add_declaration(AstNodeId::DUMMY); self.symbols.create_symbol(SPAN, name.clone(), flags, scope_id, AstNodeId::DUMMY);
self.scopes.add_binding(scope_id, name, symbol_id); self.scopes.add_binding(scope_id, name, symbol_id);
symbol_id symbol_id
} }