Skip to content
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
1 change: 1 addition & 0 deletions changes/statement-stack-reads.internal.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- Backend lowering: the statement stack's reads give references to statement handles, and the conditionals place and return handles (`JsStmt::if_head` over the stack).
250 changes: 113 additions & 137 deletions compiler-rust/src/bir/lower/cond.rs

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion compiler-rust/src/bir/lower/exit.rs
Original file line number Diff line number Diff line change
Expand Up @@ -420,7 +420,7 @@ impl<B: super::js_stmt::JsStmt> State<'_, B> {
let order = self.js.int_literal(&mut self.arena, plan.first);
let test = self.js.bin(&mut self.arena, crate::js_ir::BinOp::EqEqEq, exit, order);
let statement = self.if_statement(B::node(test), run, super::cond::EMPTY);
self.statements.push(B::stmt_from_node(statement));
self.statements.push(statement);
return;
}
let keys = crate::bir::KeySpan { start: self.arena.pools.switch_keys.len() as u32, len: plan.len };
Expand Down
2 changes: 1 addition & 1 deletion compiler-rust/src/bir/lower/export.rs
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,7 @@ impl<B: super::js_stmt::JsStmt> State<'_, B> {
work.clear();
let mut nested = std::mem::take(&mut self.scratch);
debug_assert!(nested.is_empty());
for stmt in self.statements.statements(run) {
for stmt in self.statements.statement_refs(run).map(|s| NodeId(self.js.stmt_id(&self.arena, s))) {
// `nested` holds the statements of the blocks still open, last
// first; a zero marks where a block ends.
work.push(stmt);
Expand Down
7 changes: 3 additions & 4 deletions compiler-rust/src/bir/lower/location.rs
Original file line number Diff line number Diff line change
Expand Up @@ -131,12 +131,11 @@ impl<B: super::js_stmt::JsStmt> State<'_, B> {
if self.locations.is_none() {
return;
}
if let Some(first) = self.statements.first(run)
&& !self.js.stmt_located(&self.arena, &B::stmt_from_node(first))
if let Some(slot) = self.statements.first_slot(run)
&& !self.js.stmt_located(&self.arena, self.statements.head(slot))
&& let Some(loc) = self.switch_location(source)
{
let mut first = B::stmt_from_node(first);
self.js.locate_stmt(&mut self.arena, &mut first, loc);
self.js.locate_stmt(&mut self.arena, self.statements.head_mut(slot), loc);
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion compiler-rust/src/bir/lower/loops.rs
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ impl<B: super::js_stmt::JsStmt> State<'_, B> {
let guard = self.if_statement(B::node(negated), yes, no);
let mark = self.statements.mark();
self.push_loop_list(blocks[0].unwrap());
self.statements.push(B::stmt_from_node(guard));
self.statements.push(guard);
self.push_loop_list(blocks[1].unwrap());
let list = self.statements.take_list(&mut self.js, &mut self.arena, self.statements.since(mark));
let condition = self.js.boolean(&mut self.arena, true);
Expand Down
2 changes: 1 addition & 1 deletion compiler-rust/src/bir/lower/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -769,7 +769,7 @@ impl<B: js_stmt::JsStmt> State<'_, B> {
/// for a discarded suffix; O(1) otherwise. No temporary statement vector.
fn append_outputs(&mut self, first: Out, second: Out, value: Option<NodeId>) -> Out {
if first.finished == Finished::True {
for statement in self.statements.statements(second.stmts) { self.arena.release(statement); }
for statement in self.statements.take_run(second.stmts) { self.js.release_stmt(&mut self.arena, statement); }
if let Some(value) = second.value { self.arena.release(value); }
}
self.statements.append(first, second, value)
Expand Down
278 changes: 184 additions & 94 deletions compiler-rust/src/bir/lower/out.rs

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions compiler-rust/src/bir/lower/switch.rs
Original file line number Diff line number Diff line change
Expand Up @@ -879,10 +879,11 @@ impl<B: super::js_stmt::JsStmt> State<'_, B> {
} else {
None
};
if let Some((statement, _)) =
if let Some(slot) =
candidate.and_then(|run| self.single_assignment(run, target))
{
let assignment = self.js.take_value(&mut self.arena, B::stmt_from_node(statement));
let statement = self.statements.take(slot);
let assignment = self.js.take_value(&mut self.arena, statement);
let value = self.js.keep_operand(&mut self.arena, assignment, 1);
self.statements.kill(candidate.unwrap());
let statement = self.js.declare(&mut self.arena, kind, target, Some(value));
Expand Down Expand Up @@ -1102,11 +1103,10 @@ impl<B: super::js_stmt::JsStmt> State<'_, B> {
Cont::Effect(_) => self.if_statement(test, yes, no),
_ => unreachable!("small switch branches assign their result"),
};
let statement = B::stmt_from_node(statement);
if matches!(cx.cont, Cont::Effect(Tail::No)) && self.js.is_empty_block(&self.arena, &statement) {
self.js.release_stmt(&mut self.arena, statement);
} else {
self.place(plan.head, B::stmt_node(statement));
self.place(plan.head, statement);
}
}
self.switch_result(cx, plan)
Expand Down
7 changes: 4 additions & 3 deletions compiler-rust/src/bir/lower/untagged.rs
Original file line number Diff line number Diff line change
Expand Up @@ -789,12 +789,13 @@ impl<B: super::js_stmt::JsStmt> State<'_, B> {
start: out.run.start,
len: 0,
});
let block = if let Some((_, statement)) = only {
let block = if let Some(slot) = only {
let statement = self.statements.take(slot);
self.statements.kill(run);
statement
} else {
let list = self.statements.take_list(&mut self.js, &mut self.arena, run);
B::stmt_node(self.js.explicit_block(&mut self.arena, list))
self.js.explicit_block(&mut self.arena, list)
};
self.place(start.start, block);
self.untagged_storage.outputs.push(
Expand Down Expand Up @@ -841,7 +842,7 @@ impl<B: super::js_stmt::JsStmt> State<'_, B> {
{
!self.statements.last(out.run).is_some_and(|s| {
matches!(
self.js.stmt_kind(&self.arena, &B::stmt_from_node(s)),
self.js.stmt_kind(&self.arena, s),
row::Kind::Return | row::Kind::Throw | row::Kind::Continue | row::Kind::Break
)
})
Expand Down
4 changes: 2 additions & 2 deletions compiler-rust/src/bir/lower/variant.rs
Original file line number Diff line number Diff line change
Expand Up @@ -477,11 +477,11 @@ impl<B: super::js_stmt::JsStmt> State<'_, B> {
}
if plan.mixed {
let test = self.named_literal_test(&mut plan);
let statement = B::stmt_from_node(self.if_statement(test, plan.sides[0].run, plan.sides[1].run));
let statement = self.if_statement(test, plan.sides[0].run, plan.sides[1].run);
if matches!(cx.cont, Cont::Effect(Tail::No)) && self.js.is_empty_block(&self.arena, &statement) {
self.js.release_stmt(&mut self.arena, statement);
} else {
self.place(plan.head, B::stmt_node(statement));
self.place(plan.head, statement);
}
}
if let Some(value) = plan.value {
Expand Down
Loading