Skip to content

chore(ACIR): extract convert_constrain_error helper #10050

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

Merged
vezenovm merged 3 commits into from
Oct 1, 2025
Merged

chore(ACIR): extract convert_constrain_error helper #10050

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2c36570
chore(ACIR): extract `convert_constrain_error` helper
asterite Oct 1, 2025
296a2f7
Extract predicate variable
asterite Oct 1, 2025
64d7016
Simpler `convert_constrain_error`
asterite Oct 1, 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
115 changes: 37 additions & 78 deletions compiler/noirc_evaluator/src/acir/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -425,89 +425,15 @@ impl<'a> Context<'a> {
Instruction::Constrain(lhs, rhs, assert_message) => {
let lhs = self.convert_numeric_value(*lhs, dfg)?;
let rhs = self.convert_numeric_value(*rhs, dfg)?;

let assert_payload = if let Some(error) = assert_message {
match error {
ConstrainError::StaticString(string) => Some(
self.acir_context.generate_assertion_message_payload(string.clone()),
),
ConstrainError::Dynamic(error_selector, is_string_type, values) => {
if let Some(constant_string) = try_to_extract_string_from_error_payload(
*is_string_type,
values,
dfg,
) {
Some(
self.acir_context
.generate_assertion_message_payload(constant_string),
)
} else {
let acir_vars: Vec<_> = values
.iter()
.map(|value| self.convert_value(*value, dfg))
.collect();

let expressions_or_memory =
self.acir_context.vars_to_expressions_or_memory(&acir_vars)?;

Some(AssertionPayload {
error_selector: error_selector.as_u64(),
payload: expressions_or_memory,
})
}
}
}
} else {
None
};

let assert_payload = self.convert_constrain_error(dfg, assert_message)?;
self.acir_context.assert_eq_var(lhs, rhs, assert_payload)?;
}
Instruction::ConstrainNotEqual(lhs, rhs, assert_message) => {
let lhs = self.convert_numeric_value(*lhs, dfg)?;
let rhs = self.convert_numeric_value(*rhs, dfg)?;

let assert_payload = if let Some(error) = assert_message {
match error {
ConstrainError::StaticString(string) => Some(
self.acir_context.generate_assertion_message_payload(string.clone()),
),
ConstrainError::Dynamic(error_selector, is_string_type, values) => {
if let Some(constant_string) = try_to_extract_string_from_error_payload(
*is_string_type,
values,
dfg,
) {
Some(
self.acir_context
.generate_assertion_message_payload(constant_string),
)
} else {
let acir_vars: Vec<_> = values
.iter()
.map(|value| self.convert_value(*value, dfg))
.collect();

let expressions_or_memory =
self.acir_context.vars_to_expressions_or_memory(&acir_vars)?;

Some(AssertionPayload {
error_selector: error_selector.as_u64(),
payload: expressions_or_memory,
})
}
}
}
} else {
None
};

self.acir_context.assert_neq_var(
lhs,
rhs,
self.current_side_effects_enabled_var,
assert_payload,
)?;
let assert_payload = self.convert_constrain_error(dfg, assert_message)?;
let predicate = self.current_side_effects_enabled_var;
self.acir_context.assert_neq_var(lhs, rhs, predicate, assert_payload)?;
}
Instruction::Cast(value_id, _) => {
let acir_var = self.convert_numeric_value(*value_id, dfg)?;
Expand Down Expand Up @@ -579,6 +505,39 @@ impl<'a> Context<'a> {
Ok(warnings)
}

/// Converts an optional constrain error message into an ACIR assertion payload
fn convert_constrain_error(
&mut self,
dfg: &DataFlowGraph,
assert_message: &Option<ConstrainError>,
) -> Result<Option<AssertionPayload<FieldElement>>, RuntimeError> {
let Some(error) = assert_message else {
return Ok(None);
};

let assert_payload = match error {
ConstrainError::StaticString(string) => {
self.acir_context.generate_assertion_message_payload(string.clone())
}
ConstrainError::Dynamic(error_selector, is_string_type, values) => {
if let Some(constant_string) =
try_to_extract_string_from_error_payload(*is_string_type, values, dfg)
{
self.acir_context.generate_assertion_message_payload(constant_string)
} else {
let acir_vars: Vec<_> = vecmap(values, |value| self.convert_value(*value, dfg));

let expressions_or_memory =
self.acir_context.vars_to_expressions_or_memory(&acir_vars)?;

let error_selector = error_selector.as_u64();
AssertionPayload { error_selector, payload: expressions_or_memory }
}
}
};
Ok(Some(assert_payload))
}

/// Remember the result of an instruction returning a single value
fn define_result(
&mut self,
Expand Down
Loading