Skip to content

Commit 3d7a091

Browse files
borsbors
committed
Auto merge of #110612 - matthiaskrgr:rollup-y2hbjws, r=matthiaskrgr
Rollup of 4 pull requests Successful merges: - #108795 (Add support for the x86_64h-apple-darwin target) - #110558 (Add Call terminator to SMIR) - #110565 (linkchecker: running from a directory separate from the book) - #110599 (Remove an unused `&[Ty]` <-> `&[GenericArg]`) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents a57fa08 + c430d61 commit 3d7a091

File tree

11 files changed

+177
-29
lines changed

11 files changed

+177
-29
lines changed

‎compiler/rustc_middle/src/ty/subst.rs

-13
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ use std::marker::PhantomData;
2121
use std::mem;
2222
use std::num::NonZeroUsize;
2323
use std::ops::{ControlFlow, Deref};
24-
use std::slice;
2524

2625
/// An entity in the Rust type system, which can be one of
2726
/// several kinds (types, lifetimes, and consts).
@@ -55,18 +54,6 @@ pub enum GenericArgKind<'tcx> {
5554
Const(ty::Const<'tcx>),
5655
}
5756

58-
/// This function goes from `&'a [Ty<'tcx>]` to `&'a [GenericArg<'tcx>]`
59-
///
60-
/// This is sound as, for types, `GenericArg` is just
61-
/// `NonZeroUsize::new_unchecked(ty as *const _ as usize)` as
62-
/// long as we use `0` for the `TYPE_TAG`.
63-
pub fn ty_slice_as_generic_args<'a, 'tcx>(ts: &'a [Ty<'tcx>]) -> &'a [GenericArg<'tcx>] {
64-
assert_eq!(TYPE_TAG, 0);
65-
// SAFETY: the whole slice is valid and immutable.
66-
// `Ty` and `GenericArg` is explained above.
67-
unsafe { slice::from_raw_parts(ts.as_ptr().cast(), ts.len()) }
68-
}
69-
7057
impl<'tcx> GenericArgKind<'tcx> {
7158
#[inline]
7259
fn pack(self) -> GenericArg<'tcx> {

‎compiler/rustc_smir/src/rustc_smir/mod.rs

+21-1
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,18 @@ fn rustc_place_to_place(place: &rustc_middle::mir::Place<'_>) -> stable_mir::mir
128128
stable_mir::mir::Place { local: place.local.as_usize() }
129129
}
130130

131+
fn rustc_unwind_to_unwind(
132+
unwind: &rustc_middle::mir::UnwindAction,
133+
) -> stable_mir::mir::UnwindAction {
134+
use rustc_middle::mir::UnwindAction;
135+
match unwind {
136+
UnwindAction::Continue => stable_mir::mir::UnwindAction::Continue,
137+
UnwindAction::Unreachable => stable_mir::mir::UnwindAction::Unreachable,
138+
UnwindAction::Terminate => stable_mir::mir::UnwindAction::Terminate,
139+
UnwindAction::Cleanup(bb) => stable_mir::mir::UnwindAction::Cleanup(bb.as_usize()),
140+
}
141+
}
142+
131143
fn rustc_terminator_to_terminator(
132144
terminator: &rustc_middle::mir::Terminator<'_>,
133145
) -> stable_mir::mir::Terminator {
@@ -151,7 +163,15 @@ fn rustc_terminator_to_terminator(
151163
Return => Terminator::Return,
152164
Unreachable => Terminator::Unreachable,
153165
Drop { .. } => todo!(),
154-
Call { .. } => todo!(),
166+
Call { func, args, destination, target, unwind, from_hir_call: _, fn_span: _ } => {
167+
Terminator::Call {
168+
func: rustc_op_to_op(func),
169+
args: args.iter().map(|arg| rustc_op_to_op(arg)).collect(),
170+
destination: rustc_place_to_place(destination),
171+
target: target.map(|t| t.as_usize()),
172+
unwind: rustc_unwind_to_unwind(unwind),
173+
}
174+
}
155175
Assert { .. } => todo!(),
156176
Yield { .. } => todo!(),
157177
GeneratorDrop => todo!(),

‎compiler/rustc_smir/src/stable_mir/mir/body.rs

+9-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ pub enum Terminator {
3333
args: Vec<Operand>,
3434
destination: Place,
3535
target: Option<usize>,
36-
cleanup: Option<usize>,
36+
unwind: UnwindAction,
3737
},
3838
Assert {
3939
cond: Operand,
@@ -44,6 +44,14 @@ pub enum Terminator {
4444
},
4545
}
4646

47+
#[derive(Clone, Debug)]
48+
pub enum UnwindAction {
49+
Continue,
50+
Unreachable,
51+
Terminate,
52+
Cleanup(usize),
53+
}
54+
4755
#[derive(Clone, Debug)]
4856
pub enum Statement {
4957
Assign(Place, Operand),

‎compiler/rustc_target/src/spec/apple_base.rs

+16-5
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ pub enum Arch {
1919
I386,
2020
I686,
2121
X86_64,
22+
X86_64h,
2223
X86_64_sim,
2324
X86_64_macabi,
2425
Arm64_macabi,
@@ -36,6 +37,7 @@ impl Arch {
3637
I386 => "i386",
3738
I686 => "i686",
3839
X86_64 | X86_64_sim | X86_64_macabi => "x86_64",
40+
X86_64h => "x86_64h",
3941
}
4042
}
4143

@@ -44,13 +46,13 @@ impl Arch {
4446
Armv7 | Armv7k | Armv7s => "arm",
4547
Arm64 | Arm64_32 | Arm64_macabi | Arm64_sim => "aarch64",
4648
I386 | I686 => "x86",
47-
X86_64 | X86_64_sim | X86_64_macabi => "x86_64",
49+
X86_64 | X86_64_sim | X86_64_macabi | X86_64h => "x86_64",
4850
})
4951
}
5052

5153
fn target_abi(self) -> &'static str {
5254
match self {
53-
Armv7 | Armv7k | Armv7s | Arm64 | Arm64_32 | I386 | I686 | X86_64 => "",
55+
Armv7 | Armv7k | Armv7s | Arm64 | Arm64_32 | I386 | I686 | X86_64 | X86_64h => "",
5456
X86_64_macabi | Arm64_macabi => "macabi",
5557
// x86_64-apple-ios is a simulator target, even though it isn't
5658
// declared that way in the target like the other ones...
@@ -67,6 +69,10 @@ impl Arch {
6769
Arm64_32 => "apple-s4",
6870
I386 | I686 => "yonah",
6971
X86_64 | X86_64_sim => "core2",
72+
// Note: `core-avx2` is slightly more advanced than `x86_64h`, see
73+
// comments (and disabled features) in `x86_64h_apple_darwin` for
74+
// details.
75+
X86_64h => "core-avx2",
7076
X86_64_macabi => "core2",
7177
Arm64_macabi => "apple-a12",
7278
Arm64_sim => "apple-a12",
@@ -182,8 +188,13 @@ fn deployment_target(var_name: &str) -> Option<(u32, u32)> {
182188
}
183189

184190
fn macos_default_deployment_target(arch: Arch) -> (u32, u32) {
185-
// Note: Arm64_sim is not included since macOS has no simulator.
186-
if matches!(arch, Arm64 | Arm64_macabi) { (11, 0) } else { (10, 7) }
191+
match arch {
192+
// Note: Arm64_sim is not included since macOS has no simulator.
193+
Arm64 | Arm64_macabi => (11, 0),
194+
// x86_64h-apple-darwin only supports macOS 10.8 and later
195+
X86_64h => (10, 8),
196+
_ => (10, 7),
197+
}
187198
}
188199

189200
fn macos_deployment_target(arch: Arch) -> (u32, u32) {
@@ -227,7 +238,7 @@ fn link_env_remove(arch: Arch, os: &'static str) -> StaticCow<[StaticCow<str>]>
227238
// of the linking environment that's wrong and reversed.
228239
match arch {
229240
Armv7 | Armv7k | Armv7s | Arm64 | Arm64_32 | I386 | I686 | X86_64 | X86_64_sim
230-
| Arm64_sim => {
241+
| X86_64h | Arm64_sim => {
231242
cvs!["MACOSX_DEPLOYMENT_TARGET"]
232243
}
233244
X86_64_macabi | Arm64_macabi => cvs!["IPHONEOS_DEPLOYMENT_TARGET"],

‎compiler/rustc_target/src/spec/mod.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1112,6 +1112,7 @@ supported_targets! {
11121112

11131113
("aarch64-apple-darwin", aarch64_apple_darwin),
11141114
("x86_64-apple-darwin", x86_64_apple_darwin),
1115+
("x86_64h-apple-darwin", x86_64h_apple_darwin),
11151116
("i686-apple-darwin", i686_apple_darwin),
11161117

11171118
// FIXME(#106649): Remove aarch64-fuchsia in favor of aarch64-unknown-fuchsia

‎compiler/rustc_target/src/spec/x86_64h_apple_darwin.rs

+44
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
use super::apple_base::{macos_llvm_target, opts, Arch};
2+
use crate::spec::{Cc, FramePointer, LinkerFlavor, Lld, SanitizerSet};
3+
use crate::spec::{StackProbeType, Target, TargetOptions};
4+
5+
pub fn target() -> Target {
6+
let arch = Arch::X86_64h;
7+
let mut base = opts("macos", arch);
8+
base.max_atomic_width = Some(128);
9+
base.frame_pointer = FramePointer::Always;
10+
base.add_pre_link_args(LinkerFlavor::Darwin(Cc::Yes, Lld::No), &["-m64"]);
11+
base.stack_probes = StackProbeType::X86;
12+
base.supported_sanitizers =
13+
SanitizerSet::ADDRESS | SanitizerSet::CFI | SanitizerSet::LEAK | SanitizerSet::THREAD;
14+
15+
// x86_64h is core2-avx without a few of the features which would otherwise
16+
// be guaranteed, so we need to disable those. This imitates clang's logic:
17+
// - https://github.com/llvm/llvm-project/blob/bd1f7c417/clang/lib/Driver/ToolChains/Arch/X86.cpp#L77-L78
18+
// - https://github.com/llvm/llvm-project/blob/bd1f7c417/clang/lib/Driver/ToolChains/Arch/X86.cpp#L133-L141
19+
//
20+
// FIXME: Sadly, turning these off here disables them in such a way that they
21+
// aren't re-enabled by `-Ctarget-cpu=native` (on a machine that has them).
22+
// It would be nice if this were not the case, but fixing it seems tricky
23+
// (and given that the main use-case for this target is for use in universal
24+
// binaries, probably not that important).
25+
base.features = "-rdrnd,-aes,-pclmul,-rtm,-fsgsbase".into();
26+
// Double-check that the `cpu` is what we expect (if it's not the list above
27+
// may need updating).
28+
assert_eq!(
29+
base.cpu, "core-avx2",
30+
"you need to adjust the feature list in x86_64h-apple-darwin if you change this",
31+
);
32+
33+
Target {
34+
// Clang automatically chooses a more specific target based on
35+
// MACOSX_DEPLOYMENT_TARGET. To enable cross-language LTO to work
36+
// correctly, we do too.
37+
llvm_target: macos_llvm_target(arch).into(),
38+
pointer_width: 64,
39+
data_layout: "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
40+
.into(),
41+
arch: arch.target_arch(),
42+
options: TargetOptions { mcount: "\u{1}mcount".into(), ..base },
43+
}
44+
}

‎src/doc/rustc/src/SUMMARY.md

+1
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
- [wasm64-unknown-unknown](platform-support/wasm64-unknown-unknown.md)
4343
- [x86_64-fortanix-unknown-sgx](platform-support/x86_64-fortanix-unknown-sgx.md)
4444
- [x86_64-unknown-none](platform-support/x86_64-unknown-none.md)
45+
- [x86_64h-apple-darwin](platform-support/x86_64h-apple-darwin.md)
4546
- [Targets](targets/index.md)
4647
- [Built-in Targets](targets/built-in.md)
4748
- [Custom Targets](targets/custom.md)

‎src/doc/rustc/src/platform-support.md

+1
Original file line numberDiff line numberDiff line change
@@ -327,5 +327,6 @@ target | std | host | notes
327327
`x86_64-uwp-windows-gnu` | ✓ | |
328328
`x86_64-uwp-windows-msvc` | ✓ | |
329329
`x86_64-wrs-vxworks` | ? | |
330+
`x86_64h-apple-darwin` | ✓ | ✓ | macOS with late-gen Intel (at least Haswell)
330331

331332
[runs on NVIDIA GPUs]: https://github.com/japaric-archived/nvptx#targets

‎src/doc/rustc/src/platform-support/x86_64h-apple-darwin.md

+57
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
# `x86_64h-apple-darwin`
2+
3+
**Tier: 3**
4+
5+
Target for macOS on late-generation `x86_64` Apple chips, usable as the
6+
`x86_64h` entry in universal binaries, and equivalent to LLVM's
7+
`x86_64h-apple-macosx*` targets.
8+
9+
## Target maintainers
10+
11+
- Thom Chiovoloni `[email protected]` <https://github.com/thomcc>
12+
13+
## Requirements
14+
15+
This target is an `x86_64` target that only supports Apple's late-gen
16+
(Haswell-compatible) Intel chips. It enables a set of target features available
17+
on these chips (AVX2 and similar), and MachO binaries built with this target may
18+
be used as the `x86_64h` entry in universal binaries ("fat" MachO binaries), and
19+
will fail to load on machines that do not support this.
20+
21+
It should support the full standard library (`std` and `alloc` either with
22+
default or user-defined allocators). This target is probably most useful when
23+
targetted via cross-compilation (including from `x86_64-apple-darwin`), but if
24+
built manually, the host tools work.
25+
26+
It is similar to `x86_64-apple-darwin` in nearly all respects, although the
27+
minimum supported OS version is slightly higher (it requires 10.8 rather than
28+
`x86_64-apple-darwin`'s 10.7).
29+
30+
## Building the target
31+
32+
Users on Apple targets can build this by adding it to the `target` list in
33+
`config.toml`, or with `-Zbuild-std`.
34+
35+
## Building Rust programs
36+
37+
Rust does not yet ship pre-compiled artifacts for this target. To compile for
38+
this target, you will either need to build Rust with the target enabled (see
39+
"Building the target" above), or build your own copy of `core` by using
40+
`build-std` or similar.
41+
42+
## Testing
43+
44+
Code built with this target can be run on the set of Intel macOS machines that
45+
support running `x86_64h` binaries (relatively recent Intel macs). The Rust test
46+
suite seems to work.
47+
48+
## Cross-compilation toolchains and C code
49+
50+
Cross-compilation to this target from Apple hosts should generally work without
51+
much configuration, so long as XCode and the CommandLineTools are installed.
52+
Targetting it from non-Apple hosts is difficult, but no moreso than targetting
53+
`x86_64-apple-darwin`.
54+
55+
When compiling C code for this target, either the "`x86_64h-apple-macosx*`" LLVM
56+
targets should be used, or an argument like `-arch x86_64h` should be passed to
57+
the C compiler.

‎src/tools/linkchecker/linkcheck.sh

+18-8
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,13 @@
1616
#
1717
# --all Check all books. This can help make sure you don't break links
1818
# from other books into your book.
19+
#
20+
# --path <book-path>
21+
# Path to the root directory for the book. Default to the current
22+
# working directory if omitted.
1923

2024
set -e
2125

22-
if [ ! -f book.toml ] && [ ! -f src/SUMMARY.md ]
23-
then
24-
echo "Run command in root directory of the book."
25-
exit 1
26-
fi
27-
2826
html_dir="$(rustc +nightly --print sysroot)/share/doc/rust/html"
2927

3028
if [ ! -d "$html_dir" ]
@@ -38,6 +36,8 @@ fi
3836
export MDBOOK_OUTPUT__HTML__INPUT_404=""
3937

4038
book_name=""
39+
# Default to the current directory
40+
book_path="."
4141
# Iterative will avoid cleaning up, so you can quickly run it repeatedly.
4242
iterative=0
4343
# If "1", test all books, else only this book.
@@ -52,6 +52,10 @@ do
5252
--all)
5353
all_books=1
5454
;;
55+
--path)
56+
book_path="${2:-.}"
57+
shift
58+
;;
5559
*)
5660
if [ -n "$book_name" ]
5761
then
@@ -70,6 +74,12 @@ then
7074
exit 1
7175
fi
7276

77+
if [ ! -f "$book_path/book.toml" ] && [ ! -f "$book_path/src/SUMMARY.md" ]
78+
then
79+
echo "Run command in root directory of the book or provide a path to the book"
80+
exit 1
81+
fi
82+
7383
if [ ! -d "$html_dir/$book_name" ]
7484
then
7585
echo "book name \"$book_name\" not found in sysroot \"$html_dir\""
@@ -93,11 +103,11 @@ then
93103
fi
94104

95105
echo "Building book \"$book_name\"..."
96-
mdbook build
106+
mdbook build "$book_path"
97107

98108
cp -R "$html_dir" linkcheck
99109
rm -rf "linkcheck/$book_name"
100-
cp -R book "linkcheck/$book_name"
110+
cp -R "$book_path/book" "linkcheck/$book_name"
101111

102112
if [ "$all_books" = "1" ]
103113
then

‎tests/ui-fulldeps/stable-mir/crate-info.rs

+9-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ fn test_stable_mir(tcx: TyCtxt<'_>) {
3333

3434
// Find items in the local crate.
3535
let items = stable_mir::all_local_items();
36-
assert!(get_item(tcx, &items, (DefKind::Fn, "foo_bar")).is_some());
3736
assert!(get_item(tcx, &items, (DefKind::Fn, "foo::bar")).is_some());
3837

3938
// Find the `std` crate.
@@ -52,6 +51,15 @@ fn test_stable_mir(tcx: TyCtxt<'_>) {
5251
stable_mir::mir::Terminator::Return => {}
5352
other => panic!("{other:?}"),
5453
}
54+
55+
let foo_bar = get_item(tcx, &items, (DefKind::Fn, "foo_bar")).unwrap();
56+
let body = foo_bar.body();
57+
assert_eq!(body.blocks.len(), 4);
58+
let block = &body.blocks[0];
59+
match &block.terminator {
60+
stable_mir::mir::Terminator::Call { .. } => {}
61+
other => panic!("{other:?}"),
62+
}
5563
}
5664

5765
// Use internal API to find a function in a crate.

0 commit comments

Comments
 (0)