Skip to content

MSVC: Ignore unwinds and catches when inferring function sizes #391

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
LagoLunatic merged 2 commits into from
Aug 11, 2026
Merged

MSVC: Ignore unwinds and catches when inferring function sizes #391

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1df4831
Xbox 360 PPC: Ignore unwinds and catches when inferring function sizes
LagoLunatic Aug 9, 2026
e9af4f2
Don't check unwinds/catches when inferring object sizes, only functions
LagoLunatic Aug 9, 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
8 changes: 8 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 @@ -332,6 +332,14 @@ fn infer_symbol_sizes(arch: &dyn Arch, symbols: &mut [Symbol], sections: &[Secti
break None;
}
if match symbol.kind {
SymbolKind::Function
if next_symbol.kind == SymbolKind::Function
&& (next_symbol.name.starts_with("__unwind$")
|| next_symbol.name.starts_with("__catch$")) =>
{
// MSVC unwinds/catches count as functions, but shouldn't cut off the function they're from.
false
}
SymbolKind::Function | SymbolKind::Object => {
// For function/object symbols, find the next function/object
matches!(next_symbol.kind, SymbolKind::Function | SymbolKind::Object)
Expand Down
Loading