diff options
| author | gnzlbg <gonzalobg88@gmail.com> | 2019-03-16 18:07:58 +0100 |
|---|---|---|
| committer | gnzlbg <gonzalobg88@gmail.com> | 2019-03-21 14:23:29 +0100 |
| commit | 830c98d7fa4da9381d3ee9c8b918bc5dff11c378 (patch) | |
| tree | eaa621dc760f9c9b704330912775c4b22835a960 /src/libcore | |
| parent | 52e885628e4317aa3f158622435927eb29b812e9 (diff) | |
| download | rust-830c98d7fa4da9381d3ee9c8b918bc5dff11c378.tar.gz rust-830c98d7fa4da9381d3ee9c8b918bc5dff11c378.zip | |
Fix undefined behavior in hint::spin_loop for x86 targets without SSE2
The pause instruction requires SSE2 but was being unconditionally used on targets without it, resulting in undefined behavior. This PR fixes that by only using the pause intrinsic if SSE2 is available. It also removes the inline assembly which was not required since these instructions are available in core::arch, and extends support of the spin_loop hint to arm targets with the v6 feature which also support the yield instruction. Closes #59237 .
Diffstat (limited to 'src/libcore')
| -rw-r--r-- | src/libcore/hint.rs | 31 |
1 files changed, 25 insertions, 6 deletions
diff --git a/src/libcore/hint.rs b/src/libcore/hint.rs index 89de5c1bc8a..b2f82ef0d17 100644 --- a/src/libcore/hint.rs +++ b/src/libcore/hint.rs @@ -62,13 +62,32 @@ pub unsafe fn unreachable_unchecked() -> ! { #[inline] #[unstable(feature = "renamed_spin_loop", issue = "55002")] pub fn spin_loop() { - #[cfg(any(target_arch = "x86", target_arch = "x86_64"))] - unsafe { - asm!("pause" ::: "memory" : "volatile"); + #[cfg( + all( + any(target_arch = "x86", target_arch = "x86_64"), + target_feature = "sse2" + ) + )] { + #[cfg(target_arch = "x86")] { + unsafe { crate::arch::x86::_mm_pause() }; + } + + #[cfg(target_arch = "x86_64")] { + unsafe { crate::arch::x86_64::_mm_pause() }; + } } - #[cfg(target_arch = "aarch64")] - unsafe { - asm!("yield" ::: "memory" : "volatile"); + #[cfg( + any( + target_arch = "aarch64", + all(target_arch = "arm", target_feature = "v6") + ) + )] { + #[cfg(target_arch = "aarch64")] { + unsafe { crate::arch::aarch64::__yield() }; + } + #[cfg(target_arch = "arm")] { + unsafe { crate::arch::arm::__yield() }; + } } } |
