Skip to content

fix: overflow in r1cs trans on shifts #238

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
alex-ozdemir merged 2 commits into from
Jan 27, 2026
Merged

fix: overflow in r1cs trans on shifts #238

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
38ba8d6
fix: overflow in r1cs trans on shifts
alex-ozdemir Jan 27, 2026
9bc01e4
satisfy linter
alex-ozdemir Jan 27, 2026
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
135 changes: 111 additions & 24 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ circ_opt = { path = "circ_opt" }
circ_hc = { path = "circ_hc", default-features = false, features = ["rc", "lru"]}
circ_waksman = { path = "circ_waksman" }
rug = { version = "1.11", features = ["serde"] }
gmp-mpfr-sys = { version = "1.4", optional = true }
gmp-mpfr-sys = { version = "1.6", optional = true }
lazy_static = { version = "1.4", optional = true }
rand = "0.8"
rand_chacha = "0.3"
Expand All @@ -26,7 +26,7 @@ typed-arena = { version = "2.0", optional = true }
log = "0.4"
thiserror = "1.0"
bellman = { git = "https://github.com/alex-ozdemir/bellman.git", branch = "mirage", optional = true }
rug-polynomial = { version = "0.2.5", optional = true }
rug-polynomial = { version = "0.2.6", optional = true }
rayon = { version = "1", optional = true }
ff = { version = "0.12", optional = true }
fxhash = "0.2"
Expand Down
5 changes: 1 addition & 4 deletions src/front/zsharp/parser.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,10 +126,7 @@ impl<'a> Loader for &'a ZLoad {
debug!("Parsing: {}", p.as_ref().display());
let s = self.sources.alloc(s);
let ast = ast::generate_ast(s);
if ast.is_err() {
panic!("{}", ast.unwrap_err());
}
Ok(ast.unwrap())
Ok(ast.unwrap_or_else(|e| panic!("{}", e)))
}
fn includes<P: AsRef<Path>>(&self, ast: &Self::AST, p: &P) -> Vec<PathBuf> {
let mut c = p.as_ref().to_path_buf();
Expand Down
1 change: 1 addition & 0 deletions src/front/zsharp/zvisit/zconstlitrw.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ impl<'ast> ZVisitorMut<'ast> for ZConstLiteralRewriter {
&mut self,
dle: &mut ast::DecimalLiteralExpression<'ast>,
) -> ZVisitorResult {
#![allow(clippy::unnecessary_unwrap)]
if dle.suffix.is_none() && self.to_ty.is_some() {
self.found = true;
dle.suffix.replace(match self.to_ty.as_ref().unwrap() {
Expand Down
5 changes: 1 addition & 4 deletions src/front/zsharpcurly/parser.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,10 +126,7 @@ impl<'a> Loader for &'a ZLoad {
debug!("Parsing: {}", p.as_ref().display());
let s = self.sources.alloc(s);
let ast = ast::generate_ast(s);
if ast.is_err() {
panic!("{}", ast.unwrap_err());
}
Ok(ast.unwrap())
Ok(ast.unwrap_or_else(|e| panic!("{}", e)))
}
fn includes<P: AsRef<Path>>(&self, ast: &Self::AST, p: &P) -> Vec<PathBuf> {
let mut c = p.as_ref().to_path_buf();
Expand Down
1 change: 1 addition & 0 deletions src/front/zsharpcurly/zvisit/zconstlitrw.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@ impl<'ast> ZVisitorMut<'ast> for ZConstLiteralRewriter {
&mut self,
dle: &mut ast::DecimalLiteralExpression<'ast>,
) -> ZVisitorResult {
#![allow(clippy::unnecessary_unwrap)]
if dle.suffix.is_none() && self.to_ty.is_some() {
self.found = true;
dle.suffix.replace(match self.to_ty.as_ref().unwrap() {
Expand Down
2 changes: 1 addition & 1 deletion src/ir/term/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
//! * [Computation]: a collection of variables and assertions about them
//! * [Value]: a variable-free (and evaluated) term
//!
#![allow(clippy::derive_ord_xor_partial_ord)]

use circ_fields::{FieldT, FieldV};
pub use circ_hc::{Node, Table, Weak};
Expand Down Expand Up @@ -795,7 +796,6 @@ impl Array {
impl std::cmp::Eq for Value {}
// We walk in danger here, intentionally. One day we may fix it.
// FP is the heart of the problem.
#[allow(clippy::derive_ord_xor_partial_ord)]
impl std::cmp::Ord for Value {
fn cmp(&self, o: &Self) -> std::cmp::Ordering {
self.partial_cmp(o).expect("broken Value cmp")
Expand Down
Loading
Loading