Skip to content

Replace empty array hack with repr(align) #47254

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

Merged
merged 1 commit into from
Jan 9, 2018
Merged

Replace empty array hack with repr(align) #47254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion src/libstd/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,6 @@
#![feature(rand)]
#![feature(raw)]
#![feature(repr_align)]
#![feature(repr_simd)]
#![feature(rustc_attrs)]
#![feature(shared)]
#![feature(sip_hash_13)]
Expand Down
14 changes: 3 additions & 11 deletions src/libstd/sys/windows/c.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,6 @@ use os::raw::c_ulonglong;
use libc::{wchar_t, size_t, c_void};
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::EXCEPTION_DISPOSITION::*;

Expand Down Expand Up @@ -700,9 +695,8 @@ pub struct FLOATING_SAVE_AREA {
}

#[cfg(target_arch = "x86_64")]
#[repr(C)]
#[repr(C, align(16))]
pub struct CONTEXT {
_align_hack: [u64x2; 0], // FIXME align on 16-byte
pub P1Home: DWORDLONG,
pub P2Home: DWORDLONG,
pub P3Home: DWORDLONG,
Expand Down Expand Up @@ -760,17 +754,15 @@ pub struct CONTEXT {
}

#[cfg(target_arch = "x86_64")]
#[repr(C)]
#[repr(C, align(16))]
pub struct M128A {
_align_hack: [u64x2; 0], // FIXME align on 16-byte
pub Low: c_ulonglong,
pub High: c_longlong
}

#[cfg(target_arch = "x86_64")]
#[repr(C)]
#[repr(C, align(16))]
pub struct FLOATING_SAVE_AREA {
_align_hack: [u64x2; 0], // FIXME align on 16-byte
_Dummy: [u8; 512] // FIXME: Fill this out
}

Expand Down