Skip to content

rustc_target: Begin unifying Arch enum #142775

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

rustc_target: Begin unifying Arch enum #142775

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d384801
rustc_target: Create hoisted Arch enum
workingjubilee Jun 20, 2025
d0c11cd
rustc_target: hoist Apple impl into using shared Arch
workingjubilee Jun 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
80 changes: 39 additions & 41 deletions compiler/rustc_target/src/spec/base/apple/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,73 +11,71 @@ use crate::spec::{

#[cfg(test)]
mod tests;

use Arch::*;
#[allow(non_camel_case_types)]
#[derive(Copy, Clone, PartialEq)]
pub(crate) enum Arch {
Armv7k,
Armv7s,
Arm64,
Arm64e,
Arm64_32,
I386,
I686,
X86_64,
X86_64h,
}

use crate::spec::Aarch64Ver::{_32, E, V8A};
pub(crate) use crate::spec::Arch;
use crate::spec::ArmVer::{V7K, V7S};
use crate::spec::Ix86::{AppleI386, ClangI686};
use crate::spec::X86_64Ver::{Haswell, X64};

impl Arch {
fn target_name(self) -> &'static str {
match self {
Armv7k => "armv7k",
Armv7s => "armv7s",
Arm64 => "arm64",
Arm64e => "arm64e",
Arm64_32 => "arm64_32",
I386 => "i386",
I686 => "i686",
X86_64 => "x86_64",
X86_64h => "x86_64h",
Arm(V7K) => "armv7k",
Arm(V7S) => "armv7s",
Aarch64(V8A) => "arm64",
Aarch64(E) => "arm64e",
Aarch64(_32) => "arm64_32",
X86_32(AppleI386) => "i386",
X86_32(ClangI686) => "i686",
X86_64(Haswell) => "x86_64h",
X86_64(..) => "x86_64",
_ => panic!(),
}
}

pub(crate) fn target_arch(self) -> Cow<'static, str> {
Cow::Borrowed(match self {
Armv7k | Armv7s => "arm",
Arm64 | Arm64e | Arm64_32 => "aarch64",
I386 | I686 => "x86",
X86_64 | X86_64h => "x86_64",
Arm(..) => "arm",
Aarch64(..) => "aarch64",
X86_32(..) => "x86",
X86_64(..) => "x86_64",
})
}

fn target_cpu(self, abi: TargetAbi) -> &'static str {
match self {
Armv7k => "cortex-a8",
Armv7s => "swift", // iOS 10 is only supported on iPhone 5 or higher.
Arm64 => match abi {
Arm(V7K) => "cortex-a8",
Arm(V7S) => "swift",
Aarch64(V8A) => match abi {
TargetAbi::Normal => "apple-a7",
TargetAbi::Simulator => "apple-a12",
TargetAbi::MacCatalyst => "apple-a12",
},
Arm64e => "apple-a12",
Arm64_32 => "apple-s4",
Aarch64(E) => "apple-a12",
Aarch64(_32) => "apple-s4",
// Only macOS 10.12+ is supported, which means
// all x86_64/x86 CPUs must be running at least penryn
// https://github.com/llvm/llvm-project/blob/01f924d0e37a5deae51df0d77e10a15b63aa0c0f/clang/lib/Driver/ToolChains/Arch/X86.cpp#L79-L82
I386 | I686 => "penryn",
X86_64 => "penryn",
X86_32(AppleI386) | X86_32(ClangI686) => "penryn",
X86_64(X64) => "penryn",
// Note: `core-avx2` is slightly more advanced than `x86_64h`, see
// comments (and disabled features) in `x86_64h_apple_darwin` for
// details. It is a higher baseline then `penryn` however.
X86_64h => "core-avx2",
X86_64(Haswell) => "core-avx2",
X86_32(_) => unreachable!(),
X86_64(..) => unreachable!(),
Arm(..) => unreachable!(),
}
}

