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
4 changes: 4 additions & 0 deletions crates/perry-codegen/src/codegen/closure.rs
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,11 @@ pub(super) fn compile_closure(
non_escaping_news: native_facts.non_escaping_news().clone(),
non_escaping_new_used_fields: native_facts.non_escaping_new_used_fields().clone(),
non_escaping_arrays: native_facts.non_escaping_arrays().clone(),
non_escaping_array_used_indices: native_facts.non_escaping_array_used_indices().clone(),
non_escaping_object_literals: native_facts.non_escaping_object_literals().clone(),
non_escaping_object_literal_used_fields: native_facts
.non_escaping_object_literal_used_fields()
.clone(),
flat_const_arrays: &cross_module.flat_const_arrays,
array_row_aliases: HashMap::new(),
clamp3_functions: &cross_module.clamp3_functions,
Expand Down
12 changes: 12 additions & 0 deletions crates/perry-codegen/src/codegen/entry.rs
Original file line number Diff line number Diff line change
Expand Up @@ -447,7 +447,13 @@ pub(super) fn compile_module_entry(
non_escaping_news: main_native_facts.non_escaping_news().clone(),
non_escaping_new_used_fields: main_native_facts.non_escaping_new_used_fields().clone(),
non_escaping_arrays: main_native_facts.non_escaping_arrays().clone(),
non_escaping_array_used_indices: main_native_facts
.non_escaping_array_used_indices()
.clone(),
non_escaping_object_literals: main_native_facts.non_escaping_object_literals().clone(),
non_escaping_object_literal_used_fields: main_native_facts
.non_escaping_object_literal_used_fields()
.clone(),
flat_const_arrays: &cross_module.flat_const_arrays,
array_row_aliases: HashMap::new(),
clamp3_functions: &cross_module.clamp3_functions,
Expand Down Expand Up @@ -887,7 +893,13 @@ pub(super) fn compile_module_entry(
non_escaping_news: init_native_facts.non_escaping_news().clone(),
non_escaping_new_used_fields: init_native_facts.non_escaping_new_used_fields().clone(),
non_escaping_arrays: init_native_facts.non_escaping_arrays().clone(),
non_escaping_array_used_indices: init_native_facts
.non_escaping_array_used_indices()
.clone(),
non_escaping_object_literals: init_native_facts.non_escaping_object_literals().clone(),
non_escaping_object_literal_used_fields: init_native_facts
.non_escaping_object_literal_used_fields()
.clone(),
flat_const_arrays: &cross_module.flat_const_arrays,
array_row_aliases: HashMap::new(),
clamp3_functions: &cross_module.clamp3_functions,
Expand Down
4 changes: 4 additions & 0 deletions crates/perry-codegen/src/codegen/function.rs
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,11 @@ pub(super) fn compile_function(
non_escaping_news: native_facts.non_escaping_news().clone(),
non_escaping_new_used_fields: native_facts.non_escaping_new_used_fields().clone(),
non_escaping_arrays: native_facts.non_escaping_arrays().clone(),
non_escaping_array_used_indices: native_facts.non_escaping_array_used_indices().clone(),
non_escaping_object_literals: native_facts.non_escaping_object_literals().clone(),
non_escaping_object_literal_used_fields: native_facts
.non_escaping_object_literal_used_fields()
.clone(),
flat_const_arrays: &cross_module.flat_const_arrays,
array_row_aliases: HashMap::new(),
clamp3_functions: &cross_module.clamp3_functions,
Expand Down
8 changes: 8 additions & 0 deletions crates/perry-codegen/src/codegen/method.rs
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,11 @@ pub(super) fn compile_method(
non_escaping_news: native_facts.non_escaping_news().clone(),
non_escaping_new_used_fields: native_facts.non_escaping_new_used_fields().clone(),
non_escaping_arrays: native_facts.non_escaping_arrays().clone(),
non_escaping_array_used_indices: native_facts.non_escaping_array_used_indices().clone(),
non_escaping_object_literals: native_facts.non_escaping_object_literals().clone(),
non_escaping_object_literal_used_fields: native_facts
.non_escaping_object_literal_used_fields()
.clone(),
flat_const_arrays: &cross_module.flat_const_arrays,
array_row_aliases: HashMap::new(),
clamp3_functions: &cross_module.clamp3_functions,
Expand Down Expand Up @@ -772,7 +776,11 @@ pub(super) fn compile_static_method(
non_escaping_news: native_facts.non_escaping_news().clone(),
non_escaping_new_used_fields: native_facts.non_escaping_new_used_fields().clone(),
non_escaping_arrays: native_facts.non_escaping_arrays().clone(),
non_escaping_array_used_indices: native_facts.non_escaping_array_used_indices().clone(),
non_escaping_object_literals: native_facts.non_escaping_object_literals().clone(),
non_escaping_object_literal_used_fields: native_facts
.non_escaping_object_literal_used_fields()
.clone(),
flat_const_arrays: &cross_module.flat_const_arrays,
array_row_aliases: HashMap::new(),
clamp3_functions: &cross_module.clamp3_functions,
Expand Down
141 changes: 140 additions & 1 deletion crates/perry-codegen/src/collectors/escape_arrays.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use perry_hir::{BinaryOp, Expr, Function, Stmt};
use std::collections::HashSet;
use std::collections::{HashMap, HashSet};

use super::*;

Expand All @@ -22,6 +22,145 @@ pub fn collect_non_escaping_arrays(
candidates
}

pub fn collect_non_escaping_array_used_indices(
stmts: &[perry_hir::Stmt],
non_escaping_arrays: &HashMap<u32, u32>,
) -> HashMap<u32, HashSet<u32>> {
let mut used = HashMap::new();
if non_escaping_arrays.is_empty() {
return used;
}
collect_used_array_indices_in_stmts(stmts, non_escaping_arrays, &mut used);
used
}

fn collect_used_array_indices_in_stmts(
stmts: &[perry_hir::Stmt],
non_escaping_arrays: &HashMap<u32, u32>,
used: &mut HashMap<u32, HashSet<u32>>,
) {
use perry_hir::Stmt;
for stmt in stmts {
match stmt {
Stmt::Let { init, .. } => {
if let Some(expr) = init {
collect_used_array_indices_in_expr(expr, non_escaping_arrays, used);
}
}
Stmt::Expr(expr) | Stmt::Throw(expr) => {
collect_used_array_indices_in_expr(expr, non_escaping_arrays, used);
}
Stmt::Return(expr) => {
if let Some(expr) = expr {
collect_used_array_indices_in_expr(expr, non_escaping_arrays, used);
}
}
Stmt::If {
condition,
then_branch,
else_branch,
} => {
collect_used_array_indices_in_expr(condition, non_escaping_arrays, used);
collect_used_array_indices_in_stmts(then_branch, non_escaping_arrays, used);
if let Some(else_branch) = else_branch {
collect_used_array_indices_in_stmts(else_branch, non_escaping_arrays, used);
}
}
Stmt::While { condition, body } => {
collect_used_array_indices_in_expr(condition, non_escaping_arrays, used);
collect_used_array_indices_in_stmts(body, non_escaping_arrays, used);
}
Stmt::DoWhile { body, condition } => {
collect_used_array_indices_in_stmts(body, non_escaping_arrays, used);
collect_used_array_indices_in_expr(condition, non_escaping_arrays, used);
}
Stmt::For {
init,
condition,
update,
body,
} => {
if let Some(init_stmt) = init {
collect_used_array_indices_in_stmts(
std::slice::from_ref(init_stmt.as_ref()),
non_escaping_arrays,
used,
);
}
if let Some(condition) = condition {
collect_used_array_indices_in_expr(condition, non_escaping_arrays, used);
}
if let Some(update) = update {
collect_used_array_indices_in_expr(update, non_escaping_arrays, used);
}
collect_used_array_indices_in_stmts(body, non_escaping_arrays, used);
}
Stmt::Labeled { body, .. } => {
collect_used_array_indices_in_stmts(
std::slice::from_ref(body.as_ref()),
non_escaping_arrays,
used,
);
}
Stmt::Try {
body,
catch,
finally,
} => {
collect_used_array_indices_in_stmts(body, non_escaping_arrays, used);
if let Some(catch) = catch {
collect_used_array_indices_in_stmts(&catch.body, non_escaping_arrays, used);
}
if let Some(finally) = finally {
collect_used_array_indices_in_stmts(finally, non_escaping_arrays, used);
}
}
Stmt::Switch {
discriminant,
cases,
} => {
collect_used_array_indices_in_expr(discriminant, non_escaping_arrays, used);
for case in cases {
if let Some(test) = &case.test {
collect_used_array_indices_in_expr(test, non_escaping_arrays, used);
}
collect_used_array_indices_in_stmts(&case.body, non_escaping_arrays, used);
}
}
Stmt::Break
| Stmt::Continue
| Stmt::LabeledBreak(_)
| Stmt::LabeledContinue(_)
| Stmt::PreallocateBoxes(_) => {}
}
}
}

fn collect_used_array_indices_in_expr(
expr: &perry_hir::Expr,
non_escaping_arrays: &HashMap<u32, u32>,
used: &mut HashMap<u32, HashSet<u32>>,
) {
use perry_hir::Expr;
if let Expr::IndexGet { object, index } = expr {
if let Expr::LocalGet(id) = object.as_ref() {
if let Some(&len) = non_escaping_arrays.get(id) {
if let Some(k) = const_index(index) {
if k < len {
used.entry(*id).or_default().insert(k);
}
}
}
}
}
if let Expr::Closure { body, .. } = expr {
collect_used_array_indices_in_stmts(body, non_escaping_arrays, used);
}
perry_hir::walker::walk_expr_children(expr, &mut |child| {
collect_used_array_indices_in_expr(child, non_escaping_arrays, used);
});
}

pub fn find_array_candidates(
stmts: &[perry_hir::Stmt],
boxed_vars: &HashSet<u32>,
Expand Down
Loading
Loading