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

Build fix: Return AirOpcode* headers to private membership #13625

Merged
merged 1 commit into from
May 9, 2023

Conversation

emw-apple
Copy link
Contributor

@emw-apple emw-apple commented May 9, 2023

1bc021c

Build fix: Return AirOpcode* headers to private membership
https://bugs.webkit.org/show_bug.cgi?id=254784
rdar://108843961

Unreviewed build fix.

In 263845@main, these generated headers stopped being installed by
JavaScriptCore:

>     - Remove target membership from AirOpcodeGenerated.h and
>       AirOpcodeUtils.h. They are missing some includes when they are
>       processed by tapi, and they do not contain any API or SPI.

It turns out they need to be installed for JSC's tools projects in
production builds. Put them back, and instead make them processible by
tapi in non-JIT configurations by adding ENABLE(B3_JIT) guards.

* Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj:
* Source/JavaScriptCore/b3/air/opcode_generator.rb:

Canonical link: https://commits.webkit.org/263847@main

b800427

Misc iOS, tvOS & watchOS macOS Linux Windows
βœ… πŸ§ͺ style βœ… πŸ›  ios βœ… πŸ›  mac βœ… πŸ›  wpe   πŸ›  wincairo
βœ… πŸ›  ios-sim βœ… πŸ›  mac-AS-debug   πŸ§ͺ wpe-wk2
βœ… πŸ§ͺ webkitperl βœ… πŸ§ͺ ios-wk2   πŸ§ͺ api-mac βœ… πŸ›  gtk
βœ… πŸ§ͺ ios-wk2-wpt   πŸ§ͺ mac-wk1   πŸ§ͺ gtk-wk2
  πŸ›  πŸ§ͺ jsc βœ… πŸ§ͺ api-ios   πŸ§ͺ mac-wk2   πŸ§ͺ api-gtk
βœ… πŸ›  πŸ§ͺ jsc-arm64 βœ… πŸ›  tv βœ… πŸ§ͺ mac-AS-debug-wk2 βœ… πŸ›  jsc-armv7
βœ… πŸ›  tv-sim   πŸ§ͺ jsc-armv7-tests
βœ… πŸ›  watch βœ… πŸ›  jsc-mips
βœ… πŸ›  πŸ§ͺ unsafe-merge βœ… πŸ›  watch-sim βœ… πŸ§ͺ jsc-mips-tests

@emw-apple emw-apple requested a review from a team as a code owner May 9, 2023 04:36
@emw-apple emw-apple self-assigned this May 9, 2023
@emw-apple emw-apple added the JavaScriptCore For bugs in JavaScriptCore, the JS engine used by WebKit, other than kxmlcore issues. label May 9, 2023
@emw-apple emw-apple added the unsafe-merge-queue Applied to send a pull request to merge-queue, but skip building and testing label May 9, 2023
https://bugs.webkit.org/show_bug.cgi?id=254784
rdar://108843961

Unreviewed build fix.

In 263845@main, these generated headers stopped being installed by
JavaScriptCore:

>     - Remove target membership from AirOpcodeGenerated.h and
>       AirOpcodeUtils.h. They are missing some includes when they are
>       processed by tapi, and they do not contain any API or SPI.

It turns out they need to be installed for JSC's tools projects in
production builds. Put them back, and instead make them processible by
tapi in non-JIT configurations by adding ENABLE(B3_JIT) guards.

* Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj:
* Source/JavaScriptCore/b3/air/opcode_generator.rb:

Canonical link: https://commits.webkit.org/263847@main
@webkit-commit-queue
Copy link
Collaborator

Committed 263847@main (1bc021c): https://commits.webkit.org/263847@main

Reviewed commits have been landed. Closing PR #13625 and removing active labels.

@webkit-commit-queue webkit-commit-queue merged commit 1bc021c into WebKit:main May 9, 2023
@webkit-commit-queue webkit-commit-queue removed the unsafe-merge-queue Applied to send a pull request to merge-queue, but skip building and testing label May 9, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
JavaScriptCore For bugs in JavaScriptCore, the JS engine used by WebKit, other than kxmlcore issues.
Projects
None yet
3 participants