PR feedback: Use target_env

Author: jchlanda

compiler/rustc_codegen_llvm/src/attributes.rs

@@ -10,7 +10,7 @@ use rustc_session::config::{BranchProtection, FunctionReturn, OptLevel, PAuthKey
 use rustc_span::sym;
 use rustc_symbol_mangling::mangle_internal_symbol;
 use rustc_target::spec::{
-    Arch, CfgAbi, FramePointer, SanitizerSet, StackProbeType, StackProtector,
+    Arch, FramePointer, LlvmAbi, SanitizerSet, StackProbeType, StackProtector,
 };
 use smallvec::SmallVec;
 
@@ -611,7 +611,7 @@ pub(crate) fn llfn_attrs_from_instance<'ll, 'tcx>(
         }
     }
 
-    if sess.target.cfg_abi == CfgAbi::Pauthtest {
+    if sess.target.llvm_abiname == LlvmAbi::Pauthtest {
         for &ptrauth_attr in pauth_fn_attrs() {
             to_add.push(llvm::CreateAttrString(cx.llcx, ptrauth_attr));
         }

compiler/rustc_codegen_llvm/src/base.rs

@@ -25,7 +25,7 @@ use rustc_middle::mono::Visibility;
 use rustc_middle::ty::TyCtxt;
 use rustc_session::config::{DebugInfo, Offload};
 use rustc_span::Symbol;
-use rustc_target::spec::{CfgAbi, SanitizerSet};
+use rustc_target::spec::{LlvmAbi, SanitizerSet};
 
 use super::ModuleLlvm;
 use crate::attributes;
@@ -131,7 +131,7 @@ pub(crate) fn compile_codegen_unit(
                 // FIXME(jchlanda) If it ever becomes necessary to ensure that all compiler
                 // generated functions receive the ptrauth-* attributes, `declare_fn` or
                 // `declare_raw_fn` could be used to provide those.
-                if cx.sess().target.cfg_abi == CfgAbi::Pauthtest {
+                if cx.sess().target.llvm_abiname == LlvmAbi::Pauthtest {
                     for &ptrauth_attr in pauth_fn_attrs() {
                         attrs.push(llvm::CreateAttrString(cx.llcx, ptrauth_attr));
                     }
@@ -152,7 +152,7 @@ pub(crate) fn compile_codegen_unit(
                 cx.add_objc_module_flags();
             }
 
-            if cx.sess().target.cfg_abi == CfgAbi::Pauthtest {
+            if cx.sess().target.llvm_abiname == LlvmAbi::Pauthtest {
                 // FIXME(jchlanda): In LLVM/Clang, there are also `aarch64-elf-pauthabi-platform`
                 // and `aarch64-elf-pauthabi-version` module flags. These are emitted into the
                 // PAuth core info section of the resulting ELF, which the linker uses to enforce

compiler/rustc_codegen_llvm/src/builder.rs

@@ -25,7 +25,7 @@ use rustc_sanitizers::{cfi, kcfi};
 use rustc_session::config::OptLevel;
 use rustc_span::Span;
 use rustc_target::callconv::{FnAbi, PassMode};
-use rustc_target::spec::{Arch, CfgAbi, HasTargetSpec, SanitizerSet, Target};
+use rustc_target::spec::{Arch, HasTargetSpec, LlvmAbi, SanitizerSet, Target};
 use smallvec::SmallVec;
 use tracing::{debug, instrument};
 
@@ -1992,7 +1992,7 @@ impl<'a, 'll, 'tcx> Builder<'a, 'll, 'tcx> {
         llfn: &'ll Value,
         fn_abi: Option<&FnAbi<'tcx, Ty<'tcx>>>,
     ) -> Option<llvm::OperandBundleBox<'ll>> {
-        if self.sess().target.cfg_abi != CfgAbi::Pauthtest {
+        if self.sess().target.llvm_abiname != LlvmAbi::Pauthtest {
             return None;
         }
         // Pointer authentication support is currently limited to extern "C" calls; filter out other

compiler/rustc_codegen_llvm/src/common.rs

@@ -16,7 +16,7 @@ use rustc_middle::bug;
 use rustc_middle::mir::interpret::{GlobalAlloc, PointerArithmetic, Scalar};
 use rustc_middle::ty::{Instance, TyCtxt};
 use rustc_session::cstore::DllImport;
-use rustc_target::spec::CfgAbi;
+use rustc_target::spec::LlvmAbi;
 use tracing::debug;
 
 use crate::consts::{IsInitOrFini, IsStatic, const_alloc_to_llvm};
@@ -46,7 +46,7 @@ pub(crate) fn maybe_sign_fn_ptr<'ll, 'tcx>(
     llfn: &'ll llvm::Value,
     pac: PacMetadata,
 ) -> &'ll llvm::Value {
-    if cx.sess().target.cfg_abi != CfgAbi::Pauthtest {
+    if cx.sess().target.llvm_abiname != LlvmAbi::Pauthtest {
         return llfn;
     }
 

compiler/rustc_codegen_llvm/src/consts.rs

@@ -17,7 +17,7 @@ use rustc_middle::ty::layout::{HasTypingEnv, LayoutOf};
 use rustc_middle::ty::{self, Instance};
 use rustc_middle::{bug, span_bug};
 use rustc_span::Symbol;
-use rustc_target::spec::{Arch, CfgAbi};
+use rustc_target::spec::{Arch, LlvmAbi};
 use tracing::{debug, instrument, trace};
 
 use crate::common::CodegenCx;
@@ -123,7 +123,7 @@ pub(crate) fn const_alloc_to_llvm<'ll>(
         // Under pointer authentication, function pointers stored in init/fini arrays need special
         // handling.
         let pac_metadata = Some(
-            if cx.sess().target.cfg_abi == CfgAbi::Pauthtest
+            if cx.sess().target.llvm_abiname == LlvmAbi::Pauthtest
                 && matches!(is_init_fini, IsInitOrFini::Yes)
             {
                 PacMetadata {
@@ -221,7 +221,7 @@ fn check_and_apply_linkage<'ll, 'tcx>(
                 let fn_sig = sig.with(*header);
                 let fn_abi = cx.fn_abi_of_fn_ptr(fn_sig, ty::List::empty());
                 // Decide if the initializer needs to be signed
-                if cx.sess().target.cfg_abi == CfgAbi::Pauthtest
+                if cx.sess().target.llvm_abiname == LlvmAbi::Pauthtest
                     && matches!(fn_sig.abi(), ExternAbi::C { .. } | ExternAbi::System { .. })
                 {
                     should_sign = true;

compiler/rustc_codegen_llvm/src/intrinsic.rs

@@ -28,7 +28,7 @@ use rustc_session::lint::builtin::DEPRECATED_LLVM_INTRINSIC;
 use rustc_span::{ErrorGuaranteed, Span, Symbol, sym};
 use rustc_symbol_mangling::{mangle_internal_symbol, symbol_name_for_instance_in_crate};
 use rustc_target::callconv::PassMode;
-use rustc_target::spec::{Arch, CfgAbi};
+use rustc_target::spec::{Arch, LlvmAbi};
 use tracing::debug;
 
 use crate::abi::FnAbiLlvmExt;
@@ -1706,7 +1706,7 @@ fn get_rust_try_fn<'a, 'll, 'tcx>(
         hir::Safety::Unsafe,
     ));
     let rust_try = gen_fn(cx, "__rust_try", rust_fn_sig, codegen);
-    if cx.sess().target.cfg_abi == CfgAbi::Pauthtest {
+    if cx.sess().target.llvm_abiname == LlvmAbi::Pauthtest {
         let attrs: Vec<&Attribute> =
             pauth_fn_attrs().iter().map(|name| llvm::CreateAttrString(cx.llcx, name)).collect();
         let (_ty, rust_try_fn) = rust_try;

compiler/rustc_target/src/spec/mod.rs

@@ -2114,6 +2114,8 @@ crate::target_spec_enum! {
         // PowerPC
         ElfV1 = "elfv1",
         ElfV2 = "elfv2",
+        // Pointer authentication: Pauthtest
+        Pauthtest = "pauthtest",
 
         Unspecified = "",
     }
@@ -3396,9 +3398,10 @@ impl Target {
                 )
             }
             Arch::AArch64 => {
-                check!(
-                    self.llvm_abiname == LlvmAbi::Unspecified,
-                    "`llvm_abiname` is unused on aarch64"
+                check_matches!(
+                    self.llvm_abiname,
+                    LlvmAbi::Unspecified | LlvmAbi::Pauthtest,
+                    "invalid llvm ABI for aarch64"
                 );
                 check!(self.llvm_floatabi.is_none(), "`llvm_floatabi` is unused on aarch64");
                 // FIXME: Ensure that target_abi = "ilp32" correlates with actually using that ABI.

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

@@ -1,5 +1,5 @@
 use crate::spec::{
-    Arch, CfgAbi, Env, FramePointer, LinkSelfContainedDefault, StackProbeType, Target,
+    Arch, CfgAbi, Env, FramePointer, LinkSelfContainedDefault, LlvmAbi, StackProbeType, Target,
     TargetMetadata, TargetOptions, base,
 };
 
@@ -19,6 +19,7 @@ pub(crate) fn target() -> Target {
         options: TargetOptions {
             env: Env::Musl,
             cfg_abi: CfgAbi::Pauthtest,
+            llvm_abiname: LlvmAbi::Pauthtest,
             // `pauthtest` requires v8.3a, which includes lse, no need for outline-atomics
             features: "+v8.3a,+pauth".into(),
             max_atomic_width: Some(128),