Skip to content
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.

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

Fixes for mingw builds (+ ARM64) #794

Merged
merged 5 commits into from
Feb 4, 2023

Conversation

past-due
Copy link
Contributor

This change helps fix mingw builds (together with: getsentry/crashpad#78)

@past-due past-due changed the title sentry_backend_crashpad.cpp: mingw fix Fixes for mingw builds (+ ARM64) Jan 27, 2023
@past-due past-due mentioned this pull request Jan 27, 2023
2 tasks
Copy link
Collaborator

@supervacuus supervacuus left a comment

Choose a reason for hiding this comment

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

LGTM, can you please run make format and commit the resulting formatting changes? Thx!

Comment on lines 59 to 63
# if defined (NONAMELESSUNION)
stack_frame.AddrFrame.Offset = ctx.DUMMYUNIONNAME.DUMMYSTRUCTNAME.Fp;
# else
stack_frame.AddrFrame.Offset = ctx.Fp;
# endif
Copy link
Member

Choose a reason for hiding this comment

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

this looks weird, is that a mingw thing? Why is it only needed for Fp and not all the others?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I probably should have added a comment on this - this is a Windows header thing (reference: with some details).

I have no particular insight into the why, but that’s how it is for this particular structure (reference: https://learn.microsoft.com/en-us/windows/win32/api/winnt/ns-winnt-arm64_nt_context). So this will match the headers, and work regardless of whether NONAMELESSUNION is defined.

@codecov
Copy link

codecov bot commented Feb 3, 2023

Codecov Report

Merging #794 (a575276) into master (a11a107) will increase coverage by 0.08%.
The diff coverage is n/a.

❗ Current head a575276 differs from pull request most recent head 8541a74. Consider uploading reports for the commit 8541a74 to get more accurate results

Additional details and impacted files
@@            Coverage Diff             @@
##           master     #794      +/-   ##
==========================================
+ Coverage   81.15%   81.24%   +0.08%     
==========================================
  Files          53       53              
  Lines        6947     6936      -11     
  Branches     1112     1111       -1     
==========================================
- Hits         5638     5635       -3     
+ Misses       1198     1191       -7     
+ Partials      111      110       -1     

@past-due
Copy link
Contributor Author

past-due commented Feb 3, 2023

LGTM, can you please run make format and commit the resulting formatting changes? Thx!

@supervacuus Done 👍

@supervacuus supervacuus merged commit 3d75dc6 into getsentry:master Feb 4, 2023
supervacuus added a commit that referenced this pull request Feb 7, 2023
- Switch Crashpad transport on Linux to use libcurl ([#803](#803), [crashpad#75](getsentry/crashpad#75), [crashpad#79](getsentry/crashpad#79))
- Avoid accidentally mutating CONTEXT when client-side stack walking in Crashpad ([#803](#803), [crashpad#77](getsentry/crashpad#77))
- Fix various mingw compilation issues ([#794](#794), [crashpad#78](getsentry/crashpad#78))
- Updated Crashpad backend to 2023-02-07. ([#803](#803), [crashpad#80](getsentry/crashpad#80))
@supervacuus
Copy link
Collaborator

CC: @bitsandfoxes, @markushi

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants