OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rollup merge of #47254 - rkruppe:no-more-align-hack, r=alexcrichton

Browse Source 
Replace empty array hack with repr(align)

As a side effect, this fixes the warning about repr(C, simd) that has been reported during x86_64 windows builds since #47111 (see also: #47103)

r? @alexcrichton
This commit is contained in:
kennytm 2018-01-09 01:58:49 +08:00
commit 4c0823a670
No known key found for this signature in database
GPG Key ID: FEF6C8051D0E013C
2 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/libstd/lib.rs
View File

@ -296,7 +296,6 @@
#![feature(rand)] #![feature(rand)]
#![feature(raw)] #![feature(raw)]
#![feature(repr_align)] #![feature(repr_align)]
#![feature(repr_simd)]
#![feature(rustc_attrs)] #![feature(rustc_attrs)]
#![feature(shared)] #![feature(shared)]
#![feature(sip_hash_13)] #![feature(sip_hash_13)]

14
src/libstd/sys/windows/c.rs
View File

@ -20,11 +20,6 @@ use os::raw::c_ulonglong;
use libc::{wchar_t, size_t, c_void}; use libc::{wchar_t, size_t, c_void};
use ptr; use ptr;
#[repr(simd)]
#[repr(C)]
#[cfg(target_arch = "x86_64")]
struct u64x2(u64, u64);
pub use self::FILE_INFO_BY_HANDLE_CLASS::*; pub use self::FILE_INFO_BY_HANDLE_CLASS::*;
pub use self::EXCEPTION_DISPOSITION::*; pub use self::EXCEPTION_DISPOSITION::*;
@ -700,9 +695,8 @@ pub struct FLOATING_SAVE_AREA {
} }
#[cfg(target_arch = "x86_64")] #[cfg(target_arch = "x86_64")]
#[repr(C)] #[repr(C, align(16))]
pub struct CONTEXT { pub struct CONTEXT {
_align_hack: [u64x2; 0], // FIXME align on 16-byte
pub P1Home: DWORDLONG, pub P1Home: DWORDLONG,
pub P2Home: DWORDLONG, pub P2Home: DWORDLONG,
pub P3Home: DWORDLONG, pub P3Home: DWORDLONG,
@ -760,17 +754,15 @@ pub struct CONTEXT {
} }
#[cfg(target_arch = "x86_64")] #[cfg(target_arch = "x86_64")]
#[repr(C)] #[repr(C, align(16))]
pub struct M128A { pub struct M128A {
_align_hack: [u64x2; 0], // FIXME align on 16-byte
pub Low: c_ulonglong, pub Low: c_ulonglong,
pub High: c_longlong pub High: c_longlong
} }
#[cfg(target_arch = "x86_64")] #[cfg(target_arch = "x86_64")]
#[repr(C)] #[repr(C, align(16))]
pub struct FLOATING_SAVE_AREA { pub struct FLOATING_SAVE_AREA {
_align_hack: [u64x2; 0], // FIXME align on 16-byte
_Dummy: [u8; 512] // FIXME: Fill this out _Dummy: [u8; 512] // FIXME: Fill this out
} }