sess: -Tpointer-authentication (again)

Author: davidtwco

compiler/rustc_session/src/options.rs

@@ -270,6 +270,7 @@ pub enum TargetModifierValue {
     String(String),
     BranchProtection(BranchProtection),
     Sanitizers(SanitizerSet),
+    PointerAuthentication(Vec<(PointerAuthOption, bool)>),
 }
 
 impl fmt::Display for TargetModifierValue {
@@ -281,6 +282,14 @@ impl fmt::Display for TargetModifierValue {
             Self::String(val) => write!(f, "={val}"),
             Self::BranchProtection(val) => write!(f, "={val}"),
             Self::Sanitizers(val) => write!(f, "={val}"),
+            Self::PointerAuthentication(vals) => {
+                let mut parts = Vec::new();
+                for (opt, pos) in vals {
+                    let polarity = if *pos { "+" } else { "-" };
+                    parts.push(format!("{polarity}{opt}"));
+                }
+                write!(f, "={}", parts.join(","))
+            }
         }
     }
 }
@@ -301,6 +310,7 @@ noop_target_modifier_ty!(
     // tidy-alphabetical-start
     SanitizerSet => Self::Sanitizers,
     String => Self::String,
+    Vec<(PointerAuthOption, bool)> => Self::PointerAuthentication,
     bool => Self::Bool,
     u32 => Self::U32,
     usize => Self::Usize,
@@ -2537,6 +2547,25 @@ options! {
         "panic strategy to compile crate with"),
     passes: Vec<String> = (Vec::new(), parse_list, [TRACKED],
         "a list of extra LLVM passes to run (space separated)"),
+    pointer_authentication: Vec<(PointerAuthOption, bool)> = (
+        Vec::new(),
+        parse_pointer_authentication_list_with_polarity,
+        [TRACKED_UNSTABLE] { TARGET_MODIFIER: Only },
+        "A comma-separated list of pointer authentication options, each prefixed with `+` (enable) or `-` (disable). Available options:
+        `aarch64-jump-table-hardening` - enable hardened lowering for jump-table dispatch
+        `auth-traps` - trap immediately on pointer authentication failure
+        `calls` - enable signing and authentication of all indirect calls
+        `elf-got` - enable authentication of pointers from GOT (ELF only)
+        `function-pointer-type-discrimination` - enable type discrimination on C function pointers
+        `indirect-gotos` - enable signing and authentication of indirect goto targets
+        `init-fini` - enable signing of function pointers in init/fini arrays
+        `init-fini-address-discrimination` - enable address discrimination in init/fini arrays
+        `intrinsics` - pointer authentication intrinsics
+        `return-addresses` - enable signing and authentication of return addresses
+        `typeinfo-vt-ptr-discrimination - incorporate type and address discrimination in authenticated vtable pointers for std::type_info
+        `vt-ptr-addr-discrimination - incorporate address discrimination in authenticated vtable pointers
+        `vt-ptr-type-discrimination - incorporate type discrimination in authenticated vtable pointers
+        Example: `-Zpointer-authentication=+calls,-init-fini`."),
     prefer_dynamic: bool = (false, parse_bool, [TRACKED],
         "prefer dynamic linking to static linking (default: no)"),
     profile_generate: SwitchWithOptPath = (SwitchWithOptPath::Disabled,

compiler/rustc_session/src/session.rs

@@ -1355,7 +1355,7 @@ pub fn build_session(
     let timings = TimingSectionHandler::new(sopts.json_timings);
 
     let pointer_auth_config: Option<PointerAuthConfig> =
-        PointerAuthConfig::from_raw(&sopts.target_opts.pointer_authentication, &target);
+        PointerAuthConfig::from_raw(&sopts.cg.pointer_authentication, &target);
 
     let sess = Session {
         target,
@@ -1437,9 +1437,7 @@ fn validate_commandline_args_with_session_available(sess: &Session) {
         );
     }
 
-    if sess.target.cfg_abi != CfgAbi::Pauthtest
-        && !sess.opts.target_opts.pointer_authentication.is_empty()
-    {
+    if sess.target.cfg_abi != CfgAbi::Pauthtest && !sess.opts.cg.pointer_authentication.is_empty() {
         sess.dcx().emit_warn(diagnostics::PointerAuthenticationNotSupportedForTarget {
             target_triple: &sess.opts.target_triple,
         });

tests/ui/pointer_authentication/enable_pointer_authentication_validation.all_unknown.stderr

@@ -1,2 +1,2 @@
-error: incorrect value `+I,+do,-not,-exist` for target option `pointer-authentication` - a comma-separated list of options, each of the form `+<name>` or `-<name>`, where `<name>` is one of: `aarch64-jump-table-hardening`, `auth-traps`, `calls`, `elf-got`, `function-pointer-type-discrimination`, `indirect-gotos`, `init-fini`, `init-fini-address-discrimination`, `intrinsics`, `return-addresses`, `typeinfo-vt-ptr-discrimination`, `vt-ptr-addr-discrimination` or `vt-ptr-type-discrimination` was expected
+error: incorrect value `+I,+do,-not,-exist` for codegen option `pointer-authentication` - a comma-separated list of options, each of the form `+<name>` or `-<name>`, where `<name>` is one of: `aarch64-jump-table-hardening`, `auth-traps`, `calls`, `elf-got`, `function-pointer-type-discrimination`, `indirect-gotos`, `init-fini`, `init-fini-address-discrimination`, `intrinsics`, `return-addresses`, `typeinfo-vt-ptr-discrimination`, `vt-ptr-addr-discrimination` or `vt-ptr-type-discrimination` was expected
 

tests/ui/pointer_authentication/enable_pointer_authentication_validation.empty.stderr

@@ -1,2 +1,2 @@
-error: incorrect value `` for target option `pointer-authentication` - a comma-separated list of options, each of the form `+<name>` or `-<name>`, where `<name>` is one of: `aarch64-jump-table-hardening`, `auth-traps`, `calls`, `elf-got`, `function-pointer-type-discrimination`, `indirect-gotos`, `init-fini`, `init-fini-address-discrimination`, `intrinsics`, `return-addresses`, `typeinfo-vt-ptr-discrimination`, `vt-ptr-addr-discrimination` or `vt-ptr-type-discrimination` was expected
+error: incorrect value `` for codegen option `pointer-authentication` - a comma-separated list of options, each of the form `+<name>` or `-<name>`, where `<name>` is one of: `aarch64-jump-table-hardening`, `auth-traps`, `calls`, `elf-got`, `function-pointer-type-discrimination`, `indirect-gotos`, `init-fini`, `init-fini-address-discrimination`, `intrinsics`, `return-addresses`, `typeinfo-vt-ptr-discrimination`, `vt-ptr-addr-discrimination` or `vt-ptr-type-discrimination` was expected
 

tests/ui/pointer_authentication/enable_pointer_authentication_validation.mixed.stderr

@@ -1,2 +1,2 @@
-error: incorrect value `+elf-got,-imaginary` for target option `pointer-authentication` - a comma-separated list of options, each of the form `+<name>` or `-<name>`, where `<name>` is one of: `aarch64-jump-table-hardening`, `auth-traps`, `calls`, `elf-got`, `function-pointer-type-discrimination`, `indirect-gotos`, `init-fini`, `init-fini-address-discrimination`, `intrinsics`, `return-addresses`, `typeinfo-vt-ptr-discrimination`, `vt-ptr-addr-discrimination` or `vt-ptr-type-discrimination` was expected
+error: incorrect value `+elf-got,-imaginary` for codegen option `pointer-authentication` - a comma-separated list of options, each of the form `+<name>` or `-<name>`, where `<name>` is one of: `aarch64-jump-table-hardening`, `auth-traps`, `calls`, `elf-got`, `function-pointer-type-discrimination`, `indirect-gotos`, `init-fini`, `init-fini-address-discrimination`, `intrinsics`, `return-addresses`, `typeinfo-vt-ptr-discrimination`, `vt-ptr-addr-discrimination` or `vt-ptr-type-discrimination` was expected
 

tests/ui/pointer_authentication/enable_pointer_authentication_validation.rs

@@ -19,7 +19,7 @@
 #![no_main]
 #![no_core]
 
-//[empty]~? ERROR incorrect value `` for target option `pointer-authentication`
-//[unprefixed]~? ERROR incorrect value `auth-traps` for target option `pointer-authentication`
-//[all_unknown]~? ERROR incorrect value `+I,+do,-not,-exist` for target option `pointer-authentication`
-//[mixed]~? ERROR incorrect value `+elf-got,-imaginary` for target option `pointer-authentication`
+//[empty]~? ERROR incorrect value `` for codegen option `pointer-authentication`
+//[unprefixed]~? ERROR incorrect value `auth-traps` for codegen option `pointer-authentication`
+//[all_unknown]~? ERROR incorrect value `+I,+do,-not,-exist` for codegen option `pointer-authentication`
+//[mixed]~? ERROR incorrect value `+elf-got,-imaginary` for codegen option `pointer-authentication`

tests/ui/pointer_authentication/enable_pointer_authentication_validation.unprefixed.stderr

@@ -1,2 +1,2 @@
-error: incorrect value `auth-traps` for target option `pointer-authentication` - a comma-separated list of options, each of the form `+<name>` or `-<name>`, where `<name>` is one of: `aarch64-jump-table-hardening`, `auth-traps`, `calls`, `elf-got`, `function-pointer-type-discrimination`, `indirect-gotos`, `init-fini`, `init-fini-address-discrimination`, `intrinsics`, `return-addresses`, `typeinfo-vt-ptr-discrimination`, `vt-ptr-addr-discrimination` or `vt-ptr-type-discrimination` was expected
+error: incorrect value `auth-traps` for codegen option `pointer-authentication` - a comma-separated list of options, each of the form `+<name>` or `-<name>`, where `<name>` is one of: `aarch64-jump-table-hardening`, `auth-traps`, `calls`, `elf-got`, `function-pointer-type-discrimination`, `indirect-gotos`, `init-fini`, `init-fini-address-discrimination`, `intrinsics`, `return-addresses`, `typeinfo-vt-ptr-discrimination`, `vt-ptr-addr-discrimination` or `vt-ptr-type-discrimination` was expected