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

Apply more constexpr for offsetOf #29841

Merged
merged 1 commit into from
Jun 15, 2024
Merged

Apply more constexpr for offsetOf #29841

merged 1 commit into from
Jun 15, 2024
+35 −37

Conversation

Constellation
Copy link
Member

@Constellation Constellation commented Jun 14, 2024 •
edited by webkit-early-warning-system

51b187d

Apply more constexpr for offsetOf
https://bugs.webkit.org/show_bug.cgi?id=275512
rdar://129874627

Reviewed by Yijia Huang.

More expansion of constexpr OBJECT_OFFSETOF. And changing some more ASSERT with static_assert.

* Source/JavaScriptCore/bytecode/InternalFunctionAllocationProfile.h:
(JSC::InternalFunctionAllocationProfile::offsetOfStructureID):
* Source/JavaScriptCore/dfg/DFGJITCompiler.cpp:
(JSC::DFG::JITCompiler::linkOSRExits):
* Source/JavaScriptCore/heap/FreeList.h:
(JSC::FreeCell::offsetOfScrambledBits):
* Source/JavaScriptCore/jit/AssemblyHelpers.cpp:
(JSC::AssemblyHelpers::loadMegamorphicProperty):
* Source/JavaScriptCore/runtime/FunctionExecutable.h:
* Source/JavaScriptCore/runtime/FunctionRareData.h:
* Source/JavaScriptCore/runtime/JSBigInt.h:
* Source/JavaScriptCore/runtime/JSCallee.h:
(JSC::JSCallee::offsetOfScopeChain):
* Source/JavaScriptCore/runtime/JSFunction.h:
(JSC::JSFunction::offsetOfExecutableOrRareData):
* Source/JavaScriptCore/runtime/JSObject.h:
(JSC::JSObject::offsetOfInlineStorage):
(JSC::indexRelativeToBase):
* Source/JavaScriptCore/runtime/NativeExecutable.h:
* Source/WTF/wtf/WeakRandom.h:
* Source/WTF/wtf/text/StringImpl.h:
(WTF::StringImpl::flagsOffset):
(WTF::StringImpl::dataOffset):
(WTF::StringImpl::headerSize):
(WTF::StringImpl::tailOffset):
* Source/WTF/wtf/text/SymbolImpl.h:
(WTF::SymbolImpl::SymbolImpl):

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

ab5b153

Misc iOS, 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 ✅ 🛠 tv ✅ 🧪 mac-AS-debug-wk2   🧪 gtk-wk2
✅ 🛠 tv-sim ✅ 🧪 mac-wk2-stress   🧪 api-gtk
✅ 🛠 watch ❌ 🛠 jsc-armv7
✅ 🛠 🧪 unsafe-merge ✅ 🛠 watch-sim ❌ 🧪 jsc-armv7-tests

@Constellation Constellation requested a review from a team as a code owner June 14, 2024 21:31
@Constellation Constellation self-assigned this Jun 14, 2024
@Constellation Constellation added the JavaScriptCore For bugs in JavaScriptCore, the JS engine used by WebKit, other than kxmlcore issues. label Jun 14, 2024
hyjorc1
hyjorc1 approved these changes Jun 14, 2024
View reviewed changes
Copy link
Contributor

@hyjorc1 hyjorc1 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

@webkit-early-warning-system
Copy link
Collaborator

EWS run on current version of this PR (hash ab5b153)

Misc iOS, 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 ✅ 🛠 tv ✅ 🧪 mac-AS-debug-wk2   🧪 gtk-wk2
✅ 🛠 tv-sim ✅ 🧪 mac-wk2-stress   🧪 api-gtk
✅ 🛠 watch ❌ 🛠 jsc-armv7
✅ 🛠 🧪 unsafe-merge ✅ 🛠 watch-sim ❌ 🧪 jsc-armv7-tests

Jarred-Sumner
Jarred-Sumner reviewed Jun 14, 2024
View reviewed changes
Source/JavaScriptCore/bytecode/InternalFunctionAllocationProfile.h
@@ -33,7 +33,7 @@ namespace JSC {

class InternalFunctionAllocationProfile {
public:
static inline ptrdiff_t offsetOfStructureID() { return OBJECT_OFFSETOF(InternalFunctionAllocationProfile, m_structureID); }
static constexpr ptrdiff_t offsetOfStructureID() { return OBJECT_OFFSETOF(InternalFunctionAllocationProfile, m_structureID); }
Copy link

Choose a reason for hiding this comment

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

I wonder if consteval would be good in these cases

@Constellation Constellation added the unsafe-merge-queue Applied to send a pull request to merge-queue, but skip building and testing label Jun 15, 2024
@Constellation
Apply more constexpr for offsetOf
51b187d 
https://bugs.webkit.org/show_bug.cgi?id=275512
rdar://129874627

Reviewed by Yijia Huang.

More expansion of constexpr OBJECT_OFFSETOF. And changing some more ASSERT with static_assert.

* Source/JavaScriptCore/bytecode/InternalFunctionAllocationProfile.h:
(JSC::InternalFunctionAllocationProfile::offsetOfStructureID):
* Source/JavaScriptCore/dfg/DFGJITCompiler.cpp:
(JSC::DFG::JITCompiler::linkOSRExits):
* Source/JavaScriptCore/heap/FreeList.h:
(JSC::FreeCell::offsetOfScrambledBits):
* Source/JavaScriptCore/jit/AssemblyHelpers.cpp:
(JSC::AssemblyHelpers::loadMegamorphicProperty):
* Source/JavaScriptCore/runtime/FunctionExecutable.h:
* Source/JavaScriptCore/runtime/FunctionRareData.h:
* Source/JavaScriptCore/runtime/JSBigInt.h:
* Source/JavaScriptCore/runtime/JSCallee.h:
(JSC::JSCallee::offsetOfScopeChain):
* Source/JavaScriptCore/runtime/JSFunction.h:
(JSC::JSFunction::offsetOfExecutableOrRareData):
* Source/JavaScriptCore/runtime/JSObject.h:
(JSC::JSObject::offsetOfInlineStorage):
(JSC::indexRelativeToBase):
* Source/JavaScriptCore/runtime/NativeExecutable.h:
* Source/WTF/wtf/WeakRandom.h:
* Source/WTF/wtf/text/StringImpl.h:
(WTF::StringImpl::flagsOffset):
(WTF::StringImpl::dataOffset):
(WTF::StringImpl::headerSize):
(WTF::StringImpl::tailOffset):
* Source/WTF/wtf/text/SymbolImpl.h:
(WTF::SymbolImpl::SymbolImpl):

Canonical link: https://commits.webkit.org/280046@main
@webkit-commit-queue webkit-commit-queue force-pushed the eng/Apply-more-constexpr-for-offsetOf branch from ab5b153 to 51b187d Compare June 15, 2024 00:23
@webkit-commit-queue
Copy link
Collaborator

Committed 280046@main (51b187d): https://commits.webkit.org/280046@main

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

@webkit-commit-queue webkit-commit-queue merged commit 51b187d into WebKit:main Jun 15, 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 Jun 15, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Jarred-Sumner Jarred-Sumner Jarred-Sumner left review comments

@hyjorc1 hyjorc1 hyjorc1 approved these changes

Assignees

@Constellation Constellation

Labels
JavaScriptCore For bugs in JavaScriptCore, the JS engine used by WebKit, other than kxmlcore issues.
Projects
None yet
Milestone
No milestone
5 participants
@Constellation @webkit-early-warning-system @webkit-commit-queue @Jarred-Sumner @hyjorc1