Skip to content

Commit 62c5ea6

Browse files
committed
v0 mangling for std on nightly
1 parent 2c0f486 commit 62c5ea6

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

src/bootstrap/src/core/builder/cargo.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -647,6 +647,8 @@ impl Builder<'_> {
647647
// If an explicit setting is given, use that
648648
setting
649649
}
650+
// Per compiler-team#938, v0 mangling is used on nightly
651+
None if self.config.channel == "dev" || self.config.channel == "nightly" => true,
650652
None => {
651653
if mode == Mode::Std {
652654
// The standard library defaults to the legacy scheme

tests/ui/sanitizer/dataflow-abilist.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -491,6 +491,8 @@ fun:__dfso_*=discard
491491

492492
# Rust functions.
493493
fun:_ZN4core*=uninstrumented
494+
fun:_R*4core*=uninstrumented
494495
fun:_ZN3std*=uninstrumented
496+
fun:_R*3std*=uninstrumented
495497
fun:rust_eh_personality=uninstrumented
496498
fun:_R*__rustc*=uninstrumented

0 commit comments

Comments
 (0)