Skip to content

Add SWIFT_NAME attributes to all functions in CASTBridging.h #68492

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

Closed
wants to merge 1 commit into from
Closed

Add SWIFT_NAME attributes to all functions in CASTBridging.h #68492

wants to merge 1 commit into from

Conversation

jakedves
Copy link
Contributor

Added SWIFT_NAME attributes to all the functions declared in CASTBridging.h

Resolves #68353

Rebase and merge after #67111 has been merged.

@ahoppen
Copy link
Member

ahoppen commented Sep 18, 2023

@jakedves We merged #67111. If you could you rebase your PR, I’ll take a look at it.

@ahoppen
Copy link
Member

ahoppen commented Sep 18, 2023

Looks like there’s still some difference between your branch and main because I assume you didn’t modify ASTContext.h.

@jakedves
Copy link
Contributor Author

@ahoppen Hey Alex, I tried to rebase but don't think I got it quite right as there's a lot of changes in this besides CASTBriding.h.

The steps I took:

  1. Make my remote fork of apple/swift up-to-date
  2. Checkout pr/68492 using GitHub desktop
  3. Run git rebase main
  4. GitHub desktop then took me through each commit, where I chose "using the modified file" (as opposed to "using the modified file from pr/68492") for all files besides CASTBriding.h (at least I think), and then handled conflicts in that file myself

Is this the right thing to do? It's possible I didn't check properly as GH desktop assumed some resolutions, but want to check the process as I don't have any experience with rebase,

Thanks!

@ahoppen
Copy link
Member

ahoppen commented Sep 19, 2023

Hmm, I think git gets confused because the ASTGen changes from #67111 are somehow modified. What I would do, is

git checkout add-SWIFT_NAME-attrs
git reset --hard main # Removes all the commits
git cherry-pick 8130dff92784532003976b1897729c550624110e # Adds the commit with your changes to the branch again

@jakedves
Copy link
Contributor Author

@ahoppen I think this is right

Copy link
Member

@ahoppen ahoppen left a comment

Choose a reason for hiding this comment

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

Thanks. The commits look good now. You will now need to also make sure the ASTGen module builds with the annotated names. The easiest way to do that, is to open lib/ASTGen and get the package to build.

@jakedves jakedves closed this by deleting the head repository Jun 29, 2024
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.

Add SWIFT_NAME attributes for all functions in CASTBridging.h
2 participants