Skip to content

Implement const generics and allow .llvm.<hash> suffixes #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Sep 26, 2023
Merged

Implement const generics and allow .llvm.<hash> suffixes #2

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
c3d070e
Fix a couple of compiler warnings
bjorn3 Aug 31, 2023
77260ed
FIx demangle_extra_suffix and demangle_thinlto tests
bjorn3 Aug 31, 2023
be20a56
Support signed integers and strings in const generics
bjorn3 Aug 31, 2023
2e432c1
Finish const generic support
bjorn3 Aug 31, 2023
00022dd
Accept R and __R symbol prefixes
bjorn3 Aug 31, 2023
ea6fddf
Fix variable shadowing issue
bjorn3 Aug 31, 2023
ad63d9d
Update format of readme additions to match the rest
bjorn3 Sep 24, 2023
c911196
Rustfmt
bjorn3 Sep 24, 2023
fa8155b
clang-format
bjorn3 Sep 25, 2023
4847703
Decode UTF-8 from string literals, and allow escapes to differ in tests.
eddyb Sep 26, 2023
e43e214
test-harness: `#[ignore]` the OOM hazard half of `limit_output`.
eddyb Sep 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ The current port status by category is:
(only usable in `const` generics on unstable Rust)
* **(UNPORTED)** recursion limits
* miscellaneous
* **(UNPORTED)** extraneous symbol suffix (e.g. `.llvm.*`) removal
* **ported** PRs:
* extraneous symbol suffix (e.g. `.llvm.*`) removal
* **(UNPORTED)** output size limits

Notable differences (intentionally) introduced by porting:
Expand Down
16 changes: 11 additions & 5 deletions rust-demangle.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -827,23 +827,29 @@ bool rust_demangle_with_callback(
rdm.version = 0;
rdm.bound_lifetime_depth = 0;

// Rust symbols use only [_0-9a-zA-Z] characters.
// Rust symbols only use ASCII characters.
for (const char *p = mangled; *p; p++) {
if (!(*p == '_' || IS_DIGIT(*p) || IS_LOWER(*p) || IS_UPPER(*p)))
if ((*p & 0x80) != 0)
return false;

if (*p == '.' && strncmp(p, ".llvm.", 6) == 0) {
// Ignore .llvm.<hash> suffixes
break;
}

rdm.sym_len++;
}

demangle_path(&rdm, true);

// Skip instantiating crate.
if (!rdm.errored && rdm.next < rdm.sym_len) {
if (!rdm.errored && rdm.next < rdm.sym_len && peek(&rdm) >= 'A' && peek(&rdm) <= 'Z') {
rdm.skipping_printing = true;
demangle_path(&rdm, false);
}

// It's an error to not reach the end.
rdm.errored |= rdm.next != rdm.sym_len;
// Print trailing garbage
print_str(&rdm, rdm.sym + rdm.next, rdm.sym_len - rdm.next);

return !rdm.errored;
}
Expand Down
4 changes: 0 additions & 4 deletions test-harness/tests/v0.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,17 +223,13 @@ fn demangle_exponential_explosion() {
);
}

// FIXME(eddyb) port the relevant functionality to C.
#[should_panic]
#[test]
fn demangle_thinlto() {
t_nohash!("_RC3foo.llvm.9D1C9369", "foo");
t_nohash!("_RC3foo.llvm.9D1C9369@@16", "foo");
t_nohash!("_RNvC9backtrace3foo.llvm.A5310EB9", "backtrace::foo");
}

// FIXME(eddyb) port the relevant functionality to C.
#[should_panic]
#[test]
fn demangle_extra_suffix() {
// From alexcrichton/rustc-demangle#27:
Expand Down