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

[Wasm-GC] Fix null checks for struct operations #9091

Merged
merged 1 commit into from Jan 26, 2023
Merged

[Wasm-GC] Fix null checks for struct operations #9091

merged 1 commit into from Jan 26, 2023

Conversation

takikawa
Copy link
Contributor

@takikawa takikawa commented Jan 25, 2023 •
edited by webkit-early-warning-system

a5a8768

[Wasm-GC] Fix null checks for struct operations
https://bugs.webkit.org/show_bug.cgi?id=251133

Reviewed by Justin Michaud.

Adds in missing null checks for struct instructions.

* JSTests/wasm/gc/structs.js:
* Source/JavaScriptCore/wasm/WasmAirIRGeneratorBase.h:
(JSC::Wasm::ExpressionType>::addStructGet):
(JSC::Wasm::ExpressionType>::addStructSet):
* Source/JavaScriptCore/wasm/WasmB3IRGenerator.cpp:
(JSC::Wasm::B3IRGenerator::addStructGet):
(JSC::Wasm::B3IRGenerator::addStructSet):
* Source/JavaScriptCore/wasm/WasmExceptionType.h:
(JSC::Wasm::isTypeErrorExceptionType):
* Source/JavaScriptCore/wasm/WasmSlowPaths.cpp:
(JSC::LLInt::WASM_SLOW_PATH_DECL):

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

21ed12c

Misc iOS, tvOS & watchOS macOS Linux Windows
✅ 🧪 style ✅ 🛠 ios ✅ 🛠 mac ✅ 🛠 wpe ✅ 🛠 🧪 win
✅ 🛠 ios-sim ✅ 🛠 mac-AS-debug ✅ 🛠 gtk ✅ 🛠 wincairo
✅ 🧪 webkitperl ✅ 🧪 ios-wk2 ✅ 🧪 api-mac ❌ 🧪 gtk-wk2
✅ 🧪 api-ios ✅ 🧪 mac-wk1 ✅ 🧪 api-gtk
✅ 🛠 🧪 jsc ✅ 🛠 tv ✅ 🧪 mac-wk2 ✅ 🛠 jsc-armv7
✅ 🛠 🧪 jsc-arm64 ✅ 🛠 tv-sim ✅ 🧪 mac-AS-debug-wk2 ✅ 🧪 jsc-armv7-tests
✅ 🛠 watch ✅ 🧪 mac-wk2-stress ✅ 🛠 jsc-mips
✅ 🛠 🧪 merge ✅ 🛠 watch-sim ✅ 🧪 jsc-mips-tests

@takikawa takikawa self-assigned this Jan 25, 2023
@takikawa takikawa added the WebAssembly For bugs in JavaScript WebAssembly label Jan 25, 2023
@webkit-ews-buildbot webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Jan 25, 2023
@webkit-early-warning-system
Copy link
Collaborator

EWS run on previous version of this PR (hash 143ade5)

Misc iOS, tvOS & watchOS macOS Linux Windows
✅ 🧪 style ❌ 🛠 ios ❌ 🛠 mac ❌ 🛠 wpe ⏳ 🛠 🧪 win
✅ 🧪 bindings ❌ 🛠 ios-sim ❌ 🛠 mac-AS-debug ❌ 🛠 gtk ⏳ 🛠 wincairo
✅ 🧪 webkitperl ❌ 🧪 ios-wk2 ❌ 🧪 api-mac ❌ 🧪 gtk-wk2
✅ 🧪 webkitpy ❌ 🧪 api-ios ❌ 🧪 mac-wk1 ❌ 🧪 api-gtk
⏳ 🛠 🧪 jsc ❌ 🛠 tv ❌ 🧪 mac-wk2 ❌ 🛠 jsc-armv7
⏳ 🛠 🧪 jsc-arm64 ❌ 🛠 tv-sim ❌ 🧪 mac-AS-debug-wk2 ❌ 🧪 jsc-armv7-tests
✅ 🧪 services ❌ 🛠 watch ❌ 🧪 mac-wk2-stress ✅ 🛠 jsc-mips
✅ 🛠 watch-sim ⏳ 🧪 jsc-mips-tests

@takikawa takikawa removed the merging-blocked Applied to prevent a change from being merged label Jan 25, 2023
@takikawa takikawa force-pushed the eng/Wasm-GC-Fix-null-checks-for-struct-operations branch from 143ade5 to 2f998a6 Compare January 25, 2023 06:17
@webkit-early-warning-system
Copy link
Collaborator

EWS run on previous version of this PR (hash 2f998a6)

Misc iOS, tvOS & watchOS macOS Linux Windows
✅ 🧪 style ✅ 🛠 ios ✅ 🛠 mac ✅ 🛠 wpe ✅ 🛠 🧪 win
✅ 🧪 bindings ✅ 🛠 ios-sim ✅ 🛠 mac-AS-debug ✅ 🛠 gtk ✅ 🛠 wincairo
✅ 🧪 webkitperl ✅ 🧪 ios-wk2 ✅ 🧪 api-mac ✅ 🧪 gtk-wk2
❌ 🧪 webkitpy ✅ 🧪 api-ios ✅ 🧪 mac-wk1 ✅ 🧪 api-gtk
⏳ 🛠 🧪 jsc ✅ 🛠 tv ✅ 🧪 mac-wk2 ✅ 🛠 jsc-armv7
✅ 🛠 🧪 jsc-arm64 ✅ 🛠 tv-sim ❌ 🧪 mac-AS-debug-wk2 ✅ 🧪 jsc-armv7-tests
✅ 🧪 services ✅ 🛠 watch ✅ 🧪 mac-wk2-stress ✅ 🛠 jsc-mips
✅ 🛠 watch-sim ✅ 🧪 jsc-mips-tests

@webkit-ews-buildbot webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Jan 25, 2023
@takikawa takikawa marked this pull request as ready for review January 25, 2023 18:48
@takikawa takikawa requested a review from a team as a code owner January 25, 2023 18:48
justinmichaud
justinmichaud approved these changes Jan 25, 2023
View reviewed changes
Copy link
Contributor

@justinmichaud justinmichaud left a comment

Choose a reason for hiding this comment

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

r=me

@takikawa takikawa removed the merging-blocked Applied to prevent a change from being merged label Jan 25, 2023
@takikawa takikawa force-pushed the eng/Wasm-GC-Fix-null-checks-for-struct-operations branch from 2f998a6 to ca97dce Compare January 25, 2023 20:15
@webkit-early-warning-system
Copy link
Collaborator

EWS run on previous version of this PR (hash ca97dce)

Misc iOS, tvOS & watchOS macOS Linux Windows
✅ 🧪 style ✅ 🛠 ios ✅ 🛠 mac ✅ 🛠 wpe ✅ 🛠 🧪 win
✅ 🧪 bindings ✅ 🛠 ios-sim ✅ 🛠 mac-AS-debug ✅ 🛠 gtk ✅ 🛠 wincairo
✅ 🧪 webkitperl ✅ 🧪 ios-wk2   🧪 api-mac ✅ 🧪 gtk-wk2
✅ 🧪 webkitpy ✅ 🧪 api-ios ✅ 🧪 mac-wk1 ✅ 🧪 api-gtk
✅ 🛠 🧪 jsc ✅ 🛠 tv ✅ 🧪 mac-wk2 ✅ 🛠 jsc-armv7
✅ 🛠 🧪 jsc-arm64 ✅ 🛠 tv-sim ❌ 🧪 mac-AS-debug-wk2 ✅ 🧪 jsc-armv7-tests
✅ 🧪 services ✅ 🛠 watch ✅ 🧪 mac-wk2-stress ✅ 🛠 jsc-mips
✅ 🛠 watch-sim ✅ 🧪 jsc-mips-tests

