Skip to content

automatically match MSVC symbols in anonymous namespaces #325

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
rjkiv wants to merge 4 commits into
base: main
Choose a base branch
from
Open

automatically match MSVC symbols in anonymous namespaces #325

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
821fcdb
automatically match MSVC symbols in anonymous namespaces
rjkiv Jan 25, 2026
31c1648
tweak logic for detecting anonymous MSVC symbols
rjkiv Jan 25, 2026
25069e5
fix package format
rjkiv Jan 25, 2026
a63e658
address feedback
rjkiv Jan 25, 2026
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
12 changes: 12 additions & 0 deletions objdiff-core/src/obj/read.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ use core::{cmp::Ordering, num::NonZeroU64};

use anyhow::{Context, Result, anyhow, bail, ensure};
use object::{Object as _, ObjectSection as _, ObjectSymbol as _};
use regex::Regex;

use crate::{
arch::{Arch, RelocationOverride, RelocationOverrideTarget, new_arch},
Expand Down Expand Up @@ -40,6 +41,7 @@ fn map_section_kind(section: &object::Section) -> SectionKind {
/// e.g. symbol$1234 and symbol$2345 will both be replaced with symbol$0000 internally.
fn get_normalized_symbol_name(name: &str) -> Option<String> {
const DUMMY_UNIQUE_ID: &str = "0000";
const DUMMY_UNIQUE_MSVC_ID: &str = "00000000";
if let Some((prefix, suffix)) = name.split_once("@class$")
&& let Some(idx) = suffix.chars().position(|c| !c.is_numeric())
&& idx > 0
Expand All @@ -59,6 +61,16 @@ fn get_normalized_symbol_name(name: &str) -> Option<String> {
{
// Match GCC symbol.1234 against symbol.2345
Some(format!("{prefix}.{DUMMY_UNIQUE_ID}"))
} else if name.starts_with('?') {
// Match MSVC anonymous class symbol names, ignoring the unique ID.
// e.g. ?CheckContextOr@?A0x24773155@@YA_NPBVDataArray@@@Z
// and: ?CheckContextOr@?A0xddf6240c@@YA_NPBVDataArray@@@Z
let re = Regex::new(r"\?A0x[0-9A-Fa-f]{8}@@").unwrap();
if re.is_match(name) {
Some(re.replace_all(name, format!("?A0x{DUMMY_UNIQUE_MSVC_ID}@@")).to_string())
} else {
None
}
} else {
None
}
Expand Down
Loading