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.

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

Move llvm-libunwind to src/native/external #72418

Merged
merged 1 commit into from
Jul 19, 2022
Merged

Move llvm-libunwind to src/native/external #72418

merged 1 commit into from
Jul 19, 2022

Conversation

am11
Copy link
Member

@am11 am11 commented Jul 19, 2022

Contributes to #72344

@am11 am11 requested a review from MichalStrehovsky as a code owner July 19, 2022 00:15
@dotnet-issue-labeler
Copy link

I couldn't figure out the best area label to add to this PR. If you have write-permissions please help me learn by adding exactly one area label.

@ghost ghost added the community-contribution Indicates that the PR has been added by a community member label Jul 19, 2022
@am11
Copy link
Member Author

am11 commented Jul 19, 2022

Also fixed convert_to_absolute_path function to use get_filename_component (built-in function which is also used in eng/native/configurepaths.cmake), to avoid prepending prefix to paths which are already absolute.

cc @VSadov

@am11 am11 changed the title Move llvm-libunwind to src/native Move llvm-libunwind to src/native/external Jul 19, 2022
@am11 am11 force-pushed the feature/external/llvm-libunwind branch 2 times, most recently from f91a797 to f7e28d2 Compare July 19, 2022 03:24
@am11 am11 force-pushed the feature/external/llvm-libunwind branch from f7e28d2 to 6e94f64 Compare July 19, 2022 03:26
am11
am11 commented Jul 19, 2022
View reviewed changes
src/native/external/llvm-libunwind-version.txt
https://github.com/llvm/llvm-project/releases/tag/llvmorg-9.0.0

Apply https://github.com/dotnet/runtime/commit/371905898f2c036cc30d662e8a6df162a21967a5
Reapply changes from https://github.com/dotnet/runtime/commit/62075f115efeecaee9d94f87d0766d657a72fa76
Copy link
Member Author

Choose a reason for hiding this comment

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

This file keeps track of how to reproduce src/native/external/llvm-libunwind/ directory from scratch. When we will upgrade to https://github.com/llvm/llvm-project/releases/tag/llvmorg-14.0.6 for example, we can update this file to reflect how are we diverging from upstream. It will also help us plan upstreaming the local patches.

Copy link
Member

@VSadov VSadov Jul 19, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

I think 62075f1 has the changes that the upstream also has.
I am ok with including that commit, if it makes the tracking more convenient, just wonder if that is expected.

Copy link
Member Author

Choose a reason for hiding this comment

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

Those changes were added in v14.0.0-rc1:
image

our current version is 9.0.0. We can adjust the these additional deltas once we upgrade to newer version.

Copy link
Member

Choose a reason for hiding this comment

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

Ah, I see. Makes sense.

MichalStrehovsky
MichalStrehovsky approved these changes Jul 19, 2022
View reviewed changes
Copy link
Member

@MichalStrehovsky MichalStrehovsky left a comment

Choose a reason for hiding this comment

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

Thank you!

@jkotas jkotas merged commit e81c02d into dotnet:main Jul 19, 2022
This was referenced Jul 19, 2022
Closed
Closed
@ghost ghost locked as resolved and limited conversation to collaborators Aug 18, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@VSadov VSadov VSadov approved these changes

@MichalStrehovsky MichalStrehovsky MichalStrehovsky approved these changes

Assignees
No one assigned
Labels
area-NativeAOT-coreclr community-contribution Indicates that the PR has been added by a community member
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@am11 @VSadov @MichalStrehovsky @jkotas