Remove the --enable-dce option.

This option has been meaningless since the last release
when DCE was enabled by default. Talking with users
during the Leo dev call seems to indicate nobody
minds if we just get rid of it.

Also remove the analogous member from CompilerOptions
and stop doing two cases (DCE enabled and disabled)
for compiler tests. We should probably create
a way to test individual passes, but I don't think we
need to single out DCE specifically and run every test
with it enabled and disabled.

Author: mikebenfield

compiler/compiler/src/compiler.rs

@@ -81,7 +81,7 @@ impl<N: Network> Compiler<N> {
             .into());
         }
 
-        if self.compiler_options.output.initial_ast {
+        if self.compiler_options.initial_ast {
             self.write_ast_to_json("initial.json")?;
             self.write_ast("initial.ast")?;
         }
@@ -120,7 +120,7 @@ impl<N: Network> Compiler<N> {
     fn do_pass<P: Pass>(&mut self, input: P::Input) -> Result<P::Output> {
         let output = P::do_pass(input, &mut self.state)?;
 
-        let write = match &self.compiler_options.output.ast_snapshots {
+        let write = match &self.compiler_options.ast_snapshots {
             AstSnapshots::All => true,
             AstSnapshots::Some(passes) => passes.contains(P::NAME),
         };
@@ -163,11 +163,9 @@ impl<N: Network> Compiler<N> {
 
         self.do_pass::<FunctionInlining>(())?;
 
-        if self.compiler_options.build.dce_enabled {
-            let output = self.do_pass::<DeadCodeEliminating>(())?;
-            self.statements_before_dce = output.statements_before;
-            self.statements_after_dce = output.statements_after;
-        }
+        let output = self.do_pass::<DeadCodeEliminating>(())?;
+        self.statements_before_dce = output.statements_before;
+        self.statements_after_dce = output.statements_after;
 
         Ok(())
     }
@@ -194,7 +192,7 @@ impl<N: Network> Compiler<N> {
     /// Writes the AST to a JSON file.
     fn write_ast_to_json(&self, file_suffix: &str) -> Result<()> {
         // Remove `Span`s if they are not enabled.
-        if self.compiler_options.output.ast_spans_enabled {
+        if self.compiler_options.ast_spans_enabled {
             self.state.ast.to_json_file(
                 self.output_directory.clone(),
                 &format!("{}.{file_suffix}", self.program_name.as_ref().unwrap()),

compiler/compiler/src/options.rs

@@ -18,24 +18,14 @@
 
 use std::collections::HashSet;
 
-#[derive(Clone, Default)]
+#[derive(Clone, Debug, Default)]
 pub struct CompilerOptions {
-    /// Build options.
-    pub build: BuildOptions,
-    /// Output options.
-    pub output: OutputOptions,
-}
+    /// Whether spans are enabled in the output ASTs.
+    pub ast_spans_enabled: bool,
 
-#[derive(Clone)]
-pub struct BuildOptions {
-    /// Whether to enable dead code elimination.
-    pub dce_enabled: bool,
-}
+    pub ast_snapshots: AstSnapshots,
 
-impl Default for BuildOptions {
-    fn default() -> Self {
-        Self { dce_enabled: true }
-    }
+    pub initial_ast: bool,
 }
 
 #[derive(Clone, Debug)]
@@ -49,13 +39,3 @@ impl Default for AstSnapshots {
         AstSnapshots::Some(Default::default())
     }
 }
-
-#[derive(Clone, Debug, Default)]
-pub struct OutputOptions {
-    /// Whether spans are enabled in the output ASTs.
-    pub ast_spans_enabled: bool,
-
-    pub ast_snapshots: AstSnapshots,
-
-    pub initial_ast: bool,
-}

compiler/compiler/src/test_compiler.rs

@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with the Leo library. If not, see <https://www.gnu.org/licenses/>.
 
-use crate::{BuildOptions, Compiler, CompilerOptions};
+use crate::Compiler;
 
 use leo_ast::Stub;
 use leo_disassembler::disassemble_from_str;
@@ -35,18 +35,15 @@ pub const PROGRAM_DELIMITER: &str = "// --- Next Program --- //";
 
 pub fn whole_compile(
     source: &str,
-    dce_enabled: bool,
     handler: &Handler,
     import_stubs: IndexMap<Symbol, Stub>,
 ) -> Result<(String, String), LeoError> {
-    let options = CompilerOptions { build: BuildOptions { dce_enabled }, ..Default::default() };
-
     let mut compiler = Compiler::<TestnetV0>::new(
         None,
         /* is_test (a Leo test) */ false,
         handler.clone(),
         "/fakedirectory-wont-use".into(),
-        Some(options),
+        None,
         import_stubs,
     );
 
@@ -57,7 +54,7 @@ pub fn whole_compile(
     Ok((bytecode, compiler.program_name.unwrap()))
 }
 
-fn run_test(test: &str, dce_enabled: bool, handler: &Handler) -> Result<String, ()> {
+fn run_test(test: &str, handler: &Handler) -> Result<String, ()> {
     // Initialize a `Process`. This should always succeed.
     let mut process = Process::<TestnetV0>::load().unwrap();
 
@@ -67,8 +64,7 @@ fn run_test(test: &str, dce_enabled: bool, handler: &Handler) -> Result<String,
 
     // Compile each source file separately.
     for source in test.split(PROGRAM_DELIMITER) {
-        let (bytecode, program_name) =
-            handler.extend_if_error(whole_compile(source, dce_enabled, handler, import_stubs.clone()))?;
+        let (bytecode, program_name) = handler.extend_if_error(whole_compile(source, handler, import_stubs.clone()))?;
 
         // Parse the bytecode as an Aleo program.
         // Note that this function checks that the bytecode is well-formed.
@@ -95,21 +91,13 @@ fn run_test(test: &str, dce_enabled: bool, handler: &Handler) -> Result<String,
 }
 
 fn runner(source: &str) -> String {
-    fn run(source: &str, dce_enabled: bool) -> String {
-        let buf = BufferEmitter::new();
-        let handler = Handler::new(buf.clone());
-
-        match run_test(source, dce_enabled, &handler) {
-            Ok(x) => format!("{}{}", buf.extract_warnings(), x),
-            Err(()) => format!("{}{}", buf.extract_errs(), buf.extract_warnings()),
-        }
-    }
-
-    let with_dce_enabled = create_session_if_not_set_then(|_| run(source, true));
-
-    let with_dce_disabled = create_session_if_not_set_then(|_| run(source, false));
+    let buf = BufferEmitter::new();
+    let handler = Handler::new(buf.clone());
 
-    format!("DCE_ENABLED:\n{with_dce_enabled}\nDCE_DISABLED:\n{with_dce_disabled}")
+    create_session_if_not_set_then(|_| match run_test(source, &handler) {
+        Ok(x) => format!("{}{}", buf.extract_warnings(), x),
+        Err(()) => format!("{}{}", buf.extract_errs(), buf.extract_warnings()),
+    })
 }
 
 #[test]

leo/cli/commands/build.rs

@@ -17,7 +17,7 @@
 use super::*;
 
 use leo_ast::Stub;
-use leo_compiler::{AstSnapshots, Compiler, CompilerOptions, OutputOptions};
+use leo_compiler::{AstSnapshots, Compiler, CompilerOptions};
 use leo_errors::{CliError, UtilError};
 use leo_package::{Manifest, NetworkName, Package};
 use leo_span::Symbol;
@@ -31,16 +31,13 @@ use std::path::Path;
 impl From<BuildOptions> for CompilerOptions {
     fn from(options: BuildOptions) -> Self {
         Self {
-            build: leo_compiler::BuildOptions { dce_enabled: options.enable_dce },
-            output: OutputOptions {
-                ast_spans_enabled: options.enable_ast_spans,
-                ast_snapshots: if options.enable_all_ast_snapshots {
-                    AstSnapshots::All
-                } else {
-                    AstSnapshots::Some(options.ast_snapshots.into_iter().collect())
-                },
-                initial_ast: options.enable_all_ast_snapshots | options.enable_initial_ast_snapshot,
+            ast_spans_enabled: options.enable_ast_spans,
+            ast_snapshots: if options.enable_all_ast_snapshots {
+                AstSnapshots::All
+            } else {
+                AstSnapshots::Some(options.ast_snapshots.into_iter().collect())
             },
+            initial_ast: options.enable_all_ast_snapshots | options.enable_initial_ast_snapshot,
         }
     }
 }
@@ -164,8 +161,6 @@ fn compile_leo_file<N: Network>(
     options: BuildOptions,
     stubs: IndexMap<Symbol, Stub>,
 ) -> Result<String> {
-    let enable_dce = options.enable_dce;
-
     // Create a new instance of the Leo compiler.
     let mut compiler = Compiler::<N>::new(
         Some(program_name.to_string()),
@@ -179,10 +174,9 @@ fn compile_leo_file<N: Network>(
     // Compile the Leo program into Aleo instructions.
     let bytecode = compiler.compile_from_file(source_file_path)?;
 
-    if enable_dce {
-        tracing::info!("    {} statements before dead code elimination.", compiler.statements_before_dce);
-        tracing::info!("    {} statements after dead code elimination.", compiler.statements_after_dce);
-    }
+    tracing::info!("    {} statements before dead code elimination.", compiler.statements_before_dce);
+    tracing::info!("    {} statements after dead code elimination.", compiler.statements_after_dce);
+
     tracing::info!("✅ Compiled '{program_name}.aleo' into Aleo instructions");
     Ok(bytecode)
 }

leo/cli/commands/mod.rs

@@ -133,7 +133,7 @@ pub trait Command {
 
 /// Compiler Options wrapper for Build command. Also used by other commands which
 /// require Build command output as their input.
-#[derive(Parser, Clone, Debug)]
+#[derive(Parser, Clone, Debug, Default)]
 pub struct BuildOptions {
     #[clap(long, help = "Endpoint to retrieve network state from. Overrides setting in `.env`.")]
     pub endpoint: Option<String>,
@@ -145,8 +145,6 @@ pub struct BuildOptions {
     pub offline: bool,
     #[clap(long, help = "Enable spans in AST snapshots.")]
     pub enable_ast_spans: bool,
-    #[clap(long, help = "Enables dead code elimination in the compiler.", default_value = "true")]
-    pub enable_dce: bool,
     #[clap(long, help = "Write an AST snapshot immediately after parsing.")]
     pub enable_initial_ast_snapshot: bool,
     #[clap(long, help = "Writes all AST snapshots for the different compiler phases.")]
@@ -157,23 +155,6 @@ pub struct BuildOptions {
     pub build_tests: bool,
 }
 
-impl Default for BuildOptions {
-    fn default() -> Self {
-        Self {
-            endpoint: None,
-            network: None,
-            non_recursive: false,
-            offline: false,
-            enable_ast_spans: false,
-            enable_dce: true,
-            enable_initial_ast_snapshot: false,
-            enable_all_ast_snapshots: false,
-            ast_snapshots: Vec::new(),
-            build_tests: false,
-        }
-    }
-}
-
 /// On Chain Execution Options to set preferences for keys, fees and networks.
 /// Used by Execute and Deploy commands.
 #[derive(Parser, Clone, Debug, Default)]

tests/expectations/compiler/address/binary.out

@@ -1,16 +1,6 @@
-DCE_ENABLED:
 program test.aleo;
 
 function main:
     input r0 as address.private;
     is.neq r0 aleo1fj982yqchhy973kz7e9jk6er7t6qd6jm9anplnlprem507w6lv9spwvfxx into r1;
     output r1 as boolean.private;
-
-DCE_DISABLED:
-program test.aleo;
-
-function main:
-    input r0 as address.private;
-    is.eq r0 aleo1fj982yqchhy973kz7e9jk6er7t6qd6jm9anplnlprem507w6lv9spwvfxx into r1;
-    is.neq r0 aleo1fj982yqchhy973kz7e9jk6er7t6qd6jm9anplnlprem507w6lv9spwvfxx into r2;
-    output r2 as boolean.private;

tests/expectations/compiler/address/branch.out

@@ -1,14 +1,3 @@
-DCE_ENABLED:
-program test.aleo;
-
-function main:
-    input r0 as address.private;
-    input r1 as boolean.private;
-    ternary r1 aleo16s003g206rjms5pm4ak48340f7y4z4dsskuqfrd2gvqz6umh2qfq7lajfp aleo1fj982yqchhy973kz7e9jk6er7t6qd6jm9anplnlprem507w6lv9spwvfxx into r2;
-    is.eq r2 aleo1drcl2g8zxhxjzjw63ajp067gzvl94am3z7m7wgrzmr2ecd5sdq8sy66l5k into r3;
-    output r3 as boolean.private;
-
-DCE_DISABLED:
 program test.aleo;
 
 function main:

tests/expectations/compiler/address/equal.out

@@ -1,12 +1,3 @@
-DCE_ENABLED:
-program test.aleo;
-
-function main:
-    input r0 as address.private;
-    is.eq r0 aleo10qerras5799u6k7rjtc9y3hcwxuykr45qra7x7dp6jgnc0923czqm0lgta into r1;
-    output r1 as boolean.private;
-
-DCE_DISABLED:
 program test.aleo;
 
 function main:

tests/expectations/compiler/address/gt_fail.out

@@ -1,21 +1,3 @@
-DCE_ENABLED:
-Error [ETYC0372117]: Expected a field, scalar, or integer but type `address` was found.
-    --> compiler-test:6:16
-     |
-   6 |         return x > sender;
-     |                ^
-Error [ETYC0372117]: Expected a field, scalar, or integer but type `address` was found.
-    --> compiler-test:6:20
-     |
-   6 |         return x > sender;
-     |                    ^^^^^^
-Error [ETYC0372083]: A program must have at least one transition function.
-    --> compiler-test:2:9
-     |
-   2 | program test.aleo {
-     |         ^^^^^^^^^
-
-DCE_DISABLED:
 Error [ETYC0372117]: Expected a field, scalar, or integer but type `address` was found.
     --> compiler-test:6:16
      |

tests/expectations/compiler/address/gte_fail.out

@@ -1,21 +1,3 @@
-DCE_ENABLED:
-Error [ETYC0372117]: Expected a field, scalar, or integer but type `address` was found.
-    --> compiler-test:6:16
-     |
-   6 |         return x >= sender;
-     |                ^
-Error [ETYC0372117]: Expected a field, scalar, or integer but type `address` was found.
-    --> compiler-test:6:21
-     |
-   6 |         return x >= sender;
-     |                     ^^^^^^
-Error [ETYC0372083]: A program must have at least one transition function.
-    --> compiler-test:2:9
-     |
-   2 | program test.aleo {
-     |         ^^^^^^^^^
-
-DCE_DISABLED:
 Error [ETYC0372117]: Expected a field, scalar, or integer but type `address` was found.
     --> compiler-test:6:16
      |

tests/expectations/compiler/address/lt_fail.out

@@ -1,21 +1,3 @@
-DCE_ENABLED:
-Error [ETYC0372117]: Expected a field, scalar, or integer but type `address` was found.
-    --> compiler-test:6:16
-     |
-   6 |         return x < sender;
-     |                ^
-Error [ETYC0372117]: Expected a field, scalar, or integer but type `address` was found.
-    --> compiler-test:6:20
-     |
-   6 |         return x < sender;
-     |                    ^^^^^^
-Error [ETYC0372083]: A program must have at least one transition function.
-    --> compiler-test:2:9
-     |
-   2 | program test.aleo {
-     |         ^^^^^^^^^
-
-DCE_DISABLED:
 Error [ETYC0372117]: Expected a field, scalar, or integer but type `address` was found.
     --> compiler-test:6:16
      |

tests/expectations/compiler/address/lte_fail.out

@@ -1,21 +1,3 @@
-DCE_ENABLED:
-Error [ETYC0372117]: Expected a field, scalar, or integer but type `address` was found.
-    --> compiler-test:6:16
-     |
-   6 |         return x <= sender;
-     |                ^
-Error [ETYC0372117]: Expected a field, scalar, or integer but type `address` was found.
-    --> compiler-test:6:21
-     |
-   6 |         return x <= sender;
-     |                     ^^^^^^
-Error [ETYC0372083]: A program must have at least one transition function.
-    --> compiler-test:2:9
-     |
-   2 | program test.aleo {
-     |         ^^^^^^^^^
-
-DCE_DISABLED:
 Error [ETYC0372117]: Expected a field, scalar, or integer but type `address` was found.
     --> compiler-test:6:16
      |