Changeset 287003 in webkit

Timestamp:

Dec 13, 2021, 7:27:43 PM (5 years ago)

Author:

Russell Epstein

Message:

Revert "Revert r286382. rdar://problem/86408710"

This reverts commit r286996.

Location:

branches/safari-613.1.11-branch/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• runtime/StructureChain.cpp (modified) (1 diff)

branches/safari-613.1.11-branch/Source/JavaScriptCore/ChangeLog

@@ -1 @@
-2021-12-13  Alan Coon  <alancoon@apple.com>
-
-        Revert r286382. rdar://problem/86408710
-
 2021-12-03  Keith Miller  <keith_miller@apple.com>
 

branches/safari-613.1.11-branch/Source/JavaScriptCore/runtime/StructureChain.cpp

@@ -50 +50 @@
     size_t bytes = Checked<size_t>(size) * sizeof(StructureID);
     void* vector = vm.jsValueGigacageAuxiliarySpace().allocateNonVirtual(vm, bytes, nullptr, AllocationFailureMode::Assert);
+    static_assert(!StructureID().bits(), "Make sure the value we're going to memcpy below matches the default StructureID");
     memset(vector, 0, bytes);
     StructureChain* chain = new (NotNull, allocateCell<StructureChain>(vm)) StructureChain(vm, vm.structureChainStructure.get(), static_cast<StructureID*>(vector));