liquidex/rkgk
liquidex/rkgk
1
Fork 0
Code Issues 66 Pull requests Projects 1 Wiki Activity

fix an unnecessarily large amount of locals being emitted for each function

Browse source 
previously we'd create (argument_count + let_count) locals, which doesn't make sense.
so now `let`s use their own counter for their own locals, and we only request as many empty locals as there are `let`s.
This commit is contained in:
liquidex 2024-09-02 21:42:15 +02:00
parent 39989e555a
commit c1ccc1be24
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
crates/haku/src/compiler.rs
View file

@ -34,6 +34,7 @@ enum Variable {
struct Scope<'a> { struct Scope<'a> {
locals: Vec<Local<'a>>, locals: Vec<Local<'a>>,
captures: Vec<Variable>, captures: Vec<Variable>,
let_count: usize,
} }
pub struct Compiler<'a> { pub struct Compiler<'a> {
@ -57,6 +58,7 @@ impl<'a> Compiler<'a> {
scopes: Vec::from_iter([Scope { scopes: Vec::from_iter([Scope {
locals: Vec::new(), locals: Vec::new(),
captures: Vec::new(), captures: Vec::new(),
let_count: 0,
}]), }]),
} }
} }
@ -472,6 +474,7 @@ fn compile_let<'a>(c: &mut Compiler<'a>, src: &Source<'a>, node_id: NodeId) -> C
} else { } else {
let index = scope.locals.len(); let index = scope.locals.len();
scope.locals.push(Local { name }); scope.locals.push(Local { name });
scope.let_count += 1;
index as u8 index as u8
}; };
c.chunk.emit_opcode(Opcode::SetLocal)?; c.chunk.emit_opcode(Opcode::SetLocal)?;
@ -514,6 +517,7 @@ fn compile_lambda<'a>(c: &mut Compiler<'a>, src: &Source<'a>, node_id: NodeId) -
c.scopes.push(Scope { c.scopes.push(Scope {
locals, locals,
captures: Vec::new(), captures: Vec::new(),
let_count: 0,
}); });
compile_expr(c, src, body)?; compile_expr(c, src, body)?;
c.chunk.emit_opcode(Opcode::Return)?; c.chunk.emit_opcode(Opcode::Return)?;
@ -522,7 +526,7 @@ fn compile_lambda<'a>(c: &mut Compiler<'a>, src: &Source<'a>, node_id: NodeId) -
c.chunk.patch_u16(after_offset, after); c.chunk.patch_u16(after_offset, after);
let scope = c.scopes.pop().unwrap(); let scope = c.scopes.pop().unwrap();
let local_count = u8::try_from(scope.locals.len()).unwrap_or_else(|_| { let let_count = u8::try_from(scope.let_count).unwrap_or_else(|_| {
c.emit(Diagnostic::error( c.emit(Diagnostic::error(
src.ast.span(body), src.ast.span(body),
"function contains too many local variables", "function contains too many local variables",
@ -536,7 +540,7 @@ fn compile_lambda<'a>(c: &mut Compiler<'a>, src: &Source<'a>, node_id: NodeId) -
)); ));
0 0
}); });
c.chunk.emit_u8(local_count)?; c.chunk.emit_u8(let_count)?;
c.chunk.emit_u8(capture_count)?; c.chunk.emit_u8(capture_count)?;
for capture in scope.captures { for capture in scope.captures {
match capture { match capture {