Skip to content

Commit 7934bbd

Browse files
committed
Auto merge of #149148 - davidtwco:v0-mangling-on-nightly-std, r=Kobzol
v0 mangling for std on nightly Following #89917 and rust-lang/compiler-team#938, it doesn't make sense that `std` for these channels would have legacy mangling while the user's code would use `v0`. r? `@Kobzol`
2 parents cdb4236 + 62c5ea6 commit 7934bbd

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
@@ -653,6 +653,8 @@ impl Builder<'_> {
653653
// If an explicit setting is given, use that
654654
setting
655655
}
656+
// Per compiler-team#938, v0 mangling is used on nightly
657+
None if self.config.channel == "dev" || self.config.channel == "nightly" => true,
656658
None => {
657659
if mode == Mode::Std {
658660
// 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)