Skip to content

Rollup of 5 pull requests #140797

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.

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

Merged
merged 11 commits into from
May 8, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
use crate::spec::{Target, TargetMetadata, base};
use crate::spec::{LinkerFlavor, Lld, Target, TargetMetadata, base};

pub(crate) fn target() -> Target {
let mut base = base::windows_msvc::opts();
base.max_atomic_width = Some(128);
base.features = "+v8a,+neon,+fp-armv8".into();

// MSVC emits a warning about code that may trip "Cortex-A53 MPCore processor bug #843419" (see
// https://developer.arm.com/documentation/epm048406/latest) which is sometimes emitted by LLVM.
// Since Arm64 Windows 10+ isn't supported on that processor, it's safe to disable the warning.
base.add_pre_link_args(LinkerFlavor::Msvc(Lld::No), &["/arm64hazardfree"]);

Target {
llvm_target: "aarch64-pc-windows-msvc".into(),
metadata: TargetMetadata {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1516,6 +1516,12 @@ impl<'a, 'tcx> TypeErrCtxt<'a, 'tcx> {
} else {
expr.span.with_hi(expr.span.lo() + BytePos(1))
};

match self.tcx.sess.source_map().span_to_snippet(span) {
Ok(snippet) if snippet.starts_with("&") => {}
_ => break 'outer,
}

suggestions.push((span, String::new()));

let ty::Ref(_, inner_ty, _) = suggested_ty.kind() else {
Expand Down
16 changes: 16 additions & 0 deletions library/std/src/fs/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -730,6 +730,10 @@ fn recursive_mkdir_empty() {
}

#[test]
#[cfg_attr(
all(windows, target_arch = "aarch64"),
ignore = "SymLinks not enabled on Arm64 Windows runners https://github.com/actions/partner-runner-images/issues/94"
)]
fn recursive_rmdir() {
let tmpdir = tmpdir();
let d1 = tmpdir.join("d1");
Expand All @@ -749,6 +753,10 @@ fn recursive_rmdir() {
}

#[test]
#[cfg_attr(
all(windows, target_arch = "aarch64"),
ignore = "SymLinks not enabled on Arm64 Windows runners https://github.com/actions/partner-runner-images/issues/94"
)]
fn recursive_rmdir_of_symlink() {
// test we do not recursively delete a symlink but only dirs.
let tmpdir = tmpdir();
Expand Down Expand Up @@ -1533,6 +1541,10 @@ fn file_open_not_found() {
}

#[test]
#[cfg_attr(
all(windows, target_arch = "aarch64"),
ignore = "SymLinks not enabled on Arm64 Windows runners https://github.com/actions/partner-runner-images/issues/94"
)]
fn create_dir_all_with_junctions() {
let tmpdir = tmpdir();
let target = tmpdir.join("target");
Expand Down Expand Up @@ -2011,6 +2023,10 @@ fn test_rename_symlink() {

#[test]
#[cfg(windows)]
#[cfg_attr(
all(windows, target_arch = "aarch64"),
ignore = "SymLinks not enabled on Arm64 Windows runners https://github.com/actions/partner-runner-images/issues/94"
)]
fn test_rename_junction() {
let tmpdir = tmpdir();
let original = tmpdir.join("original");
Expand Down
1 change: 1 addition & 0 deletions src/tools/compiletest/src/directive-list.rs
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ const KNOWN_DIRECTIVE_NAMES: &[&str] = &[
"ignore-32bit",
"ignore-64bit",
"ignore-aarch64",
"ignore-aarch64-pc-windows-msvc",
"ignore-aarch64-unknown-linux-gnu",
"ignore-aix",
"ignore-android",
Expand Down
4 changes: 4 additions & 0 deletions tests/debuginfo/step-into-match.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
//@ compile-flags: -g
//@ ignore-android: FIXME(#10381)

// On Arm64 Windows, stepping at the end of a function on goes to the callsite, not the instruction
// after it.
//@ ignore-aarch64-pc-windows-msvc: Stepping out of functions behaves differently.

// === GDB TESTS ==============================================================

// gdb-command: r
Expand Down
2 changes: 2 additions & 0 deletions tests/debuginfo/type-names.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
//@ ignore-lldb

//@ ignore-aarch64-pc-windows-msvc: Arm64 Windows cdb doesn't support JavaScript extensions.

// GDB changed the way that it formatted Foreign types
//@ min-gdb-version: 9.2

Expand Down
2 changes: 1 addition & 1 deletion tests/run-make/pointer-auth-link-with-c/test.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#[link(name = "test")]
#[link(name = "test", kind = "static")]
extern "C" {
fn foo() -> i32;
}
Expand Down
4 changes: 4 additions & 0 deletions tests/ui/runtime/backtrace-debuginfo.rs
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,13 @@ macro_rules! dump_and_die {
// there, even on i686-pc-windows-msvc. We do the best we can in
// rust-lang/rust to test it as well, but sometimes we just gotta keep
// landing PRs.
//
// aarch64-msvc is broken as its backtraces are truncated.
// See https://github.com/rust-lang/rust/issues/140489
if cfg!(any(target_os = "android",
all(target_os = "linux", target_arch = "arm"),
all(target_env = "msvc", target_arch = "x86"),
all(target_env = "msvc", target_arch = "aarch64"),
target_os = "freebsd",
target_os = "dragonfly",
target_os = "openbsd")) {
Expand Down
18 changes: 18 additions & 0 deletions tests/ui/traits/suggest-remove-deref-issue-140166.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
trait Trait {}

struct Chars;
impl Trait for Chars {}

struct FlatMap<T>(T);
impl<T: Trait> std::fmt::Debug for FlatMap<T> {
fn fmt(&self, _: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
unimplemented!()
}
}

fn lol() {
format_args!("{:?}", FlatMap(&Chars));
//~^ ERROR the trait bound `&Chars: Trait` is not satisfied [E0277]
}

fn main() {}
22 changes: 22 additions & 0 deletions tests/ui/traits/suggest-remove-deref-issue-140166.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
error[E0277]: the trait bound `&Chars: Trait` is not satisfied
--> $DIR/suggest-remove-deref-issue-140166.rs:14:26
|
LL | format_args!("{:?}", FlatMap(&Chars));
| ---- ^^^^^^^^^^^^^^^ the trait `Trait` is not implemented for `&Chars`
| |
| required by a bound introduced by this call
|
= help: the trait `Trait` is implemented for `Chars`
note: required for `FlatMap<&Chars>` to implement `Debug`
--> $DIR/suggest-remove-deref-issue-140166.rs:7:16
|
LL | impl<T: Trait> std::fmt::Debug for FlatMap<T> {
| ----- ^^^^^^^^^^^^^^^ ^^^^^^^^^^
| |
| unsatisfied trait bound introduced here
note: required by a bound in `core::fmt::rt::Argument::<'_>::new_debug`
--> $SRC_DIR/core/src/fmt/rt.rs:LL:COL

error: aborting due to 1 previous error

For more information about this error, try `rustc --explain E0277`.