bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Update references to -Z symbol-mangling-version to use -C

Browse source 
Replace `-Z symbol-mangling-version=v0` with `-C symbol-mangling-version=v0`.

Replace `-Z symbol-mangling-version=legacy` with
`-Z unstable-options -C symbol-mangling-version=legacy`.
This commit is contained in:
Josh Triplett 2021-10-21 14:57:14 +02:00
parent bbf4b6699e
commit ff94b3b12b
25 changed files with 34 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/rustc_codegen_gcc/config.sh
View file

@ -38,7 +38,7 @@ if [[ "$HOST_TRIPLE" != "$TARGET_TRIPLE" ]]; then
fi fi
fi fi
export RUSTFLAGS="$linker -Cpanic=abort -Zsymbol-mangling-version=v0 -Cdebuginfo=2 -Clto=off -Zpanic-abort-tests -Zcodegen-backend=$(pwd)/target/${CHANNEL:-debug}/librustc_codegen_gcc.$dylib_ext --sysroot $(pwd)/build_sysroot/sysroot" export RUSTFLAGS="$linker -Cpanic=abort -Csymbol-mangling-version=v0 -Cdebuginfo=2 -Clto=off -Zpanic-abort-tests -Zcodegen-backend=$(pwd)/target/${CHANNEL:-debug}/librustc_codegen_gcc.$dylib_ext --sysroot $(pwd)/build_sysroot/sysroot"
# FIXME(antoyo): remove once the atomic shim is gone # FIXME(antoyo): remove once the atomic shim is gone
if [[ `uname` == 'Darwin' ]]; then if [[ `uname` == 'Darwin' ]]; then

2
compiler/rustc_codegen_gcc/test.sh
View file

@ -183,7 +183,7 @@ EOF
git checkout src/test/ui/type-alias-impl-trait/auxiliary/cross_crate_ice2.rs git checkout src/test/ui/type-alias-impl-trait/auxiliary/cross_crate_ice2.rs
rm src/test/ui/llvm-asm/llvm-asm-in-out-operand.rs || true # TODO(antoyo): Enable back this test if I ever implement the llvm_asm! macro. rm src/test/ui/llvm-asm/llvm-asm-in-out-operand.rs || true # TODO(antoyo): Enable back this test if I ever implement the llvm_asm! macro.
RUSTC_ARGS="-Zpanic-abort-tests -Zsymbol-mangling-version=v0 -Zcodegen-backend="$(pwd)"/../target/"$CHANNEL"/librustc_codegen_gcc."$dylib_ext" --sysroot "$(pwd)"/../build_sysroot/sysroot -Cpanic=abort" RUSTC_ARGS="-Zpanic-abort-tests -Csymbol-mangling-version=v0 -Zcodegen-backend="$(pwd)"/../target/"$CHANNEL"/librustc_codegen_gcc."$dylib_ext" --sysroot "$(pwd)"/../build_sysroot/sysroot -Cpanic=abort"
echo "[TEST] rustc test suite" echo "[TEST] rustc test suite"
COMPILETEST_FORCE_STAGE0=1 ./x.py test --run always --stage 0 src/test/ui/ --rustc-args "$RUSTC_ARGS" COMPILETEST_FORCE_STAGE0=1 ./x.py test --run always --stage 0 src/test/ui/ --rustc-args "$RUSTC_ARGS"

2
compiler/rustc_session/src/options.rs
View file

