Merge branch 'master' into gd/issue_6394

noir-lang · Jan 29, 2025 · da8a8a1 · da8a8a1
2 parents 39bc8e6 + 506641b
commit da8a8a1
Show file tree

Hide file tree

Showing 13 changed files with 4,009 additions and 107 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/compiler/noirc_driver/src/lib.rs b/compiler/noirc_driver/src/lib.rs
@@ -135,10 +135,14 @@ pub struct CompileOptions {
     #[arg(long)]
     pub skip_underconstrained_check: bool,
 
-    /// Flag to turn off the compiler check for missing Brillig call constrains.
-    /// Warning: This can improve compilation speed but can also lead to correctness errors.
+    /// Flag to turn on the compiler check for missing Brillig call constraints.
+    /// Warning: This can degrade compilation speed but will also find some correctness errors.
     /// This check should always be run on production code.
     #[arg(long)]
+    pub enable_brillig_constraints_check: bool,
+
+    /// Hidden Brillig call check flag to maintain CI compatibility (currently ignored)
+    #[arg(long, hide = true)]
     pub skip_brillig_constraints_check: bool,
 
     /// Setting to decide on an inlining strategy for Brillig functions.
@@ -679,7 +683,7 @@ pub fn compile_no_check(
         },
         emit_ssa: if options.emit_ssa { Some(context.package_build_path.clone()) } else { None },
         skip_underconstrained_check: options.skip_underconstrained_check,
-        skip_brillig_constraints_check: options.skip_brillig_constraints_check,
+        enable_brillig_constraints_check: options.enable_brillig_constraints_check,
         inliner_aggressiveness: options.inliner_aggressiveness,
         max_bytecode_increase_percent: options.max_bytecode_increase_percent,
     };

diff --git a/compiler/noirc_evaluator/src/ssa.rs b/compiler/noirc_evaluator/src/ssa.rs
@@ -68,8 +68,8 @@ pub struct SsaEvaluatorOptions {
     /// Skip the check for under constrained values
     pub skip_underconstrained_check: bool,
 
-    /// Skip the missing Brillig call constraints check
-    pub skip_brillig_constraints_check: bool,
+    /// Enable the missing Brillig call constraints check
+    pub enable_brillig_constraints_check: bool,
 
     /// The higher the value, the more inlined Brillig functions will be.
     pub inliner_aggressiveness: i64,
@@ -112,7 +112,7 @@ pub(crate) fn optimize_into_acir(
         ));
     }
 
-    if !options.skip_brillig_constraints_check {
+    if options.enable_brillig_constraints_check {
         ssa_level_warnings.extend(time(
             "After Check for Missing Brillig Call Constraints",
             options.print_codegen_timings,

diff --git a/compiler/noirc_evaluator/src/ssa/opt/hint.rs b/compiler/noirc_evaluator/src/ssa/opt/hint.rs
@@ -18,7 +18,7 @@ mod tests {
             expression_width: ExpressionWidth::default(),
             emit_ssa: None,
             skip_underconstrained_check: true,
-            skip_brillig_constraints_check: true,
+            enable_brillig_constraints_check: false,
             inliner_aggressiveness: 0,
             max_bytecode_increase_percent: None,
         };

diff --git a/docs/docs/how_to/using-devcontainers.mdx b/docs/docs/how_to/using-devcontainers.mdx
@@ -60,29 +60,15 @@ Github comes with a default codespace and you can use it to code your own devcon
 
 #### 3. Create a folder called `.devcontainer` in the root of your repository.
 
-#### 4. Create a Dockerfile in that folder, and paste the following code:
-
-```docker
-FROM --platform=linux/amd64 node:lts-bookworm-slim
-SHELL ["/bin/bash", "-c"]
-RUN apt update && apt install -y curl bash git tar gzip libc++-dev
-RUN curl -L https://raw.githubusercontent.com/noir-lang/noirup/main/install | bash
-ENV PATH="/root/.nargo/bin:$PATH"
-RUN noirup
-ENTRYPOINT ["nargo"]
-```
-#### 5. Create a file called `devcontainer.json` in the same folder, and paste the following code:
+#### 4. Create a file called `devcontainer.json` in the same folder, and paste the following code:
 
 ```json
 {
  "name": "Noir on Codespaces",
- "build": {
-    "context": ".",
-    "dockerfile": "Dockerfile"
-  },
-  "customizations": {
-    "vscode": {
-      "extensions": ["noir-lang.vscode-noir"]
+ "image": "mcr.microsoft.com/devcontainers/base:ubuntu",
+  "features": {
+    "ghcr.io/noir-lang/features/noir:latest": {
+      "version": "1.0.0-beta.1"
     }
   }
 }

diff --git a/test_programs/compilation_report.sh b/test_programs/compilation_report.sh
@@ -6,7 +6,7 @@ current_dir=$(pwd)
 base_path="$current_dir/execution_success"
 
 # Tests to be profiled for compilation report
-tests_to_profile=("sha256_regression" "regression_4709" "ram_blowup_regression")
+tests_to_profile=("sha256_regression" "regression_4709" "ram_blowup_regression" "global_var_regression_entry_points")
 
 echo "{\"compilation_reports\": [ " > $current_dir/compilation_report.json
 

diff --git a/test_programs/execution_report.sh b/test_programs/execution_report.sh
@@ -6,7 +6,7 @@ current_dir=$(pwd)
 base_path="$current_dir/execution_success"
 
 # Tests to be profiled for execution report
-tests_to_profile=("sha256_regression" "regression_4709" "ram_blowup_regression")
+tests_to_profile=("sha256_regression" "regression_4709" "ram_blowup_regression" "global_var_regression_entry_points")
 
 echo "{\"execution_reports\": [ " > $current_dir/execution_report.json
 

diff --git a/test_programs/execution_success/global_var_regression_entry_points/Nargo.toml b/test_programs/execution_success/global_var_regression_entry_points/Nargo.toml
@@ -0,0 +1,6 @@
+[package]
+name = "global_var_regression_entry_points"
+type = "bin"
+authors = [""]
+
+[dependencies]
diff --git a/test_programs/execution_success/global_var_regression_entry_points/Prover.toml b/test_programs/execution_success/global_var_regression_entry_points/Prover.toml
@@ -0,0 +1,2 @@
+x = 0
+y = 1