-
Notifications
You must be signed in to change notification settings - Fork 1.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Refactor LLInt::Data::performAssertions() into assertInvariants().
https://bugs.webkit.org/show_bug.cgi?id=274723 rdar://128746336 Reviewed by Yusuke Suzuki. The intent of LLInt::Data::performAssertions() was to assert some invariants that cannot be expressed as static_asserts, or did not have a convenient place to express the static_asserts because they are about constants used in the LLInt asm files. These asserts need only be executed once. At the time, I added a call to performAssertions() from the VM constructor. The better place to call it would be from JSC::initialize(), which is only executed once per process. Additionally, over time, we started using this function to assert other invariants. Hence, we should rename it and put it in a place not associated with the LLInt specifically. Lastly, replace all uses of the antiquated STATIC_ASSERT macro with static_assert. * Source/JavaScriptCore/CMakeLists.txt: * Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj: * Source/JavaScriptCore/Sources.txt: * Source/JavaScriptCore/interpreter/CallFrame.h: (JSC::CallFrame::argumentOffset): (JSC::CallFrame::argumentOffsetIncludingThis): * Source/JavaScriptCore/llint/LLIntData.cpp: (JSC::LLInt::Data::performAssertions): Deleted. * Source/JavaScriptCore/llint/LLIntData.h: * Source/JavaScriptCore/runtime/AssertInvariants.cpp: Added. (JSC::assertInvariants): * Source/JavaScriptCore/runtime/AssertInvariants.h: Added. * Source/JavaScriptCore/runtime/InitializeThreading.cpp: (JSC::initialize): * Source/JavaScriptCore/runtime/VM.cpp: (JSC::VM::VM): Canonical link: https://commits.webkit.org/279327@main
- Loading branch information
Mark Lam
committed
May 26, 2024
1 parent
989daa9
commit 491e7db
Showing
10 changed files
with
201 additions
and
133 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,145 @@ | ||
| /* | ||
| * Copyright (C) 2024 Apple Inc. All rights reserved. | ||
| * | ||
| * Redistribution and use in source and binary forms, with or without | ||
| * modification, are permitted provided that the following conditions | ||
| * are met: | ||
| * 1. Redistributions of source code must retain the above copyright | ||
| * notice, this list of conditions and the following disclaimer. | ||
| * 2. Redistributions in binary form must reproduce the above copyright | ||
| * notice, this list of conditions and the following disclaimer in the | ||
| * documentation and/or other materials provided with the distribution. | ||
| * | ||
| * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY | ||
| * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
| * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | ||
| * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR | ||
| * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, | ||
| * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | ||
| * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR | ||
| * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY | ||
| * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
| * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | ||
| * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
| */ | ||
|
|
||
| #include "config.h" | ||
| #include "AssertInvariants.h" | ||
|
|
||
| #include "ArithProfile.h" | ||
| #include "BaselineJITCode.h" | ||
| #include "CodeBlock.h" | ||
| #include "DFGJITCode.h" | ||
|
|
||
| namespace JSC { | ||
|
|
||
| void assertInvariants() | ||
| { | ||
| // Assertions to match LowLevelInterpreter.asm. If you change any of this code, be | ||
| // prepared to change LowLevelInterpreter.asm as well!! | ||
| { | ||
| #if USE(JSVALUE64) | ||
| const ptrdiff_t CallFrameHeaderSlots = 5; | ||
| #else // USE(JSVALUE64) // i.e. 32-bit version | ||
| const ptrdiff_t CallFrameHeaderSlots = 4; | ||
| #endif | ||
| const ptrdiff_t MachineRegisterSize = sizeof(CPURegister); | ||
| const ptrdiff_t SlotSize = 8; | ||
|
|
||
| static_assert(sizeof(Register) == SlotSize); | ||
| static_assert(CallFrame::headerSizeInRegisters == CallFrameHeaderSlots); | ||
|
|
||
| static_assert(!CallFrame::callerFrameOffset()); | ||
| static_assert(CallerFrameAndPC::sizeInRegisters == (MachineRegisterSize * 2) / SlotSize); | ||
| static_assert(CallFrame::returnPCOffset() == CallFrame::callerFrameOffset() + MachineRegisterSize); | ||
| static_assert(static_cast<std::underlying_type_t<CallFrameSlot>>(CallFrameSlot::codeBlock) * sizeof(Register) == CallFrame::returnPCOffset() + MachineRegisterSize); | ||
| static_assert(CallFrameSlot::callee * sizeof(Register) == CallFrameSlot::codeBlock * sizeof(Register) + SlotSize); | ||
| static_assert(CallFrameSlot::argumentCountIncludingThis * sizeof(Register) == CallFrameSlot::callee * sizeof(Register) + SlotSize); | ||
| static_assert(CallFrameSlot::thisArgument * sizeof(Register) == CallFrameSlot::argumentCountIncludingThis * sizeof(Register) + SlotSize); | ||
| static_assert(CallFrame::headerSizeInRegisters == CallFrameSlot::thisArgument); | ||
|
|
||
| static_assert(CallFrame::argumentOffsetIncludingThis(0) == CallFrameSlot::thisArgument); | ||
|
|
||
| #if CPU(BIG_ENDIAN) | ||
| static_assert(TagOffset == 0); | ||
| static_assert(PayloadOffset == 4); | ||
| #else | ||
| static_assert(TagOffset == 4); | ||
| static_assert(PayloadOffset == 0); | ||
| #endif | ||
|
|
||
| #if ENABLE(C_LOOP) | ||
| ASSERT(CodeBlock::llintBaselineCalleeSaveSpaceAsVirtualRegisters() == 1); | ||
| #elif USE(JSVALUE32_64) | ||
| ASSERT(CodeBlock::llintBaselineCalleeSaveSpaceAsVirtualRegisters() == 1); | ||
| #elif (CPU(X86_64) && !OS(WINDOWS)) || CPU(ARM64) | ||
| ASSERT(CodeBlock::llintBaselineCalleeSaveSpaceAsVirtualRegisters() == 4); | ||
| #elif (CPU(X86_64) && OS(WINDOWS)) | ||
| ASSERT(CodeBlock::llintBaselineCalleeSaveSpaceAsVirtualRegisters() == 4); | ||
| #endif | ||
|
|
||
| ASSERT(!(reinterpret_cast<ptrdiff_t>((reinterpret_cast<WriteBarrier<JSCell>*>(0x4000)->slot())) - 0x4000)); | ||
| } | ||
|
|
||
| // FIXME: make these assertions less horrible. | ||
| #if ASSERT_ENABLED | ||
| Vector<int> testVector; | ||
| testVector.resize(42); | ||
| ASSERT(bitwise_cast<uint32_t*>(&testVector)[sizeof(void*) / sizeof(uint32_t) + 1] == 42); | ||
| ASSERT(bitwise_cast<int**>(&testVector)[0] == testVector.begin()); | ||
| #endif | ||
|
|
||
| { | ||
| UnaryArithProfile arithProfile; | ||
| arithProfile.argSawInt32(); | ||
| ASSERT(arithProfile.bits() == UnaryArithProfile::observedIntBits()); | ||
| ASSERT(arithProfile.argObservedType().isOnlyInt32()); | ||
| } | ||
| { | ||
| UnaryArithProfile arithProfile; | ||
| arithProfile.argSawNumber(); | ||
| ASSERT(arithProfile.bits() == UnaryArithProfile::observedNumberBits()); | ||
| ASSERT(arithProfile.argObservedType().isOnlyNumber()); | ||
| } | ||
|
|
||
| { | ||
| BinaryArithProfile arithProfile; | ||
| arithProfile.lhsSawInt32(); | ||
| arithProfile.rhsSawInt32(); | ||
| ASSERT(arithProfile.bits() == BinaryArithProfile::observedIntIntBits()); | ||
| ASSERT(arithProfile.lhsObservedType().isOnlyInt32()); | ||
| ASSERT(arithProfile.rhsObservedType().isOnlyInt32()); | ||
| } | ||
| { | ||
| BinaryArithProfile arithProfile; | ||
| arithProfile.lhsSawNumber(); | ||
| arithProfile.rhsSawInt32(); | ||
| ASSERT(arithProfile.bits() == BinaryArithProfile::observedNumberIntBits()); | ||
| ASSERT(arithProfile.lhsObservedType().isOnlyNumber()); | ||
| ASSERT(arithProfile.rhsObservedType().isOnlyInt32()); | ||
| } | ||
| { | ||
| BinaryArithProfile arithProfile; | ||
| arithProfile.lhsSawNumber(); | ||
| arithProfile.rhsSawNumber(); | ||
| ASSERT(arithProfile.bits() == BinaryArithProfile::observedNumberNumberBits()); | ||
| ASSERT(arithProfile.lhsObservedType().isOnlyNumber()); | ||
| ASSERT(arithProfile.rhsObservedType().isOnlyNumber()); | ||
| } | ||
| { | ||
| BinaryArithProfile arithProfile; | ||
| arithProfile.lhsSawInt32(); | ||
| arithProfile.rhsSawNumber(); | ||
| ASSERT(arithProfile.bits() == BinaryArithProfile::observedIntNumberBits()); | ||
| ASSERT(arithProfile.lhsObservedType().isOnlyInt32()); | ||
| ASSERT(arithProfile.rhsObservedType().isOnlyNumber()); | ||
| } | ||
|
|
||
| #if ENABLE(DFG_JIT) | ||
| // We share the same layout for particular fields in all JITData to make our data IC assume this. | ||
| static_assert(BaselineJITData::offsetOfGlobalObject() == DFG::JITData::offsetOfGlobalObject()); | ||
| static_assert(BaselineJITData::offsetOfStackOffset() == DFG::JITData::offsetOfStackOffset()); | ||
| #endif | ||
| } | ||
|
|
||
| } // namespace JSC |
Oops, something went wrong.