Skip to content

Commit 6807c59

Browse files
committed
Re-add -Zsymbol-mangling-version=v0.
1 parent 8d9e14a commit 6807c59

File tree

5 files changed

+7
-6
lines changed

5 files changed

+7
-6
lines changed

Cargo.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crates/rustc_codegen_spirv/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ ar = "0.9.0"
3939
bimap = "0.6"
4040
indexmap = "1.6.0"
4141
rspirv = "0.10"
42-
rustc-demangle = "0.1.18"
42+
rustc-demangle = "0.1.21"
4343
sanitize-filename = "0.3"
4444
serde = { version = "1.0", features = ["derive"] }
4545
serde_json = "1.0"

crates/spirv-builder/src/lib.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -394,8 +394,7 @@ fn invoke_rustc(builder: &SpirvBuilder) -> Result<PathBuf, SpirvBuilderError> {
394394

395395
let mut rustflags = vec![
396396
format!("-Zcodegen-backend={}", rustc_codegen_spirv.display()),
397-
//FIXME: reintroduce v0 mangling, see issue #642
398-
"-Zsymbol-mangling-version=legacy".to_string(),
397+
"-Zsymbol-mangling-version=v0".to_string(),
399398
];
400399

401400
let mut llvm_args = vec![];

tests/src/main.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -292,6 +292,7 @@ struct TestDeps {
292292
}
293293

294294
/// The RUSTFLAGS passed to all SPIR-V builds.
295+
// FIXME(eddyb) expose most of these from `spirv-builder`.
295296
fn rust_flags(codegen_backend_path: &Path) -> String {
296297
[
297298
&*format!("-Zcodegen-backend={}", codegen_backend_path.display()),
@@ -300,6 +301,7 @@ fn rust_flags(codegen_backend_path: &Path) -> String {
300301
"-Cdebuginfo=2",
301302
"-Cembed-bitcode=no",
302303
"-Ctarget-feature=+Int8,+Int16,+Int64,+Float64",
304+
"-Zsymbol-mangling-version=v0",
303305
]
304306
.join(" ")
305307
}

tests/ui/dis/generic-fn-op-name.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ OpMemoryModel Logical Simple
77
OpEntryPoint Fragment %1 "main"
88
OpExecutionMode %1 OriginUpperLeft
99
%2 = OpString "$OPSTRING_FILENAME/generic-fn-op-name.rs"
10-
OpName %3 "generic_fn_op_name::generic"
10+
OpName %3 "generic_fn_op_name::generic::<f32, {spirv_types::image_params::Dimensionality::TwoD}>"
1111
OpName %4 "generic_fn_op_name::main"
1212
%5 = OpTypeVoid
1313
%6 = OpTypeFunction %5

0 commit comments

Comments
 (0)