Skip to content

std::rt::backtrace: Fix symbol names on Windows #17425

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

Jump to bottom
Closed
wants to merge 1 commit into from
Closed

std::rt::backtrace: Fix symbol names on Windows #17425

wants to merge 1 commit into from

Conversation

klutzy
Copy link
Contributor

@klutzy klutzy commented Sep 21, 2014

Fixes #17372

@alexcrichton
Copy link
Member

Does the size of the struct need to be adjusted for 64 vs 32 bit? Would it be possible to base the size off mem::size_of?

@klutzy
Copy link
Contributor Author

klutzy commented Sep 21, 2014

ULONG is 32-bit on both win32 and win64, so struct size is always 88.

mahkoh
mahkoh reviewed Sep 21, 2014
View reviewed changes
src/libstd/rt/backtrace.rs
// the struct size in C. the value is different to
// `size_of::<SYMBOL_INFO>() - MAX_SYM_NAME + 1` (== 81)
// due to struct alignment.
info.SizeOfStruct = 88;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks future-proof ¯_(ツ)_/¯

let align = align_of_val(&info) - 1;
info.SizeOfStruct = (size_of_val(&info) - MAX_SYM_NAME + 1 + align) & !align;

bors added a commit that referenced this pull request Sep 22, 2014
@bors
auto merge of #17425 : klutzy/rust/win-backtrace, r=alexcrichton
3907a13 
Fixes #17372
@bors bors closed this Sep 22, 2014
lnicola pushed a commit to lnicola/rust that referenced this pull request Jun 23, 2024
@bors
Auto merge of rust-lang#17469 - roife:fix-issue-17425, r=Veykril
9b33872 
fix: use ItemInNs::Macros to convert ModuleItem to ItemInNs

fix rust-lang#17425.

When converting `PathResolution` to `ItemInNs`, we should convert `ModuleDef::Macro` to `ItemInNs::Macros` to ensure that it can be found in `DefMap`.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

backtrace doesn't show symbol names on Windows
4 participants
@klutzy @alexcrichton @mahkoh @bors