The env of rustc_session::Session's target options is an enum now. Arch::Unknown was renamed Arch::Other

Author: dvdplm

crates/rustc_codegen_spirv/src/link.rs

@@ -30,6 +30,7 @@ use std::io::{BufWriter, Read};
 use std::iter;
 use std::path::{Path, PathBuf};
 use std::sync::Arc;
+use std::str::FromStr;
 
 pub fn link(
     sess: &Session,
@@ -334,8 +335,10 @@ fn do_spirv_opt(
         error,
         opt::{self, Optimizer},
     };
+    use spirv_tools::TargetEnv;
 
-    let mut optimizer = opt::create(sess.target.options.env.parse().ok());
+    let target_env = TargetEnv::from_str(sess.target.options.env.desc()).ok();
+    let mut optimizer = opt::create(target_env);
 
     match sess.opts.optimize {
         OptLevel::No => {}
@@ -395,9 +398,10 @@ fn do_spirv_val(
     filename: &Path,
     options: spirv_tools::val::ValidatorOptions,
 ) {
-    use spirv_tools::val::{self, Validator};
+    use spirv_tools::{TargetEnv, val::{self, Validator}};
 
-    let validator = val::create(sess.target.options.env.parse().ok());
+    let target_env = TargetEnv::from_str(sess.target.options.env.desc()).ok();
+    let validator = val::create(target_env);
 
     if let Err(e) = validator.validate(spv_binary, Some(options)) {
         let mut err = sess.dcx().struct_err(e.to_string());

crates/rustc_codegen_spirv/src/target.rs

@@ -1,5 +1,5 @@
 use rspirv::spirv::MemoryModel;
-use rustc_target::spec::{Cc, LinkerFlavor, PanicStrategy, Target, TargetOptions, Arch};
+use rustc_target::spec::{Arch, Cc, LinkerFlavor, PanicStrategy, Target, TargetOptions};
 use spirv_tools::TargetEnv;
 
 const ARCH: &str = "spirv";
@@ -61,10 +61,13 @@ impl SpirvTarget {
         o.emit_debug_gdb_scripts = false;
         o.linker_flavor = LinkerFlavor::Unix(Cc::No);
         o.panic_strategy = PanicStrategy::Abort;
-        o.env = self.env.to_string().into();
-        o.vendor = self.vendor.clone().into();
+         // FIXME: this is problematic I believe. Used to be a `Cow` but is now an enum.
+        o.env = rustc_target::spec::Env::Unspecified;
         // TODO: Investigate if main_needs_argc_argv is useful (for building exes)
         o.main_needs_argc_argv = false;
+
+        // FIXME: Should use `o.is_like_gpu = true;`? This changed in https://github.com/rust-lang/rust/pull/148760
+
         o
     }
 
@@ -74,7 +77,7 @@ impl SpirvTarget {
             metadata: Default::default(),
             pointer_width: 32,
             data_layout: "e-m:e-p:32:32:32-i64:64-n8:16:32:64".into(),
-            arch: Arch::Unknown(ARCH.into()),
+            arch: Arch::Other(ARCH.into()),
             options: self.init_target_opts(),
         }
     }