Skip to content

[Win] Enable UNIFIED_AND_FREEZABLE_CONFIG_RECORD#31654

Merged
webkit-commit-queue merged 1 commit intoWebKit:mainfrom
iangrunert:ig/enable-unified-and-freezable-config-record-win
Aug 6, 2024
Merged

[Win] Enable UNIFIED_AND_FREEZABLE_CONFIG_RECORD#31654
webkit-commit-queue merged 1 commit intoWebKit:mainfrom
iangrunert:ig/enable-unified-and-freezable-config-record-win

Conversation

@iangrunert
Copy link
Contributor

@iangrunert iangrunert commented Aug 2, 2024

f0f17a7

[Win] Enable UNIFIED_AND_FREEZABLE_CONFIG_RECORD
https://bugs.webkit.org/show_bug.cgi?id=275859

Reviewed by Yusuke Suzuki.

Freezing hasn't been implemented, but after this change we can remove
the X86_64_WIN backend from offlineasm.

This also fixes wasm on Windows, which was broken by
e41732697b999464e80dc3fe1c95900c6c438888

* Source/JavaScriptCore/jit/ExecutableAllocator.cpp:
(JSC::initializeJITPageReservation):
* Source/JavaScriptCore/llint/LowLevelInterpreter.asm:
* Source/JavaScriptCore/llint/LowLevelInterpreter.cpp:
* Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm:
* Source/JavaScriptCore/llint/LowLevelInterpreter64.asm:
* Source/JavaScriptCore/llint/WebAssembly.asm:
* Source/JavaScriptCore/runtime/InitializeThreading.cpp:
(JSC::initialize):
* Source/JavaScriptCore/runtime/JSCConfig.cpp:
* Source/JavaScriptCore/runtime/JSCConfig.h:
* Source/JavaScriptCore/runtime/Options.cpp:
(JSC::Options::notifyOptionsChanged):
* Source/WTF/wtf/PlatformEnable.h:
* Source/WTF/wtf/WTFConfig.cpp:
(WTF::setPermissionsOfConfigPage):
(WTF::Config::permanentlyFreeze):
* Source/WTF/wtf/WTFConfig.h:
(WTF::setPermissionsOfConfigPage): Deleted.
* Source/bmalloc/bmalloc/BPlatform.h:
* Source/bmalloc/bmalloc/Gigacage.cpp:
(Gigacage::ensureGigacage):
* Source/bmalloc/bmalloc/GigacageConfig.h:
* Source/bmalloc/bmalloc/mbmalloc.cpp:
* Source/cmake/OptionsWin.cmake:

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

175660c

Misc iOS, visionOS, tvOS & watchOS macOS Linux Windows
✅ 🧪 style ✅ 🛠 ios ✅ 🛠 mac ✅ 🛠 wpe ✅ 🛠 wincairo
✅ 🛠 ios-sim ✅ 🛠 mac-AS-debug ✅ 🧪 wpe-wk2 ✅ 🧪 wincairo-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 ✅ 🛠 jsc-armv7
✅ 🛠 🧪 unsafe-merge ✅ 🛠 tv ✅ 🧪 jsc-armv7-tests
✅ 🛠 tv-sim
✅ 🛠 watch
✅ 🛠 watch-sim

@iangrunert iangrunert requested review from a team and Constellation as code owners August 2, 2024 18:31
@iangrunert iangrunert added the merging-blocked Applied to prevent a change from being merged label Aug 2, 2024
@iangrunert iangrunert self-assigned this Aug 2, 2024
@iangrunert iangrunert force-pushed the ig/enable-unified-and-freezable-config-record-win branch from 47a9690 to 3e65007 Compare August 3, 2024 15:08
@iangrunert iangrunert removed the merging-blocked Applied to prevent a change from being merged label Aug 3, 2024
Copy link
Member

@Constellation Constellation 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 Aug 5, 2024
@webkit-commit-queue
Copy link
Collaborator

