Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 5891a01

Browse files
committedJan 9, 2024
Auto merge of #119755 - matthiaskrgr:rollup-0tn7ybr, r=matthiaskrgr
Rollup of 8 pull requests Successful merges: - #117744 (Add -Zuse-sync-unwind) - #118649 (Make inductive cycles in coherence ambiguous always) - #118979 (Use `assert_unsafe_precondition` for `char::from_u32_unchecked`) - #119562 (Rename `pointer` field on `Pin`) - #119619 (mir-opt and custom target fixes) - #119632 (Fix broken build for ESP IDF due to #119026) - #119712 (Adding alignment to the cases to test for specific error messages.) - #119734 (Miri subtree update) r? `@ghost` `@rustbot` modify labels: rollup
2 parents d6affcf + 201173f commit 5891a01

File tree

44 files changed

+1034
-763
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+1034
-763
lines changed
 

‎Cargo.lock‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2465,6 +2465,7 @@ dependencies = [
24652465
"ctrlc",
24662466
"env_logger",
24672467
"getrandom",
2468+
"jemalloc-sys",
24682469
"lazy_static",
24692470
"libc",
24702471
"libffi",
@@ -2474,7 +2475,6 @@ dependencies = [
24742475
"rand",
24752476
"regex",
24762477
"rustc_version",
2477-
"serde",
24782478
"smallvec",
24792479
"ui_test",
24802480
]
@@ -3280,9 +3280,9 @@ dependencies = [
32803280

32813281
[[package]]
32823282
name = "rustc-build-sysroot"
3283-
version = "0.4.2"
3283+
version = "0.4.4"
32843284
source = "registry+https://github.com/rust-lang/crates.io-index"
3285-
checksum = "8ed2a90dfa5232ed5ff21d53d4df655f315ab316ea06fc508f1c74bcedb1ce6c"
3285+
checksum = "39dcf8d82b1f79a179bdb284dc44db440a9666eefa5a6df5ef282d6db930d544"
32863286
dependencies = [
32873287
"anyhow",
32883288
"rustc_version",

‎compiler/rustc_codegen_llvm/src/allocator.rs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,8 @@ fn create_wrapper_function(
134134
llvm::LLVMRustSetVisibility(llfn, llvm::Visibility::Hidden);
135135
}
136136
if tcx.sess.must_emit_unwind_tables() {
137-
let uwtable = attributes::uwtable_attr(llcx);
137+
let uwtable =
138+
attributes::uwtable_attr(llcx, tcx.sess.opts.unstable_opts.use_sync_unwind);
138139
attributes::apply_to_llfn(llfn, llvm::AttributePlace::Function, &[uwtable]);
139140
}
140141

0 commit comments

Comments
 (0)
Please sign in to comment.