Move Target::llvm_target to MaybeLazy

Author: Urgau

compiler/rustc_target/src/spec/mod.rs

@@ -1833,7 +1833,7 @@ impl TargetWarnings {
 #[derive(PartialEq, Clone, Debug)]
 pub struct Target {
     /// Target triple to pass to LLVM.
-    pub llvm_target: StaticCow<str>,
+    pub llvm_target: MaybeLazy<str>,
     /// Metadata about a target, for example the description or tier.
     /// Used for generating target documentation.
     pub metadata: TargetMetadata,
@@ -2685,7 +2685,7 @@ impl Target {
         };
 
         let mut base = Target {
-            llvm_target: get_req_field("llvm-target")?.into(),
+            llvm_target: MaybeLazy::owned(get_req_field("llvm-target")?),
             metadata: Default::default(),
             pointer_width: get_req_field("target-pointer-width")?
                 .parse::<u32>()

compiler/rustc_target/src/spec/targets/aarch64_apple_darwin.rs

@@ -17,7 +17,7 @@ pub fn target() -> Target {
         // Clang automatically chooses a more specific target based on
         // MACOSX_DEPLOYMENT_TARGET. To enable cross-language LTO to work
         // correctly, we do too.
-        llvm_target: macos_llvm_target(ARCH).into(),
+        llvm_target: MaybeLazy::lazy(|| macos_llvm_target(ARCH)),
         metadata: crate::spec::TargetMetadata {
             description: None,
             tier: None,

compiler/rustc_target/src/spec/targets/aarch64_apple_ios.rs

@@ -14,7 +14,7 @@ pub fn target() -> Target {
         // IPHONEOS_DEPLOYMENT_TARGET.
         // This is required for the target to pick the right
         // MACH-O commands, so we do too.
-        llvm_target: ios_llvm_target(ARCH).into(),
+        llvm_target: MaybeLazy::lazy(|| ios_llvm_target(ARCH)),
         metadata: crate::spec::TargetMetadata {
             description: None,
             tier: None,

compiler/rustc_target/src/spec/targets/aarch64_apple_ios_macabi.rs

@@ -10,7 +10,7 @@ pub fn target() -> Target {
     base.supported_sanitizers = SanitizerSet::ADDRESS | SanitizerSet::LEAK | SanitizerSet::THREAD;
 
     Target {
-        llvm_target: mac_catalyst_llvm_target(ARCH).into(),
+        llvm_target: MaybeLazy::lazy(|| mac_catalyst_llvm_target(ARCH)),
         metadata: crate::spec::TargetMetadata {
             description: None,
             tier: None,

compiler/rustc_target/src/spec/targets/aarch64_apple_ios_sim.rs

@@ -14,7 +14,7 @@ pub fn target() -> Target {
         // IPHONEOS_DEPLOYMENT_TARGET.
         // This is required for the simulator target to pick the right
         // MACH-O commands, so we do too.
-        llvm_target: ios_sim_llvm_target(ARCH).into(),
+        llvm_target: MaybeLazy::lazy(|| ios_sim_llvm_target(ARCH)),
         metadata: crate::spec::TargetMetadata {
             description: None,
             tier: None,

compiler/rustc_target/src/spec/targets/aarch64_apple_tvos.rs

@@ -7,7 +7,7 @@ pub fn target() -> Target {
     const ABI: TargetAbi = TargetAbi::Normal;
 
     Target {
-        llvm_target: tvos_llvm_target(ARCH).into(),
+        llvm_target: MaybeLazy::lazy(|| tvos_llvm_target(ARCH)),
         metadata: crate::spec::TargetMetadata {
             description: None,
             tier: None,

compiler/rustc_target/src/spec/targets/aarch64_apple_tvos_sim.rs

@@ -7,7 +7,7 @@ pub fn target() -> Target {
     const ABI: TargetAbi = TargetAbi::Normal;
 
     Target {
-        llvm_target: tvos_sim_llvm_target(ARCH).into(),
+        llvm_target: MaybeLazy::lazy(|| tvos_sim_llvm_target(ARCH)),
         metadata: crate::spec::TargetMetadata {
             description: None,
             tier: None,

compiler/rustc_target/src/spec/targets/aarch64_apple_visionos.rs

@@ -11,7 +11,7 @@ pub fn target() -> Target {
     base.supported_sanitizers = SanitizerSet::ADDRESS | SanitizerSet::THREAD;
 
     Target {
-        llvm_target: visionos_llvm_target(ARCH).into(),
+        llvm_target: MaybeLazy::lazy(|| visionos_llvm_target(ARCH)),
         metadata: crate::spec::TargetMetadata {
             description: Some("ARM64 Apple visionOS".into()),
             tier: Some(3),

compiler/rustc_target/src/spec/targets/aarch64_apple_visionos_sim.rs

@@ -10,7 +10,7 @@ pub fn target() -> Target {
     base.supported_sanitizers = SanitizerSet::ADDRESS | SanitizerSet::THREAD;
 
     Target {
-        llvm_target: visionos_sim_llvm_target(ARCH).into(),
+        llvm_target: MaybeLazy::lazy(|| visionos_sim_llvm_target(ARCH)),
         metadata: crate::spec::TargetMetadata {
             description: Some("ARM64 Apple visionOS simulator".into()),
             tier: Some(3),

compiler/rustc_target/src/spec/targets/aarch64_apple_watchos_sim.rs

@@ -11,7 +11,7 @@ pub fn target() -> Target {
         // WATCHOS_DEPLOYMENT_TARGET.
         // This is required for the simulator target to pick the right
         // MACH-O commands, so we do too.
-        llvm_target: watchos_sim_llvm_target(ARCH).into(),
+        llvm_target: MaybeLazy::lazy(|| watchos_sim_llvm_target(ARCH)),
         metadata: crate::spec::TargetMetadata {
             description: None,
             tier: None,