Skip to content
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

fix: correct types returned by constant EC operations simplified within SSA #6652

Merged
merged 5 commits into from
Nov 29, 2024
+46 −14
Merged

fix: correct types returned by constant EC operations simplified within SSA #6652

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b733bf5
Add regression test for inline brillig call bug
asterite Nov 29, 2024
2601fc8
fix: correct return types from simplified black box functions
TomAFrench Nov 29, 2024
21dd15a
Delete test_programs/execution_success/inline_decompose_hint_brillig_…
TomAFrench Nov 29, 2024
41040bb
chore: add assertion that simplified result satisfies type
TomAFrench Nov 29, 2024
ac3dd6a
.
TomAFrench Nov 29, 2024
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: 2 additions & 2 deletions compiler/noirc_evaluator/src/ssa/ir/instruction/call/blackbox.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ pub(super) fn simplify_ec_add(

let result_x = dfg.make_constant(result_x, Type::field());
let result_y = dfg.make_constant(result_y, Type::field());
let result_is_infinity = dfg.make_constant(result_is_infinity, Type::bool());
let result_is_infinity = dfg.make_constant(result_is_infinity, Type::field());

let typ = Type::Array(Arc::new(vec![Type::field()]), 3);

Expand Down Expand Up @@ -107,7 +107,7 @@ pub(super) fn simplify_msm(

let result_x = dfg.make_constant(result_x, Type::field());
let result_y = dfg.make_constant(result_y, Type::field());
let result_is_infinity = dfg.make_constant(result_is_infinity, Type::bool());
let result_is_infinity = dfg.make_constant(result_is_infinity, Type::field());

let elements = im::vector![result_x, result_y, result_is_infinity];
let typ = Type::Array(Arc::new(vec![Type::field()]), 3);
Expand Down
7 changes: 7 additions & 0 deletions test_programs/execution_success/inline_decompose_hint_brillig_call/Nargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
[package]
name = "inline_decompose_hint_brillig_call"
version = "0.1.0"
type = "bin"
authors = [""]

[dependencies]
1 change: 1 addition & 0 deletions test_programs/execution_success/inline_decompose_hint_brillig_call/Prover.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

15 changes: 15 additions & 0 deletions test_programs/execution_success/inline_decompose_hint_brillig_call/src/main.nr
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
use std::embedded_curve_ops::{EmbeddedCurvePoint, EmbeddedCurveScalar, fixed_base_scalar_mul};

fn main() -> pub Field {
let pre_address = 0x23d95e303879a5d0bbef78ecbc335e559da37431f6dcd11da54ed375c2846813;
let (a, b) = std::field::bn254::decompose(pre_address);
let curve = EmbeddedCurveScalar { lo: a, hi: b };
let key = fixed_base_scalar_mul(curve);
let point = EmbeddedCurvePoint {
x: 0x111223493147f6785514b1c195bb37a2589f22a6596d30bb2bb145fdc9ca8f1e,
y: 0x273bbffd678edce8fe30e0deafc4f66d58357c06fd4a820285294b9746c3be95,
is_infinite: false,
};
let address_point = key.add(point);
address_point.x
}
Loading