@ -1230,7 +1230,7 @@ options! {
instrument_coverage: Option<InstrumentCoverage> = (None, parse_instrument_coverage, [TRACKED], instrument_coverage: Option<InstrumentCoverage> = (None, parse_instrument_coverage, [TRACKED],
"instrument the generated code to support LLVM source-based code coverage \ "instrument the generated code to support LLVM source-based code coverage \
reports (note, the compiler build config must include `profiler = true`); \ reports (note, the compiler build config must include `profiler = true`); \
implies `-Z symbol-mangling-version=v0`. Optional values are: implies `-C symbol-mangling-version=v0`. Optional values are:
`=all` (implicit value) `=all` (implicit value)
`=except-unused-generics` `=except-unused-generics`
`=except-unused-functions` `=except-unused-functions`

2
compiler/rustc_symbol_mangling/src/lib.rs
View file

@ -237,7 +237,7 @@ fn compute_symbol_name<'tcx>(
// Pick the crate responsible for the symbol mangling version, which has to: // Pick the crate responsible for the symbol mangling version, which has to:
// 1. be stable for each instance, whether it's being defined or imported // 1. be stable for each instance, whether it's being defined or imported
// 2. obey each crate's own `-Z symbol-mangling-version`, as much as possible // 2. obey each crate's own `-C symbol-mangling-version`, as much as possible
// We solve these as follows: // We solve these as follows:
// 1. because symbol names depend on both `def_id` and `instantiating_crate`, // 1. because symbol names depend on both `def_id` and `instantiating_crate`,
// both their `CrateNum`s are stable for any given instance, so we can pick // both their `CrateNum`s are stable for any given instance, so we can pick

2
src/doc/unstable-book/src/compiler-flags/instrument-coverage.md
View file

@ -27,7 +27,7 @@ When running a coverage-instrumented program, the counter values are written to
[`llvm.instrprof.increment`]: https://llvm.org/docs/LangRef.html#llvm-instrprof-increment-intrinsic [`llvm.instrprof.increment`]: https://llvm.org/docs/LangRef.html#llvm-instrprof-increment-intrinsic
[llvm code coverage mapping format]: https://llvm.org/docs/CoverageMappingFormat.html [llvm code coverage mapping format]: https://llvm.org/docs/CoverageMappingFormat.html
> **Note**: `-Z instrument-coverage` also automatically enables `-Z symbol-mangling-version=v0` (tracking issue [#60705]). The `v0` symbol mangler is strongly recommended, but be aware that this demangler is also experimental. The `v0` demangler can be overridden by explicitly adding `-Z symbol-mangling-version=legacy`. > **Note**: `-Z instrument-coverage` also automatically enables `-C symbol-mangling-version=v0` (tracking issue [#60705]). The `v0` symbol mangler is strongly recommended, but be aware that this demangler is also experimental. The `v0` demangler can be overridden by explicitly adding `-Z unstable-options -C symbol-mangling-version=legacy`.
[#60705]: https://github.com/rust-lang/rust/issues/60705 [#60705]: https://github.com/rust-lang/rust/issues/60705

2
src/test/codegen/inline-hint.rs
View file

@ -1,7 +1,7 @@
// Checks that closures, constructors, and shims except // Checks that closures, constructors, and shims except
// for a drop glue receive inline hint by default. // for a drop glue receive inline hint by default.
// //
// compile-flags: -Cno-prepopulate-passes -Zsymbol-mangling-version=v0 // compile-flags: -Cno-prepopulate-passes -Csymbol-mangling-version=v0
#![crate_type = "lib"] #![crate_type = "lib"]
pub fn f() { pub fn f() {

6
src/test/run-make-fulldeps/a-b-a-linker-guard/Makefile
View file

@ -8,8 +8,8 @@
# and will probably get removed once `legacy` is gone. # and will probably get removed once `legacy` is gone.
all: all:
$(RUSTC) a.rs --cfg x -C prefer-dynamic -Z symbol-mangling-version=legacy $(RUSTC) a.rs --cfg x -C prefer-dynamic -Z unstable-options -C symbol-mangling-version=legacy
$(RUSTC) b.rs -C prefer-dynamic -Z symbol-mangling-version=legacy $(RUSTC) b.rs -C prefer-dynamic -Z unstable-options -C symbol-mangling-version=legacy
$(call RUN,b) $(call RUN,b)
$(RUSTC) a.rs --cfg y -C prefer-dynamic -Z symbol-mangling-version=legacy $(RUSTC) a.rs --cfg y -C prefer-dynamic -Z unstable-options -C symbol-mangling-version=legacy
$(call FAIL,b) $(call FAIL,b)

2
src/test/run-make-fulldeps/share-generics-dylib/Makefile
View file

@ -11,7 +11,7 @@
-include ../../run-make-fulldeps/tools.mk -include ../../run-make-fulldeps/tools.mk
COMMON_ARGS=-Cprefer-dynamic -Zshare-generics=yes -Ccodegen-units=1 -Zsymbol-mangling-version=v0 COMMON_ARGS=-Cprefer-dynamic -Zshare-generics=yes -Ccodegen-units=1 -Csymbol-mangling-version=v0
all: all:
$(RUSTC) instance_provider_a.rs $(COMMON_ARGS) --crate-type=rlib $(RUSTC) instance_provider_a.rs $(COMMON_ARGS) --crate-type=rlib

2
src/test/ui/lifetimes/issue-84604.rs
View file

@ -1,5 +1,5 @@
// run-pass // run-pass
// compile-flags: -Zsymbol-mangling-version=v0 // compile-flags: -Csymbol-mangling-version=v0
pub fn f<T: ?Sized>() {} pub fn f<T: ?Sized>() {}
pub trait Frob<T: ?Sized> {} pub trait Frob<T: ?Sized> {}

4
src/test/ui/panics/issue-47429-short-backtraces.rs
View file

@ -14,8 +14,8 @@
// NOTE(eddyb) output differs between symbol mangling schemes // NOTE(eddyb) output differs between symbol mangling schemes
// revisions: legacy v0 // revisions: legacy v0
// [legacy] compile-flags: -Zsymbol-mangling-version=legacy // [legacy] compile-flags: -Zunstable-options -Csymbol-mangling-version=legacy
// [v0] compile-flags: -Zsymbol-mangling-version=v0 // [v0] compile-flags: -Csymbol-mangling-version=v0
fn main() { fn main() {
panic!() panic!()

2
src/test/ui/polymorphization/closure_in_upvar/fn.rs
View file

@ -1,5 +1,5 @@
// build-pass // build-pass
// compile-flags:-Zpolymorphize=on -Zsymbol-mangling-version=v0 // compile-flags:-Zpolymorphize=on -Csymbol-mangling-version=v0
fn foo(f: impl Fn()) { fn foo(f: impl Fn()) {
let x = |_: ()| (); let x = |_: ()| ();

2
src/test/ui/polymorphization/closure_in_upvar/fnmut.rs
View file

@ -1,5 +1,5 @@
// build-pass // build-pass
// compile-flags:-Zpolymorphize=on -Zsymbol-mangling-version=v0 // compile-flags:-Zpolymorphize=on -Csymbol-mangling-version=v0
fn foo(f: impl Fn()) { fn foo(f: impl Fn()) {
// Mutate an upvar from `x` so that it implements `FnMut`. // Mutate an upvar from `x` so that it implements `FnMut`.

2
src/test/ui/polymorphization/closure_in_upvar/fnonce.rs
View file

@ -1,5 +1,5 @@
// build-pass // build-pass
// compile-flags:-Zpolymorphize=on -Zsymbol-mangling-version=v0 // compile-flags:-Zpolymorphize=on -Csymbol-mangling-version=v0
fn foo(f: impl Fn()) { fn foo(f: impl Fn()) {
// Move a non-copy type into `x` so that it implements `FnOnce`. // Move a non-copy type into `x` so that it implements `FnOnce`.

2
src/test/ui/polymorphization/closure_in_upvar/other.rs
View file

@ -1,5 +1,5 @@
// build-pass // build-pass
// compile-flags:-Zpolymorphize=on -Zsymbol-mangling-version=v0 // compile-flags:-Zpolymorphize=on -Csymbol-mangling-version=v0
fn y_uses_f(f: impl Fn()) { fn y_uses_f(f: impl Fn()) {
let x = |_: ()| (); let x = |_: ()| ();

2
src/test/ui/polymorphization/symbol-ambiguity.rs
View file

@ -1,5 +1,5 @@
// build-pass // build-pass
// compile-flags: -Zpolymorphize=on -Zsymbol-mangling-version=v0 // compile-flags: -Zpolymorphize=on -Csymbol-mangling-version=v0
pub(crate) struct Foo<'a, I, E>(I, &'a E); pub(crate) struct Foo<'a, I, E>(I, &'a E);

4
src/test/ui/symbol-names/basic.rs
View file

@ -1,7 +1,7 @@
// build-fail // build-fail
// revisions: legacy v0 // revisions: legacy v0
//[legacy]compile-flags: -Z symbol-mangling-version=legacy //[legacy]compile-flags: -Z unstable-options -C symbol-mangling-version=legacy
//[v0]compile-flags: -Z symbol-mangling-version=v0 //[v0]compile-flags: -C symbol-mangling-version=v0
#![feature(rustc_attrs)] #![feature(rustc_attrs)]

2
src/test/ui/symbol-names/const-generics-demangling.rs
View file

@ -1,5 +1,5 @@
// build-fail // build-fail
// compile-flags: -Z symbol-mangling-version=v0 --crate-name=c // compile-flags: -C symbol-mangling-version=v0 --crate-name=c
// normalize-stderr-test: "c\[.*?\]" -> "c[HASH]" // normalize-stderr-test: "c\[.*?\]" -> "c[HASH]"
#![feature(rustc_attrs)] #![feature(rustc_attrs)]

2
src/test/ui/symbol-names/const-generics-str-demangling.rs
View file

@ -1,5 +1,5 @@
// build-fail // build-fail
// compile-flags: -Z symbol-mangling-version=v0 --crate-name=c // compile-flags: -C symbol-mangling-version=v0 --crate-name=c
// normalize-stderr-test: "c\[.*?\]" -> "c[HASH]" // normalize-stderr-test: "c\[.*?\]" -> "c[HASH]"
#![feature(adt_const_params, rustc_attrs)] #![feature(adt_const_params, rustc_attrs)]
#![allow(incomplete_features)] #![allow(incomplete_features)]

2
src/test/ui/symbol-names/const-generics-structural-demangling.rs
View file

@ -1,5 +1,5 @@
// build-fail // build-fail
// compile-flags: -Z symbol-mangling-version=v0 --crate-name=c // compile-flags: -C symbol-mangling-version=v0 --crate-name=c
// NOTE(eddyb) we need `core` for `core::option::Option`, normalize away its // NOTE(eddyb) we need `core` for `core::option::Option`, normalize away its
// disambiguator hash, which can/should change (including between stage{1,2}). // disambiguator hash, which can/should change (including between stage{1,2}).

4
src/test/ui/symbol-names/const-generics.rs
View file

@ -1,7 +1,7 @@
// check-pass // check-pass
// revisions: legacy v0 // revisions: legacy v0
//[legacy]compile-flags: -Z symbol-mangling-version=legacy --crate-type=lib //[legacy]compile-flags: -Z unstable-options -C symbol-mangling-version=legacy --crate-type=lib
//[v0]compile-flags: -Z symbol-mangling-version=v0 --crate-type=lib //[v0]compile-flags: -C symbol-mangling-version=v0 --crate-type=lib
// `char` // `char`
pub struct Char<const F: char>; pub struct Char<const F: char>;

4
src/test/ui/symbol-names/impl1.rs
View file

@ -1,7 +1,7 @@
// build-fail // build-fail
// revisions: legacy v0 // revisions: legacy v0
//[legacy]compile-flags: -Z symbol-mangling-version=legacy //[legacy]compile-flags: -Z unstable-options -C symbol-mangling-version=legacy
//[v0]compile-flags: -Z symbol-mangling-version=v0 //[v0]compile-flags: -C symbol-mangling-version=v0
//[legacy]normalize-stderr-test: "h[\w]{16}E?\)" -> "<SYMBOL_HASH>)" //[legacy]normalize-stderr-test: "h[\w]{16}E?\)" -> "<SYMBOL_HASH>)"
#![feature(auto_traits, rustc_attrs)] #![feature(auto_traits, rustc_attrs)]

4
src/test/ui/symbol-names/issue-60925.rs
View file

@ -1,7 +1,7 @@
// build-fail // build-fail
// revisions: legacy v0 // revisions: legacy v0
//[legacy]compile-flags: -Z symbol-mangling-version=legacy //[legacy]compile-flags: -Z unstable-options -C symbol-mangling-version=legacy
//[v0]compile-flags: -Z symbol-mangling-version=v0 //[v0]compile-flags: -C symbol-mangling-version=v0
#![feature(rustc_attrs)] #![feature(rustc_attrs)]

4
src/test/ui/symbol-names/issue-75326.rs
View file

@ -1,7 +1,7 @@
// build-fail // build-fail
// revisions: legacy v0 // revisions: legacy v0
//[legacy]compile-flags: -Z symbol-mangling-version=legacy //[legacy]compile-flags: -Z unstable-options -C symbol-mangling-version=legacy
//[v0]compile-flags: -Z symbol-mangling-version=v0 //[v0]compile-flags: -C symbol-mangling-version=v0
//[legacy]normalize-stderr-test: "h[\w{16}]+" -> "SYMBOL_HASH" //[legacy]normalize-stderr-test: "h[\w{16}]+" -> "SYMBOL_HASH"
#![feature(rustc_attrs)] #![feature(rustc_attrs)]

4
src/test/ui/symbol-names/issue-76365.rs
View file

@ -1,7 +1,7 @@
// check-pass // check-pass
// revisions: legacy v0 // revisions: legacy v0
//[legacy]compile-flags: -Z symbol-mangling-version=legacy --crate-type=lib //[legacy]compile-flags: -Z unstable-options -C symbol-mangling-version=legacy --crate-type=lib
//[v0]compile-flags: -Z symbol-mangling-version=v0 --crate-type=lib //[v0]compile-flags: -C symbol-mangling-version=v0 --crate-type=lib
pub struct Bar<const F: bool>; pub struct Bar<const F: bool>;

2
src/test/ui/symbol-names/trait-objects.rs
View file

@ -2,7 +2,7 @@
// build-fail // build-fail
// revisions: v0 // revisions: v0
//[v0]compile-flags: -Z symbol-mangling-version=v0 //[v0]compile-flags: -C symbol-mangling-version=v0
//[v0]normalize-stderr-test: "core\[.*?\]" -> "core[HASH]" //[v0]normalize-stderr-test: "core\[.*?\]" -> "core[HASH]"
#![feature(rustc_attrs)] #![feature(rustc_attrs)]