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 53a7aee

Browse files
committedJun 28, 2024
rewrite symbols-include-type-name to rmake
1 parent 7c29298 commit 53a7aee

File tree

5 files changed

+16
-15
lines changed

5 files changed

+16
-15
lines changed
 

‎src/tools/tidy/src/allowed_run_make_makefiles.txt

-1
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,6 @@ run-make/staticlib-dylib-linkage/Makefile
170170
run-make/std-core-cycle/Makefile
171171
run-make/symbol-mangling-hashed/Makefile
172172
run-make/symbol-visibility/Makefile
173-
run-make/symbols-include-type-name/Makefile
174173
run-make/sysroot-crates-are-unstable/Makefile
175174
run-make/target-cpu-native/Makefile
176175
run-make/target-specs/Makefile

‎tests/run-make/cdylib-fewer-symbols/rmake.rs

+1-5
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@
44
// four such symbols are successfully hidden.
55
// See https://github.com/rust-lang/rust/pull/45710
66

7-
//FIXME(Oneirical): try it on windows, restore ignore
8-
// See https://github.com/rust-lang/rust/pull/46207#issuecomment-347561753
9-
//FIXME(Oneirical): I also removed cross-compile ignore since there is no binary execution
10-
117
use run_make_support::{dynamic_lib_name, llvm_readobj, rustc};
128

139
fn main() {
@@ -19,5 +15,5 @@ fn main() {
1915
assert!(!&out.contains("__rdl_"));
2016
assert!(!&out.contains("__rde_"));
2117
assert!(!&out.contains("__rg_"));
22-
assert!(!&out.contains("__ruse_"));
18+
assert!(!&out.contains("__rust_"));
2319
}

‎tests/run-make/extern-flag-pathless/rmake.rs

+3
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
// respected.
66
// See https://github.com/rust-lang/rust/pull/64882
77

8+
//@ ignore-cross-compile
9+
// Reason: the compiled binary is executed
10+
811
use run_make_support::{dynamic_lib_name, fs_wrapper, run, run_fail, rust_lib_name, rustc};
912

1013
fn main() {

‎tests/run-make/symbols-include-type-name/Makefile

-9
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
// Method names used to be obfuscated when exported into symbols,
2+
// leaving only an obscure `<impl>`. After the fix in #30328,
3+
// this test checks that method names are successfully saved in the symbol list.
4+
// See https://github.com/rust-lang/rust/issues/30260
5+
6+
use run_make_support::{invalid_utf8_contains, rustc};
7+
8+
fn main() {
9+
rustc().crate_type("staticlib").emit("asm").input("lib.rs").run();
10+
// Check that symbol names for methods include type names, instead of <impl>.
11+
invalid_utf8_contains("lib.s", "Def");
12+
}

0 commit comments

Comments
 (0)
Failed to load comments.