Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Special-case
.llvm
in mangler to fix segfaults
This commit special cases `.llvm` in the mangler to print `.llvm$6d$` instead. This will avoid segfaults when names in a user's Rust code are `llvm`.
- Loading branch information
Showing
4 changed files
with
87 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
// compile-pass | ||
|
||
// This test is the same code as in ui/symbol-names/issue-60925.rs but this checks that the | ||
// reproduction compiles successfully and doesn't segfault, whereas that test just checks that the | ||
// symbol mangling fix produces the correct result. | ||
|
||
fn dummy() {} | ||
|
||
mod llvm { | ||
pub(crate) struct Foo; | ||
} | ||
mod foo { | ||
pub(crate) struct Foo<T>(T); | ||
|
||
impl Foo<::llvm::Foo> { | ||
pub(crate) fn foo() { | ||
for _ in 0..0 { | ||
for _ in &[::dummy()] { | ||
::dummy(); | ||
::dummy(); | ||
::dummy(); | ||
} | ||
} | ||
} | ||
} | ||
|
||
pub(crate) fn foo() { | ||
Foo::foo(); | ||
Foo::foo(); | ||
} | ||
} | ||
|
||
pub fn foo() { | ||
foo::foo(); | ||
} | ||
|
||
fn main() {} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,39 @@ | ||
#![feature(rustc_attrs)] | ||
|
||
// This test is the same code as in ui/issue-53912.rs but this test checks that the symbol mangling | ||
// fix produces the correct result, whereas that test just checks that the reproduction compiles | ||
// successfully and doesn't segfault | ||
|
||
fn dummy() {} | ||
|
||
mod llvm { | ||
pub(crate) struct Foo; | ||
} | ||
mod foo { | ||
pub(crate) struct Foo<T>(T); | ||
|
||
impl Foo<::llvm::Foo> { | ||
#[rustc_symbol_name] | ||
//~^ ERROR _ZN11issue_609253foo36Foo$LT$issue_60925..llv$6d$..Foo$GT$3foo17h059a991a004536adE | ||
pub(crate) fn foo() { | ||
for _ in 0..0 { | ||
for _ in &[::dummy()] { | ||
::dummy(); | ||
::dummy(); | ||
::dummy(); | ||
} | ||
} | ||
} | ||
} | ||
|
||
pub(crate) fn foo() { | ||
Foo::foo(); | ||
Foo::foo(); | ||
} | ||
} | ||
|
||
pub fn foo() { | ||
foo::foo(); | ||
} | ||
|
||
fn main() {} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
error: symbol-name(_ZN11issue_609253foo36Foo$LT$issue_60925..llv$6d$..Foo$GT$3foo17h059a991a004536adE) | ||
--> $DIR/issue-60925.rs:16:9 | ||
| | ||
LL | #[rustc_symbol_name] | ||
| ^^^^^^^^^^^^^^^^^^^^ | ||
|
||
error: aborting due to previous error | ||
|