No reviewer information in commit message, blocking PR #31654

@webkit-commit-queue webkit-commit-queue added merging-blocked Applied to prevent a change from being merged and removed unsafe-merge-queue Applied to send a pull request to merge-queue, but skip building and testing labels Aug 5, 2024
Copy link
Contributor

Choose a reason for hiding this comment

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

Seems like the rest of this comment is now obsolete too.

@iangrunert iangrunert force-pushed the ig/enable-unified-and-freezable-config-record-win branch from 3e65007 to 175660c Compare August 5, 2024 19:43
@iangrunert iangrunert added unsafe-merge-queue Applied to send a pull request to merge-queue, but skip building and testing and removed merging-blocked Applied to prevent a change from being merged labels Aug 5, 2024
@webkit-commit-queue
Copy link
Collaborator

@iangrunert does not have committer permissions according to https://raw.githubusercontent.com/WebKit/WebKit/main/metadata/contributors.json.

If you do have committer permmissions, please ensure that your GitHub username is added to contributors.json.

Rejecting 175660ce7aea4a873825ca5740d14bea88ae6d35 from merge queue.

@webkit-commit-queue webkit-commit-queue added merging-blocked Applied to prevent a change from being merged and removed unsafe-merge-queue Applied to send a pull request to merge-queue, but skip building and testing labels Aug 6, 2024
@fujii fujii added unsafe-merge-queue Applied to send a pull request to merge-queue, but skip building and testing and removed merging-blocked Applied to prevent a change from being merged labels Aug 6, 2024
https://bugs.webkit.org/show_bug.cgi?id=275859

Reviewed by Yusuke Suzuki.

Freezing hasn't been implemented, but after this change we can remove
the X86_64_WIN backend from offlineasm.

This also fixes wasm on Windows, which was broken by
e417326

* Source/JavaScriptCore/jit/ExecutableAllocator.cpp:
(JSC::initializeJITPageReservation):
* Source/JavaScriptCore/llint/LowLevelInterpreter.asm:
* Source/JavaScriptCore/llint/LowLevelInterpreter.cpp:
* Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm:
* Source/JavaScriptCore/llint/LowLevelInterpreter64.asm:
* Source/JavaScriptCore/llint/WebAssembly.asm:
* Source/JavaScriptCore/runtime/InitializeThreading.cpp:
(JSC::initialize):
* Source/JavaScriptCore/runtime/JSCConfig.cpp:
* Source/JavaScriptCore/runtime/JSCConfig.h:
* Source/JavaScriptCore/runtime/Options.cpp:
(JSC::Options::notifyOptionsChanged):
* Source/WTF/wtf/PlatformEnable.h:
* Source/WTF/wtf/WTFConfig.cpp:
(WTF::setPermissionsOfConfigPage):
(WTF::Config::permanentlyFreeze):
* Source/WTF/wtf/WTFConfig.h:
(WTF::setPermissionsOfConfigPage): Deleted.
* Source/bmalloc/bmalloc/BPlatform.h:
* Source/bmalloc/bmalloc/Gigacage.cpp:
(Gigacage::ensureGigacage):
* Source/bmalloc/bmalloc/GigacageConfig.h:
* Source/bmalloc/bmalloc/mbmalloc.cpp:
* Source/cmake/OptionsWin.cmake:

Canonical link: https://commits.webkit.org/281876@main
@webkit-commit-queue webkit-commit-queue force-pushed the ig/enable-unified-and-freezable-config-record-win branch from 175660c to f0f17a7 Compare August 6, 2024 05:18
@webkit-commit-queue
Copy link
Collaborator

Committed 281876@main (f0f17a7): https://commits.webkit.org/281876@main

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

@webkit-commit-queue webkit-commit-queue merged commit f0f17a7 into WebKit:main Aug 6, 2024
@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 Aug 6, 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.

6 participants