ITStudio_OUC/OxideJS-New
0
1
Fork 0
mirror of https://github.com/pjh456/OxideJS.git synced 2026-10-25 03:01:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: 块级函数声明闭包物化提前至块入口，声明点退化为外层 var 写回

Browse Source
This commit is contained in:
彭俊皓
2026-09-15 05:42:08 +00:00
parent 4452f1da69
commit 1b26bc7ed8
3 changed files with 119 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/oxide_emit/src/stmt/declaration/function_decl.rs
+75 -41
View File
@@ -1,5 +1,6 @@
//! 函数声明语句 emit：`emit_function_declaration_statement` 创建闭包并绑定函数名。
use crate::symbol_table::ScopeKind;
use crate::{CompileCtx, Emitter, ParamSpec};
use oxide_bytecode::opcode::OpCode;
use oxide_ir::inst::Inst;
@@ -25,49 +26,19 @@ impl Emitter {
} else {
return Err("FunctionDeclaration without name".into());
};
let mut param_names = Vec::new();
for (idx, param) in fd.params.items.iter().enumerate() {
match &param.pattern {
oxide_parser::BindingPattern::BindingIdentifier(bi) => param_names.push(ParamSpec::Identifier {
name: bi.name.to_string(),
initializer: param.initializer.as_deref(),
}),
pattern => param_names.push(ParamSpec::Pattern {
synthetic_name: format!("@@param_{idx}"),
pattern,
initializer: param.initializer.as_deref(),
}),
}
}
if let Some(rest) = &fd.params.rest {
self.push_rest_param(&rest.rest.argument, &mut param_names)?;
}
let body_stmts: &[Statement] = if let Some(body) = &fd.body { &body.statements } else { &[] };
let own_strict = fd.has_use_strict_directive();
let mut sub_module = if fd.generator && fd.r#async {
self.compile_async_generator_body(&param_names, body_stmts, ctx, own_strict)?
} else if fd.generator {
self.compile_generator_body(&param_names, body_stmts, ctx, own_strict)?
} else if fd.r#async {
self.compile_async_body(&param_names, body_stmts, ctx, false, false, own_strict)?
// 块级函数声明：闭包已在块入口物化写入预声明块槽（块绑定块入口即持有
// 函数对象，声明语句前读命中它），声明点不重编闭包，只处理下方外层
// var 写回。
let binding_scope_kind = ctx
.scopes
.symbols
.lookup_any_binding(&name)
.map(|(_, scope_idx)| ctx.scopes.symbols.scopes[scope_idx].kind);
let var_reg = if binding_scope_kind == Some(ScopeKind::BlockScope) {
ctx.lookup(&name)?
} else {
self.compile_function_body(&param_names, body_stmts, ctx, false, false, own_strict)?
self.materialize_function_declaration(fd, &name, ctx)?
};
sub_module.function_name = Some(name.clone());
ctx.nested.push(sub_module);
let var_reg = ctx.lookup(&name)?;
ctx.reserve_reg(var_reg);
ctx.inst(Inst::create_closure(Operand::Reg(var_reg), ctx.nested.len() as u16));
if let Some(&cell_idx) = ctx.captured_bindings.get(&name) {
ctx.inst(Inst::new(
OpCode::MAKE_CELL,
Operand::Reg(var_reg),
Operand::Imm(cell_idx as u16),
Operand::None,
));
} else {
ctx.inst(Inst::new(OpCode::STORE_VAR, Operand::Reg(var_reg), Operand::Reg(var_reg), Operand::None));
}
// 块内函数声明求值写回外层 var 绑定（sloppy web-compat）：预声明期为该
// 名实例化的外层 var 绑定（函数作用域）在此写入块槽位里的函数对象，
// 求值一次写回一次（循环体内每迭代覆写头绑定）。形参/词法声明同名
@@ -104,4 +75,67 @@ impl Emitter {
}
Ok(None)
}
/// 函数声明物化：建形参 spec、编译体为子模块、创建闭包并把函数对象写入
/// 声明绑定槽（名被捕获时同步建 cell）。顶层声明点与块级块入口初始化共用。
///
/// # 前提
/// - 声明名已有已初始化绑定（顶层为 var 预声明、块为 Let 预声明）；
/// `lookup` 对未声明名失败。
///
/// # 副作用
/// - 子模块登记进嵌套模块表；当前指令流发 CREATE_CLOSURE（及 MAKE_CELL /
/// STORE_VAR）。
///
/// # 注意事项
/// - 闭包的 upvalue/cell 捕获在函数入口的捕获分析期固定，本调用点的时序
/// 只决定 CREATE_CLOSURE 在指令流中的落点。
pub(crate) fn materialize_function_declaration(
&self, fd: &oxide_parser::Function, name: &str, ctx: &mut CompileCtx,
) -> Result<u32, String> {
let mut param_names = Vec::new();
for (idx, param) in fd.params.items.iter().enumerate() {
match &param.pattern {
oxide_parser::BindingPattern::BindingIdentifier(bi) => param_names.push(ParamSpec::Identifier {
name: bi.name.to_string(),
initializer: param.initializer.as_deref(),
}),
pattern => param_names.push(ParamSpec::Pattern {
synthetic_name: format!("@@param_{idx}"),
pattern,
initializer: param.initializer.as_deref(),
}),
}
}
if let Some(rest) = &fd.params.rest {
self.push_rest_param(&rest.rest.argument, &mut param_names)?;
}
let body_stmts: &[Statement] = if let Some(body) = &fd.body { &body.statements } else { &[] };
let own_strict = fd.has_use_strict_directive();
let mut sub_module = if fd.generator && fd.r#async {
self.compile_async_generator_body(&param_names, body_stmts, ctx, own_strict)?
} else if fd.generator {
self.compile_generator_body(&param_names, body_stmts, ctx, own_strict)?
} else if fd.r#async {
self.compile_async_body(&param_names, body_stmts, ctx, false, false, own_strict)?
} else {
self.compile_function_body(&param_names, body_stmts, ctx, false, false, own_strict)?
};
sub_module.function_name = Some(name.to_string());
ctx.nested.push(sub_module);
let var_reg = ctx.lookup(name)?;
ctx.reserve_reg(var_reg);
ctx.inst(Inst::create_closure(Operand::Reg(var_reg), ctx.nested.len() as u16));
if let Some(&cell_idx) = ctx.captured_bindings.get(name) {
ctx.inst(Inst::new(
OpCode::MAKE_CELL,
Operand::Reg(var_reg),
Operand::Imm(cell_idx as u16),
Operand::None,
));
} else {
ctx.inst(Inst::new(OpCode::STORE_VAR, Operand::Reg(var_reg), Operand::Reg(var_reg), Operand::None));
}
Ok(var_reg)
}
}