shared: move preserve-bindings to linker Options

Author: Firestar99

crates/rustc_codegen_spirv/src/codegen_cx/mod.rs

@@ -313,9 +313,6 @@ pub struct CodegenArgs {
 
     pub run_spirv_opt: bool,
 
-    // spirv-opt flags
-    pub preserve_bindings: bool,
-
     /// All options pertinent to `rustc_codegen_spirv::linker` specifically.
     //
     // FIXME(eddyb) should these be handled as `-C linker-args="..."` instead?
@@ -576,8 +573,6 @@ impl CodegenArgs {
         // FIXME(eddyb) clean up this `no-` "negation prefix" situation.
         let run_spirv_opt = !matches.opt_present("no-spirv-opt");
 
-        let preserve_bindings = matches.opt_present("preserve-bindings");
-
         let relax_block_layout = if relax_block_layout { Some(true) } else { None };
 
         let spirv_metadata = match spirv_metadata.as_deref() {
@@ -607,6 +602,7 @@ impl CodegenArgs {
             early_report_zombies: !matches.opt_present("no-early-report-zombies"),
             infer_storage_classes: !matches.opt_present("no-infer-storage-classes"),
             structurize: !matches.opt_present("no-structurize"),
+            preserve_bindings: matches.opt_present("preserve-bindings"),
             spirt_passes: matches
                 .opt_strs("spirt-passes")
                 .iter()
@@ -656,8 +652,6 @@ impl CodegenArgs {
 
             run_spirv_opt,
 
-            preserve_bindings,
-
             linker_opts,
 
             // NOTE(eddyb) these are debugging options that used to be env vars

crates/rustc_codegen_spirv/src/link.rs

@@ -279,7 +279,7 @@ fn post_link_single_module(
     let opt_options = spirv_tools::opt::Options {
         validator_options: Some(val_options.clone()),
         max_id_bound: None,
-        preserve_bindings: cg_args.preserve_bindings,
+        preserve_bindings: cg_args.linker_opts.preserve_bindings,
         preserve_spec_constants: false,
     };
 

crates/rustc_codegen_spirv/src/linker/mod.rs

@@ -42,6 +42,7 @@ pub struct Options {
     pub early_report_zombies: bool,
     pub infer_storage_classes: bool,
     pub structurize: bool,
+    pub preserve_bindings: bool,
     pub spirt_passes: Vec<String>,
 
     pub abort_strategy: Option<String>,