Skip to content

Commit 49f0d95

Browse files
TomAFrenchTomAFrench
committed
Merge branch 'master' into assert-eq-builtin
* master: feat(ssa): Merge slices in if statements with witness conditions (#2347) chore: Separate frontend `Visibility` and `Distinctness` from the ABI (#2369) feat: add syntax for specifying function type environments (#2357) chore: Remove unused `Directive::Log` (#2366) chore: clippy fixes (#2365) chore: Extract bytecode from artifact files for backend integration test inputs (#2356) feat: Add trait definition representation in DefCollector and HIR (#2338) chore: Remove unused `Intrinsic::Println` (#2358) fix: Remove duplicte `T` in `expected T, found T` error on tuple assignment (#2360) chore(brillig): Fix brillig radix instruction return vector size (#2350) fix: Show types in error message in same order as in source code (#2353)
2 parents 11a410b + 76f7e43 commit 49f0d95

File tree

318 files changed

+1321
-521
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

318 files changed

+1321
-521
lines changed

‎crates/lsp/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -520,7 +520,7 @@ fn on_did_save_text_document(
520520
}
521521

522522
// We need to refresh lenses when we compile since that's the only time they can be accurately reflected
523-
let _ = state.client.code_lens_refresh(());
523+
std::mem::drop(state.client.code_lens_refresh(()));
524524

525525
let _ = state.client.publish_diagnostics(PublishDiagnosticsParams {
526526
uri: params.text_document.uri,

‎crates/nargo/src/ops/foreign_calls.rs

+17-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use acvm::{
2-
acir::brillig::{ForeignCallResult, Value},
2+
acir::brillig::{ForeignCallOutput, ForeignCallResult, Value},
33
pwg::ForeignCallWaitInfo,
44
};
55
use iter_extended::vecmap;
@@ -54,13 +54,25 @@ impl ForeignCall {
5454
}
5555
Some(ForeignCall::Sequence) => {
5656
let sequence_length: u128 = foreign_call.inputs[0][0].to_field().to_u128();
57-
58-
Ok(vecmap(0..sequence_length, Value::from).into())
57+
let sequence = vecmap(0..sequence_length, Value::from);
58+
59+
Ok(ForeignCallResult {
60+
values: vec![
61+
ForeignCallOutput::Single(sequence_length.into()),
62+
ForeignCallOutput::Array(sequence),
63+
],
64+
})
5965
}
6066
Some(ForeignCall::ReverseSequence) => {
6167
let sequence_length: u128 = foreign_call.inputs[0][0].to_field().to_u128();
62-
63-
Ok(vecmap((0..sequence_length).rev(), Value::from).into())
68+
let sequence = vecmap((0..sequence_length).rev(), Value::from);
69+
70+
Ok(ForeignCallResult {
71+
values: vec![
72+
ForeignCallOutput::Single(sequence_length.into()),
73+
ForeignCallOutput::Array(sequence),
74+
],
75+
})
6476
}
6577
None => panic!("unexpected foreign call {:?}", foreign_call_name),
6678
}

‎crates/nargo_cli/tests/compile_failure/slice_access_failure/Nargo.toml

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
[package]
2+
name = "slice_access_failure"
3+
type = "bin"
4+
authors = [""]
5+
compiler_version = "0.10.2"
6+
7+
[dependencies]

‎crates/nargo_cli/tests/compile_failure/slice_access_failure/Prover.toml

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
x = "5"
2+
y = "10"

‎crates/nargo_cli/tests/compile_failure/slice_access_failure/src/main.nr

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
fn main(x : Field, y : pub Field) {
2+
let mut slice = [0; 2];
3+
if x == y {
4+
slice = slice.push_back(y);
5+
slice = slice.push_back(x);
6+
} else {
7+
slice = slice.push_back(x);
8+
}
9+
// This constraint should fail as the slice length is 3 and the index is 3
10+
// The right hand side AND case ensures that the circuit inputs have not changed
11+
// and we always hit the else case in the if statement above.
12+
assert((slice[3] == 0) & (slice[2] != y));
13+
}

‎crates/nargo_cli/tests/execution_success/comptime_recursion_regression/Nargo.toml ‎crates/nargo_cli/tests/compile_success_empty/comptime_recursion_regression/Nargo.toml

File renamed without changes.

‎crates/nargo_cli/tests/execution_success/comptime_recursion_regression/Prover.toml ‎crates/nargo_cli/tests/compile_success_empty/comptime_recursion_regression/Prover.toml

File renamed without changes.

‎crates/nargo_cli/tests/execution_success/comptime_recursion_regression/src/main.nr ‎crates/nargo_cli/tests/compile_success_empty/comptime_recursion_regression/src/main.nr

File renamed without changes.

‎crates/nargo_cli/tests/execution_success/1327_concrete_in_generic/target/1327_concrete_in_generic.bytecode

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
H4sIAAAAAAAA/62PwQ2AMAwDU1goaZI2+bEKFen+IyCkIlC/4I/9OtsrACR4dOdtOH4TpcGcuYxFJGoOYtoxezNF0VaMjNT0yMYcJla9eUUn4aCuzn2Al/82Ypq+v/PVcwJ2MvbyJAEAAA==

‎crates/nargo_cli/tests/execution_success/1327_concrete_in_generic/target/1327_concrete_in_generic.json

-1
This file was deleted.

‎crates/nargo_cli/tests/execution_success/1_mul/target/1_mul.bytecode

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
H4sIAAAAAAAA/+2Z326CMBTGP2SIyCTLsmw3u+ARWv5ouZuPMjN8/0fYyFo5MHbFV6KJJyG1jf16/vT8NPoG4B2/Fvw8KzvmYr4azUM7D+0Dsb+zDzuqeabdeeDqKkzYTG3tUftyhszFgx0jsZbY0dWss7WoTSj2HsW+QIyB0DiKPVPvCf7RScSa258JX8DLiVqDfu9UJjTZDl8udVeEHH1TRXYO+GuksW6p9lXVHopWl/pTFc3J1KqqT3ujja5N/VWYsmxNZQ7NqTmoRldlq891U56t8BP8NGXI8bOwfuoHYswRsS7M/PmGcYQhbFh+Y8Jmai8OYwe2WKzdYczRXATGneM5ehjH8Adj10hsGD/jNmC8JsYcE+vCzJ9vGMcYwoblNyZspvbiMN7YUYLvDmOO5iIw7gqYo4dxAn8wdo3EhvELbgPGG2LMCbEuzPz5hnGCYWOz/MaEzdReHMZbO6Zi7Q5jjuYiMO4KmKOHcQp/MHaNxIbxK24DxltizCmxLleev0vMITHmlOjXI7gfZn+aHvxeZPos/d2J1+437NXEnfAATI3ROeM8egWqryLtPOhm4F1+X3Fn/BoN4HTNOZXfdtwfcmP7BvHx78jZGwAA

‎crates/nargo_cli/tests/execution_success/1_mul/target/1_mul.json

-1
This file was deleted.

‎crates/nargo_cli/tests/execution_success/2_div/target/2_div.bytecode

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
H4sIAAAAAAAA/+1Z207DMAx1W3aDrduYEELwUCbxnvSytW/sU5jo/v8ToCLZTGkZU4+rTdTSlCZqTpxj146zJyJ6oS9xPn+uaQPWd0t9z/Q98yuLY9pX06pmoh0clpLU0xXSkwT0tHJl2h4bG5nW2r6QPuPMY3OfK/h02LNr3vF+ecepwRmxMTvfZ7oQjhPVJ7g/KJ9hohXW9mMsjBDQ4ePsmT5VkIdamzt6pFZxnK/DXEf6TYXZNk1UnGxXqU51kibvYRpFeRqn62ybrVWm4yjXuySLdgasB8TqA7Esn33GZ9lBmq5h7YfGvSOZQIT2I0fIj1Qz0Uj+uiT5Xc9LTJID0w7ZWJckMZitJMnCgAEdkuSQLitJDoFYI8InyRHJJsmBAO49/b8kOQTq1RZ/TffsAfc8AOp1TdhDxo8gSvjkjdSZ63vDnm1F6lb4hEAC0lRap8yjaIKSMtKNAO6YcM4vte8x3kaip2Ekp+VKA61rge0K8wvC1oLY+zU4FxPT+mzslAphw+bVVQgbOl4hVOF0FUK97CuEwoABHSoEn+pPtKqZaHuHjj7RPpDMRwk6kYVGTz0B7tkH2gXJX921jyvgv2fEpWTgbT2oT007Y2OnBPUlm1cX1Jd0PKhX4XRBvV72QX3KyCz6hSGD0prnXK77QKxHuozkMAXueQa0K4A//Rf+VDPRyP/TZkCsOWGTaxvXHUidub637Lm77miIOTeEonEXdN7XHcW+F3gbiV53IDnlpyZbUZXlA/vP+pfeJAAA

‎crates/nargo_cli/tests/execution_success/2_div/target/2_div.json

-1
This file was deleted.

‎crates/nargo_cli/tests/execution_success/3_add/target/3_add.bytecode

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
H4sIAAAAAAAA/+1YW26DMBBcngkQ0b9+o5zA5hHMX3OUopL7H6FFNXRxjBo144pWsYQ2tvDsCw9DnojomT6H93H52hZs7hvzQM8DfZnD1/ZFW3HfkB4Qy8dhCUvq92JLh9izD59hhtpGbC1hfZzujbUdexGwvUe2z2PWYxhHtsd2j7eCk7C1aX/OYiFcTUTM/KIwc4aJDlhOhzFkxRznYyMLw2fgwDcKix/ISpzqemjLQVbyVZRdrxpRN/1JSSUb1byVqqoGVau267tWdLKuBnlpuuqiwXJyc7jN+v0wzlLHKUNgzhGwFxuv35xzAMw5AsYVA+s35nhFHgQnKYmMmce7Y7+nl4xveSYcEK8kw49ZR6fE7KpJOwe4e8I9/K7y3uN7tCCnLdd0TWGDY1bAl8i/UMWT8kwta7eo4jNd98pUxWf6XhXbcB6qeH3MqngsUkFfqjgl56pYAZTErBATwpFISlhVcgshbSDmiTQ6S7h/jpAybQ9s7fGZjsH8FULKaPmZPjayMHyiP5NSwhFSBozrQG4ON5qEMsISJ9HyP1RzvAPVuWfSjBUAAA==

‎crates/nargo_cli/tests/execution_success/3_add/target/3_add.json

-1
This file was deleted.

‎crates/nargo_cli/tests/execution_success/4_sub/target/4_sub.bytecode

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
H4sIAAAAAAAA/81WbW7DIAzlI0nbTesZqp4AB2jg366yaOn9j7BFheqVpv3RGKlIkTHCz882OHwKIb7EZcj/TyV5AF0Vuk66Tl85VJLfSZp1gyRgWXNybhr6iSz9mD6OwRvnx1OgQD743z5YOwUXhjjGwURydqKzj/acwNR6XpQnC6G/M/bVhwLMJskW1nZQx7y3S3KuhQbbI9hJkBIwjmCztEc+wNnBWrbfAxfBlxPTgV8uzD1gchOmfBkbSOasz4U8FD51Bd8Zi/NCrsX64IvRPMvfizz7xJMaxphbxroy5I8q5u8as2aMuWXk1TGevznGu+Yh2JsUcXJGvhuY55+MWjgTFRovicJPmceqjblWkTYVcLeC7/DXinvLX6Ob5vTOOcVXU355l+MPfrsSyMILAAA=

‎crates/nargo_cli/tests/execution_success/4_sub/target/4_sub.json

-1
This file was deleted.

‎crates/nargo_cli/tests/execution_success/5_over/target/5_over.bytecode

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
H4sIAAAAAAAA/+1YW26DMBAcIC+Imr9+VkpuYPM0f81Rigr3P0JLasgCRlHEbtRIWQlZRngYdr3jEQcA7/gL7/fy7Xgkc9/OA3uBPN/Gpx3VstAewWTEVXDEQmwtiN2/wyeYXd5X5F5ox65GbWxIbeiaM1nnkdEjGGeyxvWMN4MTOngeCBfw5URtwL7v1AHDfccJrrsmahNzxLWpVnYOyDXSGDdReZrWRVzrRH+puKxMptKsyo02OjPZd2ySpDapKcqqLFSp06TWTVYmjQV+g0xTBjw8Y8tTB4zfvGKsy6Pyp5bFRXgk8rcUa82YvwCOpgd/L3JypnypuHaHguvAEBBMjdF7xnkUFVSpIkkkagu+zS/13Vv+Gg3E6T/ndOxopTgzHiKSjtMIYg/c7M6O1Dne42ZPmNZq7GZPuO1mXTgvNzsfvZttC/iBq5sNMW0kblfC4STq5hLlDnwiEoLXlTxCkBg55w66TydIkR335N49grTGtFZjQVrjtiC5cF6CNB+9IEUkme18D3lBok20VJAi8AnSHjLNzf07IeLjqXzC0cc0fgAXnjWW6BQAAA==

‎crates/nargo_cli/tests/execution_success/5_over/target/5_over.json

-1
This file was deleted.

‎crates/nargo_cli/tests/execution_success/6/target/6.bytecode

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
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

‎crates/nargo_cli/tests/execution_success/6/target/6.json

-1
This file was deleted.

0 commit comments

Comments
 (0)