fn stack_probes(self) -> StackProbeType {
match self {
Armv7k | Armv7s => StackProbeType::None,
Arm64 | Arm64e | Arm64_32 | I386 | I686 | X86_64 | X86_64h => StackProbeType::Inline,
Arm(V7K) | Arm(V7S) => StackProbeType::None,
Aarch64(V8A) | Aarch64(E) | Aarch64(_32) | X86_32(AppleI386) | X86_32(ClangI686)
| X86_64(X64) | X86_64(Haswell) => StackProbeType::Inline,
_ => unreachable!(),
}
}
}
Expand Down Expand Up @@ -126,10 +124,10 @@ pub(crate) fn base(
default_dwarf_version: 4,
frame_pointer: match arch {
// clang ignores `-fomit-frame-pointer` for Armv7, it only accepts `-momit-leaf-frame-pointer`
Armv7k | Armv7s => FramePointer::Always,
Arm(..) => FramePointer::Always,
// clang supports omitting frame pointers for the rest, but... don't?
Arm64 | Arm64e | Arm64_32 => FramePointer::NonLeaf,
I386 | I686 | X86_64 | X86_64h => FramePointer::Always,
Aarch64(..) => FramePointer::NonLeaf,
X86_32(..) | X86_64(..) => FramePointer::Always,
},
has_rpath: true,
dll_suffix: ".dylib".into(),
Expand Down Expand Up @@ -164,7 +162,7 @@ pub(crate) fn base(

..Default::default()
};
if matches!(arch, Arch::I386 | Arch::I686) {
if matches!(arch, Arch::X86_32(..)) {
// All Apple x86-32 targets have SSE2.
opts.rustc_abi = Some(RustcAbi::X86Sse2);
}
Expand Down
87 changes: 87 additions & 0 deletions compiler/rustc_target/src/spec/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3654,3 +3654,90 @@ impl fmt::Display for TargetTuple {
write!(f, "{}", self.debug_tuple())
}
}

#[derive(Copy, Clone, PartialEq)]
pub(crate) enum Arch {
Arm(ArmVer),
Aarch64(Aarch64Ver),
X86_32(Ix86),
X86_64(X86_64Ver),
}
Comment on lines +3659 to +3664
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, I get why you'd want to simplify things in this manner (arch enum with subarch enums), but I'm not sure that's actually a good idea?

I particularly don't like the Arch::Arm64 to Aarch64Ver::V8A.into() change, it makes it harder to understand what's going on (are we specifying the arch or subarch here?), and it becomes incorrect as soon as you pass -Ctarget-cpu=apple-a10.

I'd prefer a single-level Arch enum, and rather have helpers like .is_aarch64() or .is_arm() (if those are even useful in the face of things like ARM64EC).


#[expect(dead_code)]
#[derive(PartialEq, Copy, Clone)]
pub(crate) enum Ix86 {
/// Apple's idea of what "i386" means.
AppleI386,
/// Pentium. Oldest x86 deliberately supported by rustc.
I586,
/// Pentium 4, despite the name
ClangI686,
}
#[derive(PartialEq, Copy, Clone)]
pub(crate) enum Aarch64Ver {
V8A,
/// What does "E" stand for? Armv8.3-A using a pointer-auth ABI, apparently
E,
_32,
}

#[expect(dead_code)]
#[derive(PartialEq, Copy, Clone)]
pub(crate) enum ArmVer {
V4T,
V5TE,
V6M,
V6K,
V7A,
V7EM,
V7M,
V7K,
V7S,
V7R,
V8A,
V8M,
V8R,
V9M,
V9R,
}

#[expect(dead_code)]
#[derive(PartialEq, Copy, Clone)]
pub(crate) enum X86_64Ver {
/// 64-bit long mode
X64,
/// long mode but people try to use 32-bit pointers
X32,
/// Apple target
Haswell,
}

impl Arch {
/// specially sweet constructor for the most-common arch
pub(crate) const fn x86_64() -> Arch {
Arch::X86_64(X86_64Ver::X64)
}
}

impl From<X86_64Ver> for Arch {
fn from(arg: X86_64Ver) -> Arch {
Arch::X86_64(arg)
}
}

impl From<Aarch64Ver> for Arch {
fn from(arg: Aarch64Ver) -> Arch {
Arch::Aarch64(arg)
}
}
impl From<ArmVer> for Arch {
fn from(arg: ArmVer) -> Arch {
Arch::Arm(arg)
}
}

impl From<Ix86> for Arch {
fn from(arg: Ix86) -> Arch {
Arch::X86_32(arg)
}
}
6 changes: 3 additions & 3 deletions compiler/rustc_target/src/spec/targets/aarch64_apple_darwin.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
use crate::spec::base::apple::{Arch, TargetAbi, base};
use crate::spec::{SanitizerSet, Target, TargetMetadata, TargetOptions};
use crate::spec::base::apple::{TargetAbi, base};
use crate::spec::{Aarch64Ver, SanitizerSet, Target, TargetMetadata, TargetOptions};

pub(crate) fn target() -> Target {
let (opts, llvm_target, arch) = base("macos", Arch::Arm64, TargetAbi::Normal);
let (opts, llvm_target, arch) = base("macos", Aarch64Ver::V8A.into(), TargetAbi::Normal);
Target {
llvm_target,
metadata: TargetMetadata {
Expand Down
6 changes: 3 additions & 3 deletions compiler/rustc_target/src/spec/targets/aarch64_apple_ios.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
use crate::spec::base::apple::{Arch, TargetAbi, base};
use crate::spec::{SanitizerSet, Target, TargetMetadata, TargetOptions};
use crate::spec::base::apple::{TargetAbi, base};
use crate::spec::{Aarch64Ver, SanitizerSet, Target, TargetMetadata, TargetOptions};

pub(crate) fn target() -> Target {
let (opts, llvm_target, arch) = base("ios", Arch::Arm64, TargetAbi::Normal);
let (opts, llvm_target, arch) = base("ios", Aarch64Ver::V8A.into(), TargetAbi::Normal);
Target {
llvm_target,
metadata: TargetMetadata {
Expand Down
6 changes: 3 additions & 3 deletions compiler/rustc_target/src/spec/targets/aarch64_apple_ios_macabi.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
use crate::spec::base::apple::{Arch, TargetAbi, base};
use crate::spec::{SanitizerSet, Target, TargetMetadata, TargetOptions};
use crate::spec::base::apple::{TargetAbi, base};
use crate::spec::{Aarch64Ver, SanitizerSet, Target, TargetMetadata, TargetOptions};

pub(crate) fn target() -> Target {
let (opts, llvm_target, arch) = base("ios", Arch::Arm64, TargetAbi::MacCatalyst);
let (opts, llvm_target, arch) = base("ios", Aarch64Ver::V8A.into(), TargetAbi::MacCatalyst);
Target {
llvm_target,
metadata: TargetMetadata {
Expand Down
6 changes: 3 additions & 3 deletions compiler/rustc_target/src/spec/targets/aarch64_apple_ios_sim.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
use crate::spec::base::apple::{Arch, TargetAbi, base};
use crate::spec::{SanitizerSet, Target, TargetMetadata, TargetOptions};
use crate::spec::base::apple::{TargetAbi, base};
use crate::spec::{Aarch64Ver, SanitizerSet, Target, TargetMetadata, TargetOptions};

pub(crate) fn target() -> Target {
let (opts, llvm_target, arch) = base("ios", Arch::Arm64, TargetAbi::Simulator);
let (opts, llvm_target, arch) = base("ios", Aarch64Ver::V8A.into(), TargetAbi::Simulator);
Target {
llvm_target,
metadata: TargetMetadata {
Expand Down
6 changes: 3 additions & 3 deletions compiler/rustc_target/src/spec/targets/aarch64_apple_tvos.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
use crate::spec::base::apple::{Arch, TargetAbi, base};
use crate::spec::{Target, TargetMetadata, TargetOptions};
use crate::spec::base::apple::{TargetAbi, base};
use crate::spec::{Aarch64Ver, Target, TargetMetadata, TargetOptions};

pub(crate) fn target() -> Target {
let (opts, llvm_target, arch) = base("tvos", Arch::Arm64, TargetAbi::Normal);
let (opts, llvm_target, arch) = base("tvos", Aarch64Ver::V8A.into(), TargetAbi::Normal);
Target {
llvm_target,
metadata: TargetMetadata {
Expand Down
6 changes: 3 additions & 3 deletions compiler/rustc_target/src/spec/targets/aarch64_apple_tvos_sim.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
use crate::spec::base::apple::{Arch, TargetAbi, base};
use crate::spec::{Target, TargetMetadata, TargetOptions};
use crate::spec::base::apple::{TargetAbi, base};
use crate::spec::{Aarch64Ver, Target, TargetMetadata, TargetOptions};

pub(crate) fn target() -> Target {
let (opts, llvm_target, arch) = base("tvos", Arch::Arm64, TargetAbi::Simulator);
let (opts, llvm_target, arch) = base("tvos", Aarch64Ver::V8A.into(), TargetAbi::Simulator);
Target {
llvm_target,
metadata: TargetMetadata {
Expand Down
6 changes: 3 additions & 3 deletions compiler/rustc_target/src/spec/targets/aarch64_apple_visionos.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
use crate::spec::base::apple::{Arch, TargetAbi, base};
use crate::spec::{SanitizerSet, Target, TargetMetadata, TargetOptions};
use crate::spec::base::apple::{TargetAbi, base};
use crate::spec::{Aarch64Ver, SanitizerSet, Target, TargetMetadata, TargetOptions};

pub(crate) fn target() -> Target {
let (opts, llvm_target, arch) = base("visionos", Arch::Arm64, TargetAbi::Normal);
let (opts, llvm_target, arch) = base("visionos", Aarch64Ver::V8A.into(), TargetAbi::Normal);
Target {
llvm_target,
metadata: TargetMetadata {
Expand Down
6 changes: 3 additions & 3 deletions compiler/rustc_target/src/spec/targets/aarch64_apple_visionos_sim.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
use crate::spec::base::apple::{Arch, TargetAbi, base};
use crate::spec::{SanitizerSet, Target, TargetMetadata, TargetOptions};
use crate::spec::base::apple::{TargetAbi, base};
use crate::spec::{Aarch64Ver, SanitizerSet, Target, TargetMetadata, TargetOptions};

pub(crate) fn target() -> Target {
let (opts, llvm_target, arch) = base("visionos", Arch::Arm64, TargetAbi::Simulator);
let (opts, llvm_target, arch) = base("visionos", Aarch64Ver::V8A.into(), TargetAbi::Simulator);
Target {
llvm_target,
metadata: TargetMetadata {
Expand Down
6 changes: 3 additions & 3 deletions compiler/rustc_target/src/spec/targets/aarch64_apple_watchos.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
use crate::spec::base::apple::{Arch, TargetAbi, base};
use crate::spec::{Target, TargetMetadata, TargetOptions};
use crate::spec::base::apple::{TargetAbi, base};
use crate::spec::{Aarch64Ver, Target, TargetMetadata, TargetOptions};

pub(crate) fn target() -> Target {
let (opts, llvm_target, arch) = base("watchos", Arch::Arm64, TargetAbi::Normal);
let (opts, llvm_target, arch) = base("watchos", Aarch64Ver::V8A.into(), TargetAbi::Normal);
Target {
llvm_target,
metadata: TargetMetadata {
Expand Down
6 changes: 3 additions & 3 deletions compiler/rustc_target/src/spec/targets/aarch64_apple_watchos_sim.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
use crate::spec::base::apple::{Arch, TargetAbi, base};
use crate::spec::{Target, TargetMetadata, TargetOptions};
use crate::spec::base::apple::{TargetAbi, base};
use crate::spec::{Aarch64Ver, Target, TargetMetadata, TargetOptions};

pub(crate) fn target() -> Target {
let (opts, llvm_target, arch) = base("watchos", Arch::Arm64, TargetAbi::Simulator);
let (opts, llvm_target, arch) = base("watchos", Aarch64Ver::V8A.into(), TargetAbi::Simulator);
Target {
llvm_target,
metadata: TargetMetadata {
Expand Down
6 changes: 3 additions & 3 deletions compiler/rustc_target/src/spec/targets/arm64_32_apple_watchos.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
use crate::spec::base::apple::{Arch, TargetAbi, base};
use crate::spec::{Target, TargetMetadata, TargetOptions};
use crate::spec::base::apple::{TargetAbi, base};
use crate::spec::{Aarch64Ver, Target, TargetMetadata, TargetOptions};

pub(crate) fn target() -> Target {
let (opts, llvm_target, arch) = base("watchos", Arch::Arm64_32, TargetAbi::Normal);
let (opts, llvm_target, arch) = base("watchos", Aarch64Ver::_32.into(), TargetAbi::Normal);
Target {
llvm_target,
metadata: TargetMetadata {
Expand Down
6 changes: 3 additions & 3 deletions compiler/rustc_target/src/spec/targets/arm64e_apple_darwin.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
use crate::spec::base::apple::{Arch, TargetAbi, base};
use crate::spec::{SanitizerSet, Target, TargetMetadata, TargetOptions};
use crate::spec::base::apple::{TargetAbi, base};
use crate::spec::{Aarch64Ver, SanitizerSet, Target, TargetMetadata, TargetOptions};

pub(crate) fn target() -> Target {
let (opts, llvm_target, arch) = base("macos", Arch::Arm64e, TargetAbi::Normal);
let (opts, llvm_target, arch) = base("macos", Aarch64Ver::E.into(), TargetAbi::Normal);
Target {
llvm_target,
metadata: TargetMetadata {
Expand Down
6 changes: 3 additions & 3 deletions compiler/rustc_target/src/spec/targets/arm64e_apple_ios.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
use crate::spec::base::apple::{Arch, TargetAbi, base};
use crate::spec::{SanitizerSet, Target, TargetMetadata, TargetOptions};
use crate::spec::base::apple::{TargetAbi, base};
use crate::spec::{Aarch64Ver, SanitizerSet, Target, TargetMetadata, TargetOptions};

pub(crate) fn target() -> Target {
let (opts, llvm_target, arch) = base("ios", Arch::Arm64e, TargetAbi::Normal);
let (opts, llvm_target, arch) = base("ios", Aarch64Ver::E.into(), TargetAbi::Normal);
Target {
llvm_target,
metadata: TargetMetadata {
Expand Down
6 changes: 3 additions & 3 deletions compiler/rustc_target/src/spec/targets/arm64e_apple_tvos.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
use crate::spec::base::apple::{Arch, TargetAbi, base};
use crate::spec::{Target, TargetMetadata, TargetOptions};
use crate::spec::base::apple::{TargetAbi, base};
use crate::spec::{Aarch64Ver, Target, TargetMetadata, TargetOptions};

pub(crate) fn target() -> Target {
let (opts, llvm_target, arch) = base("tvos", Arch::Arm64e, TargetAbi::Normal);
let (opts, llvm_target, arch) = base("tvos", Aarch64Ver::E.into(), TargetAbi::Normal);
Target {
llvm_target,
metadata: TargetMetadata {
Expand Down
Loading
Loading