Skip to content

[JSC] Use VMTraps' WorkQueue for Watchdog#39613

Merged
webkit-commit-queue merged 1 commit intoWebKit:mainfrom
Constellation:eng/JSC-Use-VMTraps-WorkQueue-for-Watchdog
Jan 29, 2025
Merged

[JSC] Use VMTraps' WorkQueue for Watchdog#39613
webkit-commit-queue merged 1 commit intoWebKit:mainfrom
Constellation:eng/JSC-Use-VMTraps-WorkQueue-for-Watchdog

Conversation

@Constellation
Copy link
Copy Markdown
Member

@Constellation Constellation commented Jan 28, 2025

d96385b

[JSC] Use VMTraps' WorkQueue for Watchdog
https://bugs.webkit.org/show_bug.cgi?id=286605
rdar://143731938

Reviewed by Keith Miller.

Use VMTraps' WorkQueue for Watchdog too. We do not need to create a new
WorkQueue for Watchdog.

* Source/JavaScriptCore/SaferCPPExpectations/UncountedLambdaCapturesCheckerExpectations:
* Source/JavaScriptCore/runtime/VMTraps.cpp:
(JSC::VMTraps::queue):
* Source/JavaScriptCore/runtime/VMTraps.h:
* Source/JavaScriptCore/runtime/Watchdog.cpp:
(JSC::Watchdog::Watchdog):
(JSC::Watchdog::setTimeLimit):
(JSC::Watchdog::startTimer):
* Source/JavaScriptCore/runtime/Watchdog.h:

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

628c47f

Misc iOS, visionOS, tvOS & watchOS macOS Linux Windows
✅ 🧪 style ✅ 🛠 ios ✅ 🛠 mac ✅ 🛠 wpe ✅ 🛠 win
✅ 🛠 ios-sim ✅ 🛠 mac-AS-debug ✅ 🧪 wpe-wk2 ✅ 🧪 win-tests
✅ 🧪 webkitperl ✅ 🧪 ios-wk2 ✅ 🧪 api-mac ✅ 🧪 api-wpe
✅ 🧪 ios-wk2-wpt ✅ 🧪 mac-wk1 ✅ 🛠 wpe-cairo
✅ 🛠 🧪 jsc ✅ 🧪 api-ios ✅ 🧪 mac-wk2 ✅ 🛠 gtk
✅ 🛠 🧪 jsc-arm64 ✅ 🛠 vision ✅ 🧪 mac-AS-debug-wk2 ✅ 🧪 gtk-wk2
✅ 🛠 vision-sim ✅ 🧪 mac-wk2-stress ❌ 🧪 api-gtk
✅ 🧪 vision-wk2 ✅ 🧪 mac-intel-wk2 ✅ 🛠 playstation
✅ 🛠 🧪 unsafe-merge ✅ 🛠 tv ✅ 🛠 mac-safer-cpp ✅ 🛠 jsc-armv7
✅ 🛠 tv-sim ✅ 🧪 jsc-armv7-tests
✅ 🛠 watch
✅ 🛠 watch-sim

@Constellation Constellation requested a review from a team as a code owner January 28, 2025 03:18
@Constellation Constellation self-assigned this Jan 28, 2025
@Constellation Constellation added the JavaScriptCore For bugs in JavaScriptCore, the JS engine used by WebKit, other than kxmlcore issues. label Jan 28, 2025
@webkit-ews-buildbot
Copy link
Copy Markdown
Collaborator

Safer C++ Build #19452 (ada6f4b)

⚠️ Found 1 fixed file! Please update expectations in Source/[Project]/SaferCPPExpectations by running the following command and update your pull request:

  • Tools/Scripts/update-safer-cpp-expectations -p JavaScriptCore --UncountedLambdaCapturesChecker ./runtime/Watchdog.cpp

@Constellation Constellation force-pushed the eng/JSC-Use-VMTraps-WorkQueue-for-Watchdog branch from ada6f4b to 628c47f Compare January 28, 2025 19:59
Copy link
Copy Markdown
Contributor

@kmiller68 kmiller68 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.

@Constellation Constellation added the unsafe-merge-queue Applied to send a pull request to merge-queue, but skip building and testing label Jan 29, 2025
https://bugs.webkit.org/show_bug.cgi?id=286605
rdar://143731938

Reviewed by Keith Miller.

Use VMTraps' WorkQueue for Watchdog too. We do not need to create a new
WorkQueue for Watchdog.

* Source/JavaScriptCore/SaferCPPExpectations/UncountedLambdaCapturesCheckerExpectations:
* Source/JavaScriptCore/runtime/VMTraps.cpp:
(JSC::VMTraps::queue):
* Source/JavaScriptCore/runtime/VMTraps.h:
* Source/JavaScriptCore/runtime/Watchdog.cpp:
(JSC::Watchdog::Watchdog):
(JSC::Watchdog::setTimeLimit):
(JSC::Watchdog::startTimer):
* Source/JavaScriptCore/runtime/Watchdog.h:

Canonical link: https://commits.webkit.org/289521@main
@webkit-commit-queue webkit-commit-queue force-pushed the eng/JSC-Use-VMTraps-WorkQueue-for-Watchdog branch from 628c47f to d96385b Compare January 29, 2025 21:33
@webkit-commit-queue
Copy link
Copy Markdown
Collaborator

Committed 289521@main (d96385b): https://commits.webkit.org/289521@main

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

@webkit-commit-queue webkit-commit-queue merged commit d96385b into WebKit:main Jan 29, 2025
@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 Jan 29, 2025
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

Development

Successfully merging this pull request may close these issues.

5 participants