Mirrors/rust
1
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2026-04-27 18:57:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

Rollup merge of #153177 - fneddy:s390x_fix_test_ptr_fragments_final, r=fmease

Browse Source 
disable the ptr_fragment_in_final test on s390x

on s390x 128bit types have a smaller alignment then on x86[^1]. This leads to the tests falling due to different errors emitted.

As this affects the same infrastructure as rust-lang/rust#149056 [^2] lets also for now disable the tests on s390x.

[^1]: s390x ELF ABI Table 1.1, Page 12 https://github.com/IBM/s390x-abi
[^2]: https://github.com/rust-lang/rust/pull/149056#issuecomment-3547543222
This commit is contained in:
Jonathan Brouwer
2026-03-03 07:14:16 +01:00
committed by GitHub
parent 4a56a45083 2e0fdc5c7f
commit bb2b75b82c
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/ui/consts/const-eval/ptr_fragments_in_final.rs
+1
View File
@@ -1,4 +1,5 @@
//! Test that we properly error when there is a pointer fragment in the final value.
//@ ignore-s390x different alignment on s390x make the test fail
use std::{mem::{self, MaybeUninit}, ptr};
tests/ui/consts/const-eval/ptr_fragments_in_final.stderr
+3 -3
View File
@@ -1,5 +1,5 @@
error: encountered partial pointer in final value of constant
--> $DIR/ptr_fragments_in_final.rs:15:1
--> $DIR/ptr_fragments_in_final.rs:16:1
|
LL | const MEMCPY_RET: MaybeUninit<*const i32> = unsafe {
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -7,7 +7,7 @@ LL | const MEMCPY_RET: MaybeUninit<*const i32> = unsafe {
= note: while pointers can be broken apart into individual bytes during const-evaluation, only complete pointers (with all their bytes in the right order) are supported in the final value
error: encountered partial pointer in final value of constant
--> $DIR/ptr_fragments_in_final.rs:24:1
--> $DIR/ptr_fragments_in_final.rs:25:1
|
LL | const MIXED_PTR: MaybeUninit<*const u8> = {
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -15,7 +15,7 @@ LL | const MIXED_PTR: MaybeUninit<*const u8> = {
= note: while pointers can be broken apart into individual bytes during const-evaluation, only complete pointers (with all their bytes in the right order) are supported in the final value
error: encountered partial pointer in final value of constant
--> $DIR/ptr_fragments_in_final.rs:61:5
--> $DIR/ptr_fragments_in_final.rs:62:5
|
LL | const A: Thing = unsafe {
| ^^^^^^^^^^^^^^