Skip to content

Adjust symbol name matching logic for GCC #278

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

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Adjust symbol name matching logic for GCC #278

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0c2e825
Adjust symbol name matching logic for GCC
dbalatoni13 Nov 1, 2025
ff284f8
Turn $ and . into a list
dbalatoni13 Nov 1, 2025
fca00bb
Fix borrow issue
dbalatoni13 Nov 1, 2025
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
5 changes: 3 additions & 2 deletions objdiff-core/src/diff/data.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,13 @@ pub fn diff_bss_symbol(

pub fn symbol_name_matches(left_name: &str, right_name: &str) -> bool {
// Match Metrowerks symbol$1234 against symbol$2345
if let Some((prefix, suffix)) = left_name.split_once('$') {
// and GCC symbol.1234 against symbol.2345
if let Some((prefix, suffix)) = left_name.split_once(['$', '.']) {
if !suffix.chars().all(char::is_numeric) {
return false;
}
right_name
.split_once('$')
.split_once(['$', '.'])
.is_some_and(|(p, s)| p == prefix && s.chars().all(char::is_numeric))
} else {
left_name == right_name
Expand Down
Loading