compiler: intern architecture at compile time

Author: tamird

compiler/rustc_codegen_llvm/src/llvm_util.rs

@@ -621,7 +621,9 @@ fn llvm_features_by_flags(sess: &Session, features: &mut Vec<String>) {
     // -Zfixed-x18
     if sess.opts.unstable_opts.fixed_x18 {
         if sess.target.arch != Architecture::AArch64 {
-            sess.dcx().emit_fatal(errors::FixedX18InvalidArch { arch: sess.target.arch.as_str() });
+            sess.dcx().emit_fatal(errors::FixedX18InvalidArch {
+                arch: sess.target.arch.desc_symbol().as_str(),
+            });
         } else {
             features.push("+reserve-x18".into());
         }

compiler/rustc_codegen_ssa/src/back/link.rs

@@ -882,9 +882,11 @@ fn link_natively(
                     // four digit numbers in the range 1000 to 9999 inclusive
                     if is_msvc_link_exe && (code < 1000 || code > 9999) {
                         let is_vs_installed = find_msvc_tools::find_vs_version().is_ok();
-                        let has_linker =
-                            find_msvc_tools::find_tool(sess.target.arch.as_str(), "link.exe")
-                                .is_some();
+                        let has_linker = find_msvc_tools::find_tool(
+                            sess.target.arch.desc_symbol().as_str(),
+                            "link.exe",
+                        )
+                        .is_some();
 
                         sess.dcx().emit_note(errors::LinkExeUnexpectedError);
 

compiler/rustc_codegen_ssa/src/back/linker.rs

@@ -53,7 +53,7 @@ pub(crate) fn get_linker<'a>(
     target_cpu: &'a str,
     codegen_backend: &'static str,
 ) -> Box<dyn Linker + 'a> {
-    let msvc_tool = find_msvc_tools::find_tool(sess.target.arch.as_str(), "link.exe");
+    let msvc_tool = find_msvc_tools::find_tool(sess.target.arch.desc_symbol().as_str(), "link.exe");
 
     // If our linker looks like a batch script on Windows then to execute this
     // we'll need to spawn `cmd` explicitly. This is primarily done to handle

compiler/rustc_session/src/config/cfg.rs

@@ -240,7 +240,7 @@ pub(crate) fn default_configuration(sess: &Session) -> Cfg {
     }
 
     ins_str!(sym::target_abi, &sess.target.abi);
-    ins_str!(sym::target_arch, sess.target.arch.as_str());
+    ins_sym!(sym::target_arch, sess.target.arch.desc_symbol());
     ins_str!(sym::target_endian, sess.target.endian.as_str());
     ins_str!(sym::target_env, &sess.target.env);
 
@@ -448,7 +448,7 @@ impl CheckCfg {
 
                 for target in Target::builtins().chain(iter::once(current_target.clone())) {
                     values_target_abi.insert(Symbol::intern(&target.options.abi));
-                    values_target_arch.insert(Symbol::intern(target.arch.as_str()));
+                    values_target_arch.insert(target.arch.desc_symbol());
                     values_target_endian.insert(Symbol::intern(target.options.endian.as_str()));
                     values_target_env.insert(Symbol::intern(&target.options.env));
                     values_target_family.extend(

compiler/rustc_span/src/symbol.rs

@@ -400,6 +400,7 @@ symbols! {
         _t,
         _task_context,
         a32,
+        aarch64,
         aarch64_target_feature,
         aarch64_unstable_target_feature,
         aarch64_ver_target_feature,
@@ -449,6 +450,7 @@ symbols! {
         altivec,
         alu32,
         always,
+        amdgpu,
         analysis,
         and,
         and_then,
@@ -466,6 +468,7 @@ symbols! {
         args,
         arith_offset,
         arm,
+        arm64ec,
         arm_target_feature,
         array,
         as_dash_needed: "as-needed",
@@ -554,6 +557,7 @@ symbols! {
         autodiff_reverse,
         automatically_derived,
         available_externally,
+        avr,
         avx,
         avx10_target_feature,
         avx512_target_feature,
@@ -586,6 +590,7 @@ symbols! {
         box_patterns,
         box_syntax,
         boxed_slice,
+        bpf,
         bpf_target_feature,
         braced_empty_structs,
         branch,
@@ -790,6 +795,7 @@ symbols! {
         crate_type,
         crate_visibility_modifier,
         crt_dash_static: "crt-static",
+        csky,
         csky_target_feature,
         cstr_type,
         cstring_as_c_str,
@@ -1156,6 +1162,7 @@ symbols! {
         hashset_drain_ty,
         hashset_iter,
         hashset_iter_ty,
+        hexagon,
         hexagon_target_feature,
         hidden,
         hide,
@@ -1342,11 +1349,14 @@ symbols! {
         logf32,
         logf64,
         logf128,
+        loongarch32,
+        loongarch64,
         loongarch_target_feature,
         loop_break_value,
         loop_match,
         lr,
         lt,
+        m68k,
         m68k_target_feature,
         macro_at_most_once_rep,
         macro_attr,
@@ -1420,6 +1430,10 @@ symbols! {
         minnumf32,
         minnumf64,
         minnumf128,
+        mips,
+        mips32r6,
+        mips64,
+        mips64r6,
         mips_target_feature,
         mir_assume,
         mir_basic_block,
@@ -1468,6 +1482,7 @@ symbols! {
         move_ref_pattern,
         move_size_limit,
         movrs_target_feature,
+        msp430,
         mul,
         mul_assign,
         mul_with_overflow,
@@ -1554,6 +1569,7 @@ symbols! {
         not,
         notable_trait,
         note,
+        nvptx64,
         nvptx_target_feature,
         object_safe_for_dispatch,
         of,
@@ -1678,6 +1694,9 @@ symbols! {
         post_cleanup: "post-cleanup",
         post_dash_lto: "post-lto",
         postfix_match,
+        powerpc,
+        powerpc64,
+        powerpc64le,
         powerpc_target_feature,
         powf16,
         powf32,
@@ -1825,6 +1844,8 @@ symbols! {
         resume,
         return_position_impl_trait_in_trait,
         return_type_notation,
+        riscv32,
+        riscv64,
         riscv_target_feature,
         rlib,
         ropi,
@@ -1971,6 +1992,7 @@ symbols! {
         rvalue_static_promotion,
         rwpi,
         s,
+        s390x,
         s390x_target_feature,
         safety,
         sanitize,
@@ -2099,9 +2121,12 @@ symbols! {
         slice_patterns,
         slicing_syntax,
         soft,
+        sparc,
+        sparc64,
         sparc_target_feature,
         specialization,
         speed,
+        spirv,
         spotlight,
         sqrtf16,
         sqrtf32,
@@ -2415,6 +2440,8 @@ symbols! {
         vtable_size,
         warn,
         wasip2,
+        wasm32,
+        wasm64,
         wasm_abi,
         wasm_import_module,
         wasm_target_feature,
@@ -2441,12 +2468,15 @@ symbols! {
         write_str,
         write_via_move,
         writeln_macro,
+        x86,
+        x86_64,
         x86_amx_intrinsics,
         x87_reg,
         x87_target_feature,
         xer,
         xmm_reg,
         xop_target_feature,
+        xtensa,
         yeet_desugar_details,
         yeet_expr,
         yes,

compiler/rustc_target/src/spec/mod.rs

@@ -1877,46 +1877,46 @@ pub enum Architecture {
 }
 
 impl Architecture {
-    pub fn as_str(&self) -> &'static str {
+    pub const fn desc_symbol(&self) -> Symbol {
         match self {
-            Self::AArch64 => "aarch64",
-            Self::AmdGpu => "amdgpu",
-            Self::Arm => "arm",
-            Self::Arm64EC => "arm64ec",
-            Self::Avr => "avr",
-            Self::Bpf => "bpf",
-            Self::CSKY => "csky",
-            Self::Hexagon => "hexagon",
-            Self::LoongArch32 => "loongarch32",
-            Self::LoongArch64 => "loongarch64",
-            Self::M68k => "m68k",
-            Self::Mips => "mips",
-            Self::Mips32r6 => "mips32r6",
-            Self::Mips64 => "mips64",
-            Self::Mips64r6 => "mips64r6",
-            Self::Msp430 => "msp430",
-            Self::Nvptx64 => "nvptx64",
-            Self::PowerPC => "powerpc",
-            Self::PowerPC64 => "powerpc64",
-            Self::PowerPC64LE => "powerpc64le",
-            Self::RiscV32 => "riscv32",
-            Self::RiscV64 => "riscv64",
-            Self::S390x => "s390x",
-            Self::Sparc => "sparc",
-            Self::Sparc64 => "sparc64",
-            Self::SpirV => "spirv",
-            Self::Wasm32 => "wasm32",
-            Self::Wasm64 => "wasm64",
-            Self::X86 => "x86",
-            Self::X86_64 => "x86_64",
-            Self::Xtensa => "xtensa",
+            Self::AArch64 => sym::aarch64,
+            Self::AmdGpu => sym::amdgpu,
+            Self::Arm => sym::arm,
+            Self::Arm64EC => sym::arm64ec,
+            Self::Avr => sym::avr,
+            Self::Bpf => sym::bpf,
+            Self::CSKY => sym::csky,
+            Self::Hexagon => sym::hexagon,
+            Self::LoongArch32 => sym::loongarch32,
+            Self::LoongArch64 => sym::loongarch64,
+            Self::M68k => sym::m68k,
+            Self::Mips => sym::mips,
+            Self::Mips32r6 => sym::mips32r6,
+            Self::Mips64 => sym::mips64,
+            Self::Mips64r6 => sym::mips64r6,
+            Self::Msp430 => sym::msp430,
+            Self::Nvptx64 => sym::nvptx64,
+            Self::PowerPC => sym::powerpc,
+            Self::PowerPC64 => sym::powerpc64,
+            Self::PowerPC64LE => sym::powerpc64le,
+            Self::RiscV32 => sym::riscv32,
+            Self::RiscV64 => sym::riscv64,
+            Self::S390x => sym::s390x,
+            Self::Sparc => sym::sparc,
+            Self::Sparc64 => sym::sparc64,
+            Self::SpirV => sym::spirv,
+            Self::Wasm32 => sym::wasm32,
+            Self::Wasm64 => sym::wasm64,
+            Self::X86 => sym::x86,
+            Self::X86_64 => sym::x86_64,
+            Self::Xtensa => sym::xtensa,
         }
     }
 }
 
 impl fmt::Display for Architecture {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.write_str(self.as_str())
+        f.write_str(self.desc_symbol().as_str())
     }
 }
 
@@ -1965,7 +1965,7 @@ pub struct TargetMetadata {
 
 impl ToJson for Architecture {
     fn to_json(&self) -> Json {
-        self.as_str().to_json()
+        self.desc_symbol().as_str().to_json()
     }
 }