Skip to content

fix: handle unconditional break in SSA gen in all cases #8849

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
asterite wants to merge 2 commits into from
Closed

fix: handle unconditional break in SSA gen in all cases #8849

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f208fa6
fix: handle unconditional break in SSA gen in all cases
asterite Jun 9, 2025
39bdeb9
Handle codegen_expression in a couple more places
asterite Jun 9, 2025
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
22 changes: 0 additions & 22 deletions compiler/noirc_evaluator/src/ssa/function_builder/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ pub mod data_bus;
use std::{borrow::Cow, collections::BTreeMap, sync::Arc};

use acvm::{FieldElement, acir::circuit::ErrorSelector};
use fxhash::FxHashSet as HashSet;
use noirc_errors::{
Location,
call_stack::{CallStack, CallStackId},
Expand Down Expand Up @@ -42,8 +41,6 @@ use super::{
pub struct FunctionBuilder {
pub current_function: Function,
current_block: BasicBlockId,
current_block_closed: bool,
closed_blocked: HashSet<(FunctionId, BasicBlockId)>,
finished_functions: Vec<Function>,
call_stack: CallStackId,
error_types: BTreeMap<ErrorSelector, HirType>,
Expand All @@ -65,8 +62,6 @@ impl FunctionBuilder {
let new_function = Function::new(function_name, function_id);
Self {
current_block: new_function.entry_block(),
current_block_closed: false,
closed_blocked: HashSet::default(),
current_function: new_function,
finished_functions: Vec::new(),
call_stack: CallStackId::root(),
Expand Down Expand Up @@ -207,17 +202,6 @@ impl FunctionBuilder {
self.current_function.dfg.make_block()
}

/// Prevents any further instructions from being added to the current block.
/// That is, calls to add instructions can be called, but they will have no effect.
pub fn close_block(&mut self) {
self.closed_blocked.insert((self.current_function.id(), self.current_block));
self.current_block_closed = true;
}

pub fn current_block_is_closed(&self) -> bool {
self.current_block_closed
}

/// Adds a parameter with the given type to the given block.
/// Returns the newly-added parameter.
pub fn add_block_parameter(&mut self, block: BasicBlockId, typ: Type) -> ValueId {
Expand All @@ -235,10 +219,6 @@ impl FunctionBuilder {
instruction: Instruction,
ctrl_typevars: Option<Vec<Type>>,
) -> InsertInstructionResult {
if self.current_block_closed {
return InsertInstructionResult::InstructionRemoved;
}

let block = self.current_block();

if self.simplify {
Expand All @@ -263,8 +243,6 @@ impl FunctionBuilder {
/// instructions into a new function, call new_function instead.
pub fn switch_to_block(&mut self, block: BasicBlockId) {
self.current_block = block;
self.current_block_closed =
self.closed_blocked.contains(&(self.current_function.id(), block));
}

/// Returns the block currently being inserted into
Expand Down
68 changes: 46 additions & 22 deletions compiler/noirc_evaluator/src/ssa/ssa_gen/context.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -876,25 +876,34 @@ impl<'a> FunctionContext<'a> {
pub(super) fn extract_current_value(
&mut self,
lvalue: &ast::LValue,
) -> Result<LValue, RuntimeError> {
Ok(match lvalue {
) -> Result<Option<LValue>, RuntimeError> {
Ok(Some(match lvalue {
ast::LValue::Ident(ident) => {
let (reference, should_auto_deref) = self.ident_lvalue(ident);
if should_auto_deref { LValue::Dereference { reference } } else { LValue::Ident }
}
ast::LValue::Index { array, index, location, .. } => {
self.index_lvalue(array, index, location)?.2
let Some(result) = self.index_lvalue(array, index, location)? else {
return Ok(None);
};
result.2
}
ast::LValue::MemberAccess { object, field_index } => {
let (old_object, object_lvalue) = self.extract_current_value_recursive(object)?;
let Some((old_object, object_lvalue)) =
self.extract_current_value_recursive(object)?
else {
return Ok(None);
};
let object_lvalue = Box::new(object_lvalue);
LValue::MemberAccess { old_object, object_lvalue, index: *field_index }
}
ast::LValue::Dereference { reference, .. } => {
let (reference, _) = self.extract_current_value_recursive(reference)?;
let Some((reference, _)) = self.extract_current_value_recursive(reference)? else {
return Ok(None);
};
LValue::Dereference { reference }
}
})
}))
}

fn dereference_lvalue(&mut self, values: &Values, element_type: &ast::Type) -> Values {
Expand All @@ -919,21 +928,24 @@ impl<'a> FunctionContext<'a> {
/// structure of the lvalue expression for use by `assign_new_value`.
/// The optional length is for indexing slices rather than arrays since slices
/// are represented as a tuple in the form: (length, slice contents).
#[allow(clippy::type_complexity)]
fn index_lvalue(
&mut self,
array: &ast::LValue,
index: &ast::Expression,
location: &Location,
) -> Result<(ValueId, ValueId, LValue, Option<ValueId>), RuntimeError> {
let (old_array, array_lvalue) = self.extract_current_value_recursive(array)?;
let index = self.codegen_non_tuple_expression(index)?;
) -> Result<Option<(ValueId, ValueId, LValue, Option<ValueId>)>, RuntimeError> {
let Some((old_array, array_lvalue)) = self.extract_current_value_recursive(array)? else {
return Ok(None);
};
let Some(index) = self.codegen_non_tuple_expression(index)? else { return Ok(None) };
let array_lvalue = Box::new(array_lvalue);
let array_values = old_array.clone().into_value_list(self);

let location = *location;
// A slice is represented as a tuple (length, slice contents).
// We need to fetch the second value.
Ok(if array_values.len() > 1 {
Ok(Some(if array_values.len() > 1 {
let slice_lvalue = LValue::SliceIndex {
old_slice: old_array,
index,
Expand All @@ -945,45 +957,57 @@ impl<'a> FunctionContext<'a> {
let array_lvalue =
LValue::Index { old_array: array_values[0], index, array_lvalue, location };
(array_values[0], index, array_lvalue, None)
})
}))
}

fn extract_current_value_recursive(
&mut self,
lvalue: &ast::LValue,
) -> Result<(Values, LValue), RuntimeError> {
) -> Result<Option<(Values, LValue)>, RuntimeError> {
match lvalue {
ast::LValue::Ident(ident) => {
let (variable, should_auto_deref) = self.ident_lvalue(ident);
if should_auto_deref {
let dereferenced = self.dereference_lvalue(&variable, &ident.typ);
Ok((dereferenced, LValue::Dereference { reference: variable }))
Ok(Some((dereferenced, LValue::Dereference { reference: variable })))
} else {
Ok((variable.clone(), LValue::Ident))
Ok(Some((variable.clone(), LValue::Ident)))
}
}
ast::LValue::Index { array, index, element_type, location } => {
let (old_array, index, index_lvalue, max_length) =
self.index_lvalue(array, index, location)?;
let Some((old_array, index, index_lvalue, max_length)) =
self.index_lvalue(array, index, location)?
else {
return Ok(None);
};
let element = self.codegen_array_index(
old_array,
index,
element_type,
*location,
max_length,
)?;
Ok((element, index_lvalue))
Ok(Some((element, index_lvalue)))
}
ast::LValue::MemberAccess { object, field_index: index } => {
let (old_object, object_lvalue) = self.extract_current_value_recursive(object)?;
let Some((old_object, object_lvalue)) =
self.extract_current_value_recursive(object)?
else {
return Ok(None);
};
let object_lvalue = Box::new(object_lvalue);
let element = Self::get_field_ref(&old_object, *index).clone();
Ok((element, LValue::MemberAccess { old_object, object_lvalue, index: *index }))
Ok(Some((
element,
LValue::MemberAccess { old_object, object_lvalue, index: *index },
)))
}
ast::LValue::Dereference { reference, element_type } => {
let (reference, _) = self.extract_current_value_recursive(reference)?;
let Some((reference, _)) = self.extract_current_value_recursive(reference)? else {
return Ok(None);
};
let dereferenced = self.dereference_lvalue(&reference, element_type);
Ok((dereferenced, LValue::Dereference { reference }))
Ok(Some((dereferenced, LValue::Dereference { reference })))
}
}
}
Expand Down Expand Up @@ -1175,7 +1199,7 @@ impl SharedContext {
);
let mut globals = BTreeMap::default();
for (id, (_, _, global)) in program.globals.iter() {
let values = context.codegen_expression(global).unwrap();
let values = context.codegen_expression(global).unwrap().unwrap();
globals.insert(*id, values);
}

Expand Down
Loading
Loading