@webkit-ews-buildbot webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Jan 26, 2023
@takikawa takikawa removed the merging-blocked Applied to prevent a change from being merged label Jan 26, 2023
@takikawa takikawa force-pushed the eng/Wasm-GC-Fix-null-checks-for-struct-operations branch from ca97dce to 21ed12c Compare January 26, 2023 15:01
@webkit-early-warning-system
Copy link
Collaborator

EWS run on current version of this PR (hash 21ed12c)

Misc iOS, tvOS & watchOS macOS Linux Windows
✅ 🧪 style ✅ 🛠 ios ✅ 🛠 mac ✅ 🛠 wpe ✅ 🛠 🧪 win
✅ 🛠 ios-sim ✅ 🛠 mac-AS-debug ✅ 🛠 gtk ✅ 🛠 wincairo
✅ 🧪 webkitperl ✅ 🧪 ios-wk2 ✅ 🧪 api-mac ❌ 🧪 gtk-wk2
✅ 🧪 api-ios ✅ 🧪 mac-wk1 ✅ 🧪 api-gtk
✅ 🛠 🧪 jsc ✅ 🛠 tv ✅ 🧪 mac-wk2 ✅ 🛠 jsc-armv7
✅ 🛠 🧪 jsc-arm64 ✅ 🛠 tv-sim ✅ 🧪 mac-AS-debug-wk2 ✅ 🧪 jsc-armv7-tests
✅ 🛠 watch ✅ 🧪 mac-wk2-stress ✅ 🛠 jsc-mips
✅ 🛠 🧪 merge ✅ 🛠 watch-sim ✅ 🧪 jsc-mips-tests

@takikawa takikawa added the merge-queue Applied to send a pull request to merge-queue label Jan 26, 2023
@webkit-ews-buildbot webkit-ews-buildbot added merging-blocked Applied to prevent a change from being merged and removed merge-queue Applied to send a pull request to merge-queue labels Jan 26, 2023
@takikawa takikawa added merge-queue Applied to send a pull request to merge-queue and removed merging-blocked Applied to prevent a change from being merged labels Jan 26, 2023
@takikawa
[Wasm-GC] Fix null checks for struct operations
a5a8768 
https://bugs.webkit.org/show_bug.cgi?id=251133

Reviewed by Justin Michaud.

Adds in missing null checks for struct instructions.

* JSTests/wasm/gc/structs.js:
* Source/JavaScriptCore/wasm/WasmAirIRGeneratorBase.h:
(JSC::Wasm::ExpressionType>::addStructGet):
(JSC::Wasm::ExpressionType>::addStructSet):
* Source/JavaScriptCore/wasm/WasmB3IRGenerator.cpp:
(JSC::Wasm::B3IRGenerator::addStructGet):
(JSC::Wasm::B3IRGenerator::addStructSet):
* Source/JavaScriptCore/wasm/WasmExceptionType.h:
(JSC::Wasm::isTypeErrorExceptionType):
* Source/JavaScriptCore/wasm/WasmSlowPaths.cpp:
(JSC::LLInt::WASM_SLOW_PATH_DECL):

Canonical link: https://commits.webkit.org/259449@main
@webkit-commit-queue webkit-commit-queue force-pushed the eng/Wasm-GC-Fix-null-checks-for-struct-operations branch from 21ed12c to a5a8768 Compare January 26, 2023 20:11
@webkit-commit-queue
Copy link
Collaborator

Committed 259449@main (a5a8768): https://commits.webkit.org/259449@main

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

@webkit-commit-queue webkit-commit-queue merged commit a5a8768 into WebKit:main Jan 26, 2023
@webkit-commit-queue webkit-commit-queue removed the merge-queue Applied to send a pull request to merge-queue label Jan 26, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@justinmichaud justinmichaud justinmichaud approved these changes

@kmiller68 kmiller68 kmiller68 approved these changes

Assignees

@takikawa takikawa

Labels
WebAssembly For bugs in JavaScript WebAssembly
Projects
None yet
Milestone
No milestone
6 participants
@takikawa @webkit-early-warning-system @webkit-commit-queue @justinmichaud @kmiller68 @webkit-ews-buildbot