Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
splade
rust
提交
05677b6b
R
rust
项目概览
splade
/
rust
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
rust
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
05677b6b
编写于
8月 05, 2021
作者:
B
bjorn3
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Rustup to rustc 1.56.0-nightly (
25b76484
2021-08-04)
上级
20491379
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
33 addition
and
35 deletion
+33
-35
patches/0027-sysroot-128bit-atomic-operations.patch
patches/0027-sysroot-128bit-atomic-operations.patch
+32
-32
rust-toolchain
rust-toolchain
+1
-1
src/unsize.rs
src/unsize.rs
+0
-2
未找到文件。
patches/0027-sysroot-128bit-atomic-operations.patch
浏览文件 @
05677b6b
From
894e07dfec2624ba539129b1c1d63e1d7d812bda
Mon Sep 17 00:00:00 2001
From
6a4e6f5dc8c8a529a822eb9b57f9e57519595439
Mon Sep 17 00:00:00 2001
From: bjorn3 <bjorn3@users.noreply.github.com>
Date: Thu, 18 Feb 2021 18:45:28 +0100
Subject: [PATCH] Disable 128bit atomic operations
Cranelift doesn't support them yet
---
library/core/src/
sync/atomic.rs | 38 ----------------------------
-----
library/core/
tests/atomic.rs | 4
----
library/
std/src/panic.rs | 6 ---
---
library/core/src/
panic/unwind_safe.rs | 6
-----
library/core/
src/sync/atomic.rs | 38 -----------------------
----
library/
core/tests/atomic.rs | 4
---
3 files changed, 48 deletions(-)
diff --git a/library/core/src/panic/unwind_safe.rs b/library/core/src/panic/unwind_safe.rs
index 092b7cf..158cf71 100644
--- a/library/core/src/panic/unwind_safe.rs
+++ b/library/core/src/panic/unwind_safe.rs
@@ -216,9 +216,6 @@
impl RefUnwindSafe for crate::sync::atomic::AtomicI32 {}
#[cfg(target_has_atomic_load_store = "64")]
#[stable(feature = "integer_atomics_stable", since = "1.34.0")]
impl RefUnwindSafe for crate::sync::atomic::AtomicI64 {}
-#[cfg(target_has_atomic_load_store = "128")]
-#[unstable(feature = "integer_atomics", issue = "32976")]
-impl RefUnwindSafe for crate::sync::atomic::AtomicI128 {}
#[cfg(target_has_atomic_load_store = "ptr")]
#[stable(feature = "unwind_safe_atomic_refs", since = "1.14.0")]
@@ -235,9 +232,6 @@
impl RefUnwindSafe for crate::sync::atomic::AtomicU32 {}
#[cfg(target_has_atomic_load_store = "64")]
#[stable(feature = "integer_atomics_stable", since = "1.34.0")]
impl RefUnwindSafe for crate::sync::atomic::AtomicU64 {}
-#[cfg(target_has_atomic_load_store = "128")]
-#[unstable(feature = "integer_atomics", issue = "32976")]
-impl RefUnwindSafe for crate::sync::atomic::AtomicU128 {}
#[cfg(target_has_atomic_load_store = "8")]
#[stable(feature = "unwind_safe_atomic_refs", since = "1.14.0")]
diff --git a/library/core/src/sync/atomic.rs b/library/core/src/sync/atomic.rs
index
81c9e1d..65c9503
100644
index
0194c58..25a0038
100644
--- a/library/core/src/sync/atomic.rs
+++ b/library/core/src/sync/atomic.rs
@@ -222
8,44 +2228
,6 @@
atomic_int! {
@@ -222
9,44 +2229
,6 @@
atomic_int! {
"AtomicU64::new(0)",
u64 AtomicU64 ATOMIC_U64_INIT
}
...
...
@@ -60,10 +84,10 @@ index 81c9e1d..65c9503 100644
macro_rules! atomic_int_ptr_sized {
( $($target_pointer_width:literal $align:literal)* ) => { $(
diff --git a/library/core/tests/atomic.rs b/library/core/tests/atomic.rs
index
2d1e449..cb6da5d
100644
index
b735957..ea728b6
100644
--- a/library/core/tests/atomic.rs
+++ b/library/core/tests/atomic.rs
@@ -1
45,10 +14
5,6 @@
fn atomic_alignment() {
@@ -1
85,10 +18
5,6 @@
fn atomic_alignment() {
assert_eq!(align_of::<AtomicU64>(), size_of::<AtomicU64>());
#[cfg(target_has_atomic = "64")]
assert_eq!(align_of::<AtomicI64>(), size_of::<AtomicI64>());
...
...
@@ -74,30 +98,6 @@ index 2d1e449..cb6da5d 100644
#[cfg(target_has_atomic = "ptr")]
assert_eq!(align_of::<AtomicUsize>(), size_of::<AtomicUsize>());
#[cfg(target_has_atomic = "ptr")]
diff --git a/library/std/src/panic.rs b/library/std/src/panic.rs
index 89a822a..779fd88 100644
--- a/library/std/src/panic.rs
+++ b/library/std/src/panic.rs
@@ -279,9 +279,6 @@
impl RefUnwindSafe for atomic::AtomicI32 {}
#[cfg(target_has_atomic_load_store = "64")]
#[stable(feature = "integer_atomics_stable", since = "1.34.0")]
impl RefUnwindSafe for atomic::AtomicI64 {}
-#[cfg(target_has_atomic_load_store = "128")]
-#[unstable(feature = "integer_atomics", issue = "32976")]
-impl RefUnwindSafe for atomic::AtomicI128 {}
#[cfg(target_has_atomic_load_store = "ptr")]
#[stable(feature = "unwind_safe_atomic_refs", since = "1.14.0")]
@@ -298,9 +295,6 @@
impl RefUnwindSafe for atomic::AtomicU32 {}
#[cfg(target_has_atomic_load_store = "64")]
#[stable(feature = "integer_atomics_stable", since = "1.34.0")]
impl RefUnwindSafe for atomic::AtomicU64 {}
-#[cfg(target_has_atomic_load_store = "128")]
-#[unstable(feature = "integer_atomics", issue = "32976")]
-impl RefUnwindSafe for atomic::AtomicU128 {}
#[cfg(target_has_atomic_load_store = "8")]
#[stable(feature = "unwind_safe_atomic_refs", since = "1.14.0")]
--
2.26.2.7.g19db9cfb68
rust-toolchain
浏览文件 @
05677b6b
[toolchain]
channel = "nightly-2021-0
7-27
"
channel = "nightly-2021-0
8-05
"
components = ["rust-src", "rustc-dev", "llvm-tools-preview"]
src/unsize.rs
浏览文件 @
05677b6b
...
...
@@ -77,12 +77,10 @@ fn unsize_ptr<'tcx>(
(
&
ty
::
Ref
(
_
,
a
,
_
),
&
ty
::
Ref
(
_
,
b
,
_
))
|
(
&
ty
::
Ref
(
_
,
a
,
_
),
&
ty
::
RawPtr
(
ty
::
TypeAndMut
{
ty
:
b
,
..
}))
|
(
&
ty
::
RawPtr
(
ty
::
TypeAndMut
{
ty
:
a
,
..
}),
&
ty
::
RawPtr
(
ty
::
TypeAndMut
{
ty
:
b
,
..
}))
=>
{
assert
!
(
!
fx
.layout_of
(
a
)
.is_unsized
());
(
src
,
unsized_info
(
fx
,
a
,
b
,
old_info
))
}
(
&
ty
::
Adt
(
def_a
,
_
),
&
ty
::
Adt
(
def_b
,
_
))
if
def_a
.is_box
()
&&
def_b
.is_box
()
=>
{
let
(
a
,
b
)
=
(
src_layout
.ty
.boxed_ty
(),
dst_layout
.ty
.boxed_ty
());
assert
!
(
!
fx
.layout_of
(
a
)
.is_unsized
());
(
src
,
unsized_info
(
fx
,
a
,
b
,
old_info
))
}
(
&
ty
::
Adt
(
def_a
,
_
),
&
ty
::
Adt
(
def_b
,
_
))
=>
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录