Unverified Commit b6cf70eb authored by Niklas Mischkulnig's avatar Niklas Mischkulnig Committed by GitHub

Turbopack: refactor ESM codegen generation (#92777)

Move more logic out of the `ModuleReferencesVisitor`, so that we can remove it at some point.
parent 7f3cfffe
...@@ -72,6 +72,7 @@ pub fn benchmark(c: &mut Criterion) { ...@@ -72,6 +72,7 @@ pub fn benchmark(c: &mut Criterion) {
&program, &program,
&eval_context, &eval_context,
AnalyzeMode::CodeGenerationAndTracing, AnalyzeMode::CodeGenerationAndTracing,
true,
); );
let input = BenchInput { let input = BenchInput {
...@@ -103,6 +104,7 @@ fn bench_create_graph(b: &mut Bencher, input: &BenchInput) { ...@@ -103,6 +104,7 @@ fn bench_create_graph(b: &mut Bencher, input: &BenchInput) {
&input.program, &input.program,
&input.eval_context, &input.eval_context,
AnalyzeMode::CodeGenerationAndTracing, AnalyzeMode::CodeGenerationAndTracing,
true,
) )
}); });
} }
......
...@@ -31,7 +31,10 @@ use super::{ ...@@ -31,7 +31,10 @@ use super::{
use crate::{ use crate::{
AnalyzeMode, SpecifiedModuleType, AnalyzeMode, SpecifiedModuleType,
analyzer::{WellKnownObjectKind, is_unresolved}, analyzer::{WellKnownObjectKind, is_unresolved},
references::{constant_value::parse_single_expr_lit, for_each_ident_in_pat}, code_gen::CodeGen,
references::{
constant_value::parse_single_expr_lit, esm::EsmModuleItem, for_each_ident_in_pat,
},
utils::{AstPathRange, unparen}, utils::{AstPathRange, unparen},
}; };
...@@ -364,6 +367,8 @@ pub struct VarGraph { ...@@ -364,6 +367,8 @@ pub struct VarGraph {
pub free_var_ids: FxHashMap<Atom, Id>, pub free_var_ids: FxHashMap<Atom, Id>,
pub effects: Vec<Effect>, pub effects: Vec<Effect>,
// Some unconditional codegens, usually for ESM items.
pub code_gens: Vec<CodeGen>,
// ident -> immediate usage (top level decl) // ident -> immediate usage (top level decl)
pub decl_usages: FxHashMap<Id, DeclUsage>, pub decl_usages: FxHashMap<Id, DeclUsage>,
...@@ -388,11 +393,13 @@ pub fn create_graph( ...@@ -388,11 +393,13 @@ pub fn create_graph(
m: &Program, m: &Program,
eval_context: &EvalContext, eval_context: &EvalContext,
analyze_mode: AnalyzeMode, analyze_mode: AnalyzeMode,
supports_block_scoping: bool,
) -> VarGraph { ) -> VarGraph {
let mut graph = VarGraph { let mut graph = VarGraph {
values: Default::default(), values: Default::default(),
free_var_ids: Default::default(), free_var_ids: Default::default(),
effects: Default::default(), effects: Default::default(),
code_gens: Default::default(),
decl_usages: Default::default(), decl_usages: Default::default(),
import_usages: Default::default(), import_usages: Default::default(),
exports: Default::default(), exports: Default::default(),
...@@ -406,6 +413,8 @@ pub fn create_graph( ...@@ -406,6 +413,8 @@ pub fn create_graph(
state: Default::default(), state: Default::default(),
effects: Default::default(), effects: Default::default(),
hoisted_effects: Default::default(), hoisted_effects: Default::default(),
code_gens: Default::default(),
supports_block_scoping,
}, },
&mut Default::default(), &mut Default::default(),
); );
...@@ -941,6 +950,13 @@ struct Analyzer<'a> { ...@@ -941,6 +950,13 @@ struct Analyzer<'a> {
/// collect effects from the declaring context. /// collect effects from the declaring context.
hoisted_effects: Vec<Effect>, hoisted_effects: Vec<Effect>,
// Some unconditional codegens, usually for ESM items.
code_gens: Vec<CodeGen>,
/// Whether we may codegen `let` and `const` or if we should fallback to var (at the cost of
/// slightly less correct circular import errors) for EsmModuleItem
supports_block_scoping: bool,
eval_context: &'a EvalContext, eval_context: &'a EvalContext,
} }
...@@ -1937,9 +1953,30 @@ impl Analyzer<'_> { ...@@ -1937,9 +1953,30 @@ impl Analyzer<'_> {
span: member_expr.span(), span: member_expr.span(),
}); });
} }
fn add_esm_module_item(&mut self, ast_path: &AstNodePath<AstParentNodeRef<'_>>) {
if self.analyze_mode.is_code_gen() {
self.code_gens.push(
EsmModuleItem::new(as_parent_path(ast_path).into(), self.supports_block_scoping)
.into(),
);
}
}
} }
impl VisitAstPath for Analyzer<'_> { impl VisitAstPath for Analyzer<'_> {
fn visit_import_decl<'ast: 'r, 'r>(
&mut self,
import: &'ast ImportDecl,
ast_path: &mut AstNodePath<AstParentNodeRef<'r>>,
) {
import.visit_children_with_ast_path(self, ast_path);
if import.type_only {
return;
}
self.add_esm_module_item(ast_path);
}
fn visit_import_specifier<'ast: 'r, 'r>( fn visit_import_specifier<'ast: 'r, 'r>(
&mut self, &mut self,
_import_specifier: &'ast ImportSpecifier, _import_specifier: &'ast ImportSpecifier,
...@@ -2727,6 +2764,7 @@ impl VisitAstPath for Analyzer<'_> { ...@@ -2727,6 +2764,7 @@ impl VisitAstPath for Analyzer<'_> {
}); });
self.effects.append(&mut self.hoisted_effects); self.effects.append(&mut self.hoisted_effects);
self.data.effects = take(&mut self.effects); self.data.effects = take(&mut self.effects);
self.data.code_gens = take(&mut self.code_gens);
} }
fn visit_cond_expr<'ast: 'r, 'r>( fn visit_cond_expr<'ast: 'r, 'r>(
...@@ -2981,6 +3019,18 @@ impl VisitAstPath for Analyzer<'_> { ...@@ -2981,6 +3019,18 @@ impl VisitAstPath for Analyzer<'_> {
self.effects = prev_effects; self.effects = prev_effects;
} }
fn visit_export_all<'ast: 'r, 'r>(
&mut self,
export: &'ast ExportAll,
ast_path: &mut AstNodePath<AstParentNodeRef<'r>>,
) {
if export.type_only {
return;
}
self.add_esm_module_item(ast_path);
export.visit_children_with_ast_path(self, ast_path);
}
fn visit_export_decl<'ast: 'r, 'r>( fn visit_export_decl<'ast: 'r, 'r>(
&mut self, &mut self,
node: &'ast ExportDecl, node: &'ast ExportDecl,
...@@ -3004,8 +3054,15 @@ impl VisitAstPath for Analyzer<'_> { ...@@ -3004,8 +3054,15 @@ impl VisitAstPath for Analyzer<'_> {
}); });
} }
} }
_ => {} Decl::Using(_) => {
// See https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/export#:~:text=You%20cannot%20use%20export%20on%20a%20using%20or%20await%20using%20declaration
unreachable!("using declarations can not be exported");
}
Decl::TsInterface(_) | Decl::TsTypeAlias(_) | Decl::TsEnum(_) | Decl::TsModule(_) => {
// ignore typescript for code generation
}
}; };
self.add_esm_module_item(ast_path);
node.visit_children_with_ast_path(self, ast_path); node.visit_children_with_ast_path(self, ast_path);
} }
...@@ -3014,6 +3071,9 @@ impl VisitAstPath for Analyzer<'_> { ...@@ -3014,6 +3071,9 @@ impl VisitAstPath for Analyzer<'_> {
node: &'ast ExportNamedSpecifier, node: &'ast ExportNamedSpecifier,
ast_path: &mut swc_core::ecma::visit::AstNodePath<'r>, ast_path: &mut swc_core::ecma::visit::AstNodePath<'r>,
) { ) {
if node.is_type_only {
return;
}
let export_name = node let export_name = node
.exported .exported
.as_ref() .as_ref()
...@@ -3029,6 +3089,36 @@ impl VisitAstPath for Analyzer<'_> { ...@@ -3029,6 +3089,36 @@ impl VisitAstPath for Analyzer<'_> {
); );
node.visit_children_with_ast_path(self, ast_path); node.visit_children_with_ast_path(self, ast_path);
} }
fn visit_export_default_expr<'ast: 'r, 'r>(
&mut self,
export: &'ast ExportDefaultExpr,
ast_path: &mut AstNodePath<AstParentNodeRef<'r>>,
) {
self.add_esm_module_item(ast_path);
export.visit_children_with_ast_path(self, ast_path);
}
fn visit_export_default_decl<'ast: 'r, 'r>(
&mut self,
export: &'ast ExportDefaultDecl,
ast_path: &mut AstNodePath<AstParentNodeRef<'r>>,
) {
self.add_esm_module_item(ast_path);
export.visit_children_with_ast_path(self, ast_path);
}
fn visit_named_export<'ast: 'r, 'r>(
&mut self,
export: &'ast NamedExport,
ast_path: &mut AstNodePath<AstParentNodeRef<'r>>,
) {
if export.type_only {
return;
}
self.add_esm_module_item(ast_path);
export.visit_children_with_ast_path(self, ast_path);
}
} }
impl Analyzer<'_> { impl Analyzer<'_> {
......
...@@ -3801,8 +3801,12 @@ mod tests { ...@@ -3801,8 +3801,12 @@ mod tests {
None, None,
); );
let mut var_graph = let mut var_graph = create_graph(
create_graph(&m, &eval_context, AnalyzeMode::CodeGenerationAndTracing); &m,
&eval_context,
AnalyzeMode::CodeGenerationAndTracing,
true,
);
let var_cache = Default::default(); let var_cache = Default::default();
let mut named_values = var_graph let mut named_values = var_graph
......
...@@ -130,9 +130,9 @@ use crate::{ ...@@ -130,9 +130,9 @@ use crate::{
}, },
dynamic_expression::DynamicExpression, dynamic_expression::DynamicExpression,
esm::{ esm::{
EsmAssetReference, EsmAsyncAssetReference, EsmBinding, EsmExports, EsmModuleItem, EsmAssetReference, EsmAsyncAssetReference, EsmBinding, EsmExports, ImportMetaBinding,
ImportMetaBinding, ImportMetaRef, UrlAssetReference, UrlRewriteBehavior, ImportMetaRef, UrlAssetReference, UrlRewriteBehavior, base::EsmAssetReferences,
base::EsmAssetReferences, export::EsmExport, module_id::EsmModuleIdAssetReference, export::EsmExport, module_id::EsmModuleIdAssetReference,
}, },
exports_info::{ExportsInfoBinding, ExportsInfoRef}, exports_info::{ExportsInfoBinding, ExportsInfoRef},
hot_module::{ModuleHotReferenceAssetReference, ModuleHotReferenceCodeGen}, hot_module::{ModuleHotReferenceAssetReference, ModuleHotReferenceCodeGen},
...@@ -750,10 +750,16 @@ async fn analyze_ecmascript_module_internal( ...@@ -750,10 +750,16 @@ async fn analyze_ecmascript_module_internal(
let (emitter, collector) = IssueEmitter::new(source, source_map.clone(), None); let (emitter, collector) = IssueEmitter::new(source, source_map.clone(), None);
let handler = Handler::with_emitter(true, false, Box::new(emitter)); let handler = Handler::with_emitter(true, false, Box::new(emitter));
let supports_block_scoping = *compile_time_info
.environment()
.runtime_versions()
.supports_block_scoping()
.await?;
let mut var_graph = { let mut var_graph = {
let _span = tracing::trace_span!("analyze variable values").entered(); let _span = tracing::trace_span!("analyze variable values").entered();
set_handler_and_globals(&handler, globals, || { set_handler_and_globals(&handler, globals, || {
create_graph(program, eval_context, analyze_mode) create_graph(program, eval_context, analyze_mode, supports_block_scoping)
}) })
}; };
...@@ -861,21 +867,13 @@ async fn analyze_ecmascript_module_internal( ...@@ -861,21 +867,13 @@ async fn analyze_ecmascript_module_internal(
let span = tracing::trace_span!("exports"); let span = tracing::trace_span!("exports");
async { async {
let supports_block_scoping = *compile_time_info
.environment()
.runtime_versions()
.supports_block_scoping()
.await?;
let mut esm_exports = set_handler_and_globals(&handler, globals, || { let mut esm_exports = set_handler_and_globals(&handler, globals, || {
// TODO migrate to effects // TODO migrate to effects
let mut visitor = ModuleReferencesVisitor::new( let mut visitor = ModuleReferencesVisitor::new(
eval_context, eval_context,
&import_references, &import_references,
&mut analysis, &mut analysis,
analyze_mode,
&var_graph, &var_graph,
supports_block_scoping,
); );
// ModuleReferencesVisitor has already called analysis.add_esm_reexport_reference // ModuleReferencesVisitor has already called analysis.add_esm_reexport_reference
// for any references in esm_exports // for any references in esm_exports
...@@ -1019,6 +1017,7 @@ async fn analyze_ecmascript_module_internal( ...@@ -1019,6 +1017,7 @@ async fn analyze_ecmascript_module_internal(
let span = tracing::trace_span!("effects processing"); let span = tracing::trace_span!("effects processing");
async { async {
analysis.code_gens.extend(take(&mut var_graph.code_gens));
let effects = take(&mut var_graph.effects); let effects = take(&mut var_graph.effects);
let compile_time_info_ref = compile_time_info.await?; let compile_time_info_ref = compile_time_info.await?;
...@@ -3854,14 +3853,12 @@ async fn require_context_visitor( ...@@ -3854,14 +3853,12 @@ async fn require_context_visitor(
/// A visitor that walks the AST and collects information about the various /// A visitor that walks the AST and collects information about the various
/// references a module makes to other parts of the code. /// references a module makes to other parts of the code.
struct ModuleReferencesVisitor<'a> { struct ModuleReferencesVisitor<'a> {
analyze_mode: AnalyzeMode,
eval_context: &'a EvalContext, eval_context: &'a EvalContext,
imports: FxHashMap<String, (String, Vec<String>)>, imports: FxHashMap<String, (String, Vec<String>)>,
import_references: &'a [ResolvedVc<EsmAssetReference>], import_references: &'a [ResolvedVc<EsmAssetReference>],
analysis: &'a mut AnalyzeEcmascriptModuleResultBuilder, analysis: &'a mut AnalyzeEcmascriptModuleResultBuilder,
esm_exports: Vec<(RcStr, EsmExport)>, esm_exports: Vec<(RcStr, EsmExport)>,
var_graph: &'a VarGraph, var_graph: &'a VarGraph,
supports_block_scoping: bool,
} }
impl<'a> ModuleReferencesVisitor<'a> { impl<'a> ModuleReferencesVisitor<'a> {
...@@ -3869,24 +3866,18 @@ impl<'a> ModuleReferencesVisitor<'a> { ...@@ -3869,24 +3866,18 @@ impl<'a> ModuleReferencesVisitor<'a> {
eval_context: &'a EvalContext, eval_context: &'a EvalContext,
import_references: &'a [ResolvedVc<EsmAssetReference>], import_references: &'a [ResolvedVc<EsmAssetReference>],
analysis: &'a mut AnalyzeEcmascriptModuleResultBuilder, analysis: &'a mut AnalyzeEcmascriptModuleResultBuilder,
analyze_mode: AnalyzeMode,
var_graph: &'a VarGraph, var_graph: &'a VarGraph,
supports_block_scoping: bool,
) -> Self { ) -> Self {
Self { Self {
analyze_mode,
eval_context, eval_context,
imports: FxHashMap::default(), imports: FxHashMap::default(),
import_references, import_references,
analysis, analysis,
esm_exports: Vec::new(), esm_exports: Vec::new(),
var_graph, var_graph,
supports_block_scoping,
} }
} }
}
impl<'a> ModuleReferencesVisitor<'a> {
/// Returns the liveness of a given export identifier. An export is live if it might /// Returns the liveness of a given export identifier. An export is live if it might
/// change values after module evaluation. /// change values after module evaluation.
fn get_export_ident_liveness(&self, id: Id) -> Liveness { fn get_export_ident_liveness(&self, id: Id) -> Liveness {
...@@ -3911,10 +3902,6 @@ impl<'a> ModuleReferencesVisitor<'a> { ...@@ -3911,10 +3902,6 @@ impl<'a> ModuleReferencesVisitor<'a> {
} }
} }
fn as_parent_path(ast_path: &AstNodePath<AstParentNodeRef<'_>>) -> Vec<AstParentKind> {
ast_path.iter().map(|n| n.kind()).collect()
}
pub(crate) fn for_each_ident_in_pat(pat: &Pat, f: &mut impl FnMut(&Atom, SyntaxContext)) { pub(crate) fn for_each_ident_in_pat(pat: &Pat, f: &mut impl FnMut(&Atom, SyntaxContext)) {
match pat { match pat {
Pat::Ident(BindingIdent { id, .. }) => { Pat::Ident(BindingIdent { id, .. }) => {
...@@ -3951,25 +3938,14 @@ pub(crate) fn for_each_ident_in_pat(pat: &Pat, f: &mut impl FnMut(&Atom, SyntaxC ...@@ -3951,25 +3938,14 @@ pub(crate) fn for_each_ident_in_pat(pat: &Pat, f: &mut impl FnMut(&Atom, SyntaxC
} }
impl VisitAstPath for ModuleReferencesVisitor<'_> { impl VisitAstPath for ModuleReferencesVisitor<'_> {
fn visit_export_all<'ast: 'r, 'r>(
&mut self,
export: &'ast ExportAll,
ast_path: &mut AstNodePath<AstParentNodeRef<'r>>,
) {
if self.analyze_mode.is_code_gen() {
self.analysis.add_code_gen(EsmModuleItem::new(
as_parent_path(ast_path).into(),
self.supports_block_scoping,
));
}
export.visit_children_with_ast_path(self, ast_path);
}
fn visit_named_export<'ast: 'r, 'r>( fn visit_named_export<'ast: 'r, 'r>(
&mut self, &mut self,
export: &'ast NamedExport, export: &'ast NamedExport,
ast_path: &mut AstNodePath<AstParentNodeRef<'r>>, ast_path: &mut AstNodePath<AstParentNodeRef<'r>>,
) { ) {
if export.type_only {
return;
}
// We create mutable exports for fake ESMs generated by module splitting // We create mutable exports for fake ESMs generated by module splitting
let is_fake_esm = export let is_fake_esm = export
.with .with
...@@ -4041,13 +4017,6 @@ impl VisitAstPath for ModuleReferencesVisitor<'_> { ...@@ -4041,13 +4017,6 @@ impl VisitAstPath for ModuleReferencesVisitor<'_> {
} }
} }
} }
if self.analyze_mode.is_code_gen() {
self.analysis.add_code_gen(EsmModuleItem::new(
as_parent_path(ast_path).into(),
self.supports_block_scoping,
));
}
export.visit_children_with_ast_path(self, ast_path); export.visit_children_with_ast_path(self, ast_path);
} }
...@@ -4088,12 +4057,6 @@ impl VisitAstPath for ModuleReferencesVisitor<'_> { ...@@ -4088,12 +4057,6 @@ impl VisitAstPath for ModuleReferencesVisitor<'_> {
} }
} }
}; };
if self.analyze_mode.is_code_gen() {
self.analysis.add_code_gen(EsmModuleItem::new(
as_parent_path(ast_path).into(),
self.supports_block_scoping,
));
}
export.visit_children_with_ast_path(self, ast_path); export.visit_children_with_ast_path(self, ast_path);
} }
...@@ -4110,12 +4073,6 @@ impl VisitAstPath for ModuleReferencesVisitor<'_> { ...@@ -4110,12 +4073,6 @@ impl VisitAstPath for ModuleReferencesVisitor<'_> {
Liveness::Constant, Liveness::Constant,
), ),
)); ));
if self.analyze_mode.is_code_gen() {
self.analysis.add_code_gen(EsmModuleItem::new(
as_parent_path(ast_path).into(),
self.supports_block_scoping,
));
}
export.visit_children_with_ast_path(self, ast_path); export.visit_children_with_ast_path(self, ast_path);
} }
...@@ -4143,12 +4100,6 @@ impl VisitAstPath for ModuleReferencesVisitor<'_> { ...@@ -4143,12 +4100,6 @@ impl VisitAstPath for ModuleReferencesVisitor<'_> {
// ignore // ignore
} }
} }
if self.analyze_mode.is_code_gen() {
self.analysis.add_code_gen(EsmModuleItem::new(
as_parent_path(ast_path).into(),
self.supports_block_scoping,
));
}
export.visit_children_with_ast_path(self, ast_path); export.visit_children_with_ast_path(self, ast_path);
} }
...@@ -4157,7 +4108,6 @@ impl VisitAstPath for ModuleReferencesVisitor<'_> { ...@@ -4157,7 +4108,6 @@ impl VisitAstPath for ModuleReferencesVisitor<'_> {
import: &'ast ImportDecl, import: &'ast ImportDecl,
ast_path: &mut AstNodePath<AstParentNodeRef<'r>>, ast_path: &mut AstNodePath<AstParentNodeRef<'r>>,
) { ) {
let path = as_parent_path(ast_path).into();
let src = import.src.value.to_string_lossy().into_owned(); let src = import.src.value.to_string_lossy().into_owned();
import.visit_children_with_ast_path(self, ast_path); import.visit_children_with_ast_path(self, ast_path);
if import.type_only { if import.type_only {
...@@ -4194,26 +4144,6 @@ impl VisitAstPath for ModuleReferencesVisitor<'_> { ...@@ -4194,26 +4144,6 @@ impl VisitAstPath for ModuleReferencesVisitor<'_> {
} }
} }
} }
if self.analyze_mode.is_code_gen() {
self.analysis
.add_code_gen(EsmModuleItem::new(path, self.supports_block_scoping));
}
}
fn visit_var_declarator<'ast: 'r, 'r>(
&mut self,
decl: &'ast VarDeclarator,
ast_path: &mut AstNodePath<AstParentNodeRef<'r>>,
) {
decl.visit_children_with_ast_path(self, ast_path);
}
fn visit_call_expr<'ast: 'r, 'r>(
&mut self,
call: &'ast CallExpr,
ast_path: &mut AstNodePath<AstParentNodeRef<'r>>,
) {
call.visit_children_with_ast_path(self, ast_path);
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment