Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (242086 => 242087)
--- trunk/Source/_javascript_Core/ChangeLog 2019-02-26 16:28:39 UTC (rev 242086)
+++ trunk/Source/_javascript_Core/ChangeLog 2019-02-26 17:13:14 UTC (rev 242087)
@@ -1,3 +1,15 @@
+2019-02-26 Ryan Haddad <[email protected]>
+
+ Unreviewed, rolling out r242071.
+
+ Breaks internal builds.
+
+ Reverted changeset:
+
+ "Add some randomness into the StructureID."
+ https://bugs.webkit.org/show_bug.cgi?id=194989
+ https://trac.webkit.org/changeset/242071
+
2019-02-26 Guillaume Emont <[email protected]>
[JSC] Fix compilation on 32-bit platforms after r242071
Modified: trunk/Source/_javascript_Core/ftl/FTLLowerDFGToB3.cpp (242086 => 242087)
--- trunk/Source/_javascript_Core/ftl/FTLLowerDFGToB3.cpp 2019-02-26 16:28:39 UTC (rev 242086)
+++ trunk/Source/_javascript_Core/ftl/FTLLowerDFGToB3.cpp 2019-02-26 17:13:14 UTC (rev 242087)
@@ -16944,13 +16944,12 @@
LValue loadStructure(LValue value)
{
- LValue structureID = m_out.load32(value, m_heaps.JSCell_structureID);
- LValue tableBase = m_out.loadPtr(m_out.absolute(vm().heap.structureIDTable().base()));
- LValue tableIndex = m_out.aShr(structureID, m_out.constInt32(StructureIDTable::s_numberOfEntropyBits));
- LValue entropyBits = m_out.shl(m_out.zeroExtPtr(structureID), m_out.constInt32(StructureIDTable::s_entropyBitsShiftForStructurePointer));
- TypedPointer address = m_out.baseIndex(m_heaps.structureTable, tableBase, m_out.zeroExtPtr(tableIndex));
- LValue encodedStructureBits = m_out.loadPtr(address);
- return m_out.bitXor(encodedStructureBits, entropyBits);
+ LValue tableIndex = m_out.load32(value, m_heaps.JSCell_structureID);
+ LValue tableBase = m_out.loadPtr(
+ m_out.absolute(vm().heap.structureIDTable().base()));
+ TypedPointer address = m_out.baseIndex(
+ m_heaps.structureTable, tableBase, m_out.zeroExtPtr(tableIndex));
+ return m_out.loadPtr(address);
}
LValue weakPointer(JSCell* pointer)
Modified: trunk/Source/_javascript_Core/heap/SlotVisitor.cpp (242086 => 242087)
--- trunk/Source/_javascript_Core/heap/SlotVisitor.cpp 2019-02-26 16:28:39 UTC (rev 242086)
+++ trunk/Source/_javascript_Core/heap/SlotVisitor.cpp 2019-02-26 17:13:14 UTC (rev 242087)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2012-2019 Apple Inc. All rights reserved.
+ * Copyright (C) 2012-2018 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -198,8 +198,8 @@
#if USE(JSVALUE64)
// This detects the worst of the badness.
- if (!heap()->structureIDTable().isValid(structureID))
- die("GC scan found corrupt object: structureID is invalid!\n");
+ if (structureID >= heap()->structureIDTable().size())
+ die("GC scan found corrupt object: structureID is out of bounds!\n");
#endif
};
Modified: trunk/Source/_javascript_Core/jit/AssemblyHelpers.cpp (242086 => 242087)
--- trunk/Source/_javascript_Core/jit/AssemblyHelpers.cpp 2019-02-26 16:28:39 UTC (rev 242086)
+++ trunk/Source/_javascript_Core/jit/AssemblyHelpers.cpp 2019-02-26 17:13:14 UTC (rev 242087)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2011-2019 Apple Inc. All rights reserved.
+ * Copyright (C) 2011-2018 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -369,29 +369,15 @@
void AssemblyHelpers::emitLoadStructure(VM& vm, RegisterID source, RegisterID dest, RegisterID scratch)
{
#if USE(JSVALUE64)
-#if CPU(ARM64)
- RegisterID scratch2 = dataTempRegister;
-#elif CPU(X86_64)
- RegisterID scratch2 = scratchRegister();
-#else
-#error "Unsupported cpu"
-#endif
-
ASSERT(dest != scratch);
- ASSERT(dest != scratch2);
- ASSERT(scratch != scratch2);
-
- load32(MacroAssembler::Address(source, JSCell::structureIDOffset()), scratch2);
+ load32(MacroAssembler::Address(source, JSCell::structureIDOffset()), dest);
loadPtr(vm.heap.structureIDTable().base(), scratch);
- rshift32(scratch2, TrustedImm32(StructureIDTable::s_numberOfEntropyBits), dest);
loadPtr(MacroAssembler::BaseIndex(scratch, dest, MacroAssembler::TimesEight), dest);
- lshiftPtr(TrustedImm32(StructureIDTable::s_entropyBitsShiftForStructurePointer), scratch2);
- xorPtr(scratch2, dest);
-#else // not USE(JSVALUE64)
+#else
UNUSED_PARAM(scratch);
UNUSED_PARAM(vm);
loadPtr(MacroAssembler::Address(source, JSCell::structureIDOffset()), dest);
-#endif // not USE(JSVALUE64)
+#endif
}
void AssemblyHelpers::makeSpaceOnStackForCCall()
Modified: trunk/Source/_javascript_Core/jit/AssemblyHelpers.h (242086 => 242087)
--- trunk/Source/_javascript_Core/jit/AssemblyHelpers.h 2019-02-26 16:28:39 UTC (rev 242086)
+++ trunk/Source/_javascript_Core/jit/AssemblyHelpers.h 2019-02-26 17:13:14 UTC (rev 242087)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2011-2019 Apple Inc. All rights reserved.
+ * Copyright (C) 2011-2018 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -1782,7 +1782,7 @@
storePtr(TrustedImmPtr(nullptr), Address(resultGPR, JSObject::butterflyOffset()));
}
- JumpList branchIfValue(VM&, JSValueRegs, GPRReg scratch, GPRReg scratchIfShouldCheckMasqueradesAsUndefined, FPRReg, FPRReg, bool shouldCheckMasqueradesAsUndefined, JSGlobalObject*, bool negateResult);
+ JumpList branchIfValue(VM&, JSValueRegs value, GPRReg scratch, GPRReg scratchIfShouldCheckMasqueradesAsUndefined, FPRReg, FPRReg, bool shouldCheckMasqueradesAsUndefined, JSGlobalObject*, bool negateResult);
JumpList branchIfTruthy(VM& vm, JSValueRegs value, GPRReg scratch, GPRReg scratchIfShouldCheckMasqueradesAsUndefined, FPRReg scratchFPR0, FPRReg scratchFPR1, bool shouldCheckMasqueradesAsUndefined, JSGlobalObject* globalObject)
{
return branchIfValue(vm, value, scratch, scratchIfShouldCheckMasqueradesAsUndefined, scratchFPR0, scratchFPR1, shouldCheckMasqueradesAsUndefined, globalObject, false);
@@ -1791,7 +1791,7 @@
{
return branchIfValue(vm, value, scratch, scratchIfShouldCheckMasqueradesAsUndefined, scratchFPR0, scratchFPR1, shouldCheckMasqueradesAsUndefined, globalObject, true);
}
- void emitConvertValueToBoolean(VM&, JSValueRegs, GPRReg result, GPRReg scratchIfShouldCheckMasqueradesAsUndefined, FPRReg, FPRReg, bool shouldCheckMasqueradesAsUndefined, JSGlobalObject*, bool negateResult = false);
+ void emitConvertValueToBoolean(VM&, JSValueRegs value, GPRReg result, GPRReg scratchIfShouldCheckMasqueradesAsUndefined, FPRReg, FPRReg, bool shouldCheckMasqueradesAsUndefined, JSGlobalObject*, bool negateResult = false);
template<typename ClassType>
void emitAllocateDestructibleObject(VM& vm, GPRReg resultGPR, Structure* structure, GPRReg scratchGPR1, GPRReg scratchGPR2, JumpList& slowPath)
Modified: trunk/Source/_javascript_Core/jit/SpecializedThunkJIT.h (242086 => 242087)
--- trunk/Source/_javascript_Core/jit/SpecializedThunkJIT.h 2019-02-26 16:28:39 UTC (rev 242086)
+++ trunk/Source/_javascript_Core/jit/SpecializedThunkJIT.h 2019-02-26 17:13:14 UTC (rev 242087)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2010-2019 Apple Inc. All rights reserved.
+ * Copyright (C) 2010-2018 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -71,6 +71,15 @@
m_failures.append(branchIfNotString(dst));
}
+ void loadArgumentWithSpecificClass(const ClassInfo* classInfo, int argument, RegisterID dst, RegisterID scratch)
+ {
+ loadCellArgument(argument, dst);
+ emitLoadStructure(*vm(), dst, scratch, dst);
+ appendFailure(branchPtr(NotEqual, Address(scratch, Structure::classInfoOffset()), TrustedImmPtr(PoisonedClassInfoPtr(classInfo).bits())));
+ // We have to reload the argument since emitLoadStructure clobbered it.
+ loadCellArgument(argument, dst);
+ }
+
void loadInt32Argument(int argument, RegisterID dst, Jump& failTarget)
{
unsigned src = ""
Modified: trunk/Source/_javascript_Core/llint/LowLevelInterpreter.asm (242086 => 242087)
--- trunk/Source/_javascript_Core/llint/LowLevelInterpreter.asm 2019-02-26 16:28:39 UTC (rev 242086)
+++ trunk/Source/_javascript_Core/llint/LowLevelInterpreter.asm 2019-02-26 17:13:14 UTC (rev 242087)
@@ -204,11 +204,6 @@
const LowestTag = constexpr JSValue::LowestTag
end
-if JSVALUE64
- const NumberOfStructureIDEntropyBits = constexpr StructureIDTable::s_numberOfEntropyBits
- const StructureEntropyBitsShift = constexpr StructureIDTable::s_entropyBitsShiftForStructurePointer
-end
-
const CallOpCodeSize = constexpr op_call_length
const maxFrameExtentForSlowPathCall = constexpr maxFrameExtentForSlowPathCall
Modified: trunk/Source/_javascript_Core/llint/LowLevelInterpreter64.asm (242086 => 242087)
--- trunk/Source/_javascript_Core/llint/LowLevelInterpreter64.asm 2019-02-26 16:28:39 UTC (rev 242086)
+++ trunk/Source/_javascript_Core/llint/LowLevelInterpreter64.asm 2019-02-26 17:13:14 UTC (rev 242087)
@@ -530,20 +530,16 @@
end)
end
-macro structureIDToStructureWithScratch(structureIDThenStructure, scratch, scratch2)
+macro structureIDToStructureWithScratch(structureIDThenStructure, scratch)
loadp CodeBlock[cfr], scratch
- move structureIDThenStructure, scratch2
loadp CodeBlock::m_vm[scratch], scratch
- rshifti NumberOfStructureIDEntropyBits, scratch2
loadp VM::heap + Heap::m_structureIDTable + StructureIDTable::m_table[scratch], scratch
- loadp [scratch, scratch2, PtrSize], scratch2
- lshiftp StructureEntropyBitsShift, structureIDThenStructure
- xorp scratch2, structureIDThenStructure
+ loadp [scratch, structureIDThenStructure, PtrSize], structureIDThenStructure
end
-macro loadStructureWithScratch(cell, structure, scratch, scratch2)
+macro loadStructureWithScratch(cell, structure, scratch)
loadi JSCell::m_structureID[cell], structure
- structureIDToStructureWithScratch(structure, scratch, scratch2)
+ structureIDToStructureWithScratch(structure, scratch)
end
# Entrypoints into the interpreter.
@@ -698,7 +694,7 @@
loadq [cfr, t0, 8], t0
btqnz t0, tagMask, .opToThisSlow
bbneq JSCell::m_type[t0], FinalObjectType, .opToThisSlow
- loadStructureWithScratch(t0, t1, t2, t3)
+ loadStructureWithScratch(t0, t1, t2)
metadata(t2, t3)
loadp OpToThis::Metadata::m_cachedStructure[t2], t2
bpneq t1, t2, .opToThisSlow
@@ -768,7 +764,7 @@
move 0, t0
jmp .done
.masqueradesAsUndefined:
- loadStructureWithScratch(t0, t2, t1, t3)
+ loadStructureWithScratch(t0, t2, t1)
loadp CodeBlock[cfr], t0
loadp CodeBlock::m_globalObject[t0], t0
cpeq Structure::m_globalObject[t2], t0, t0
@@ -1186,7 +1182,7 @@
move ValueFalse, t1
return(t1)
.masqueradesAsUndefined:
- loadStructureWithScratch(t0, t3, t1, t2)
+ loadStructureWithScratch(t0, t3, t1)
loadp CodeBlock[cfr], t1
loadp CodeBlock::m_globalObject[t1], t1
cpeq Structure::m_globalObject[t3], t1, t0
@@ -1357,7 +1353,7 @@
loadp OpPutById::Metadata::m_structureChain[t5], t3
btpz t3, .opPutByIdTransitionDirect
- structureIDToStructureWithScratch(t2, t1, t3)
+ structureIDToStructureWithScratch(t2, t1)
# reload the StructureChain since we used t3 as a scratch above
loadp OpPutById::Metadata::m_structureChain[t5], t3
@@ -1695,7 +1691,7 @@
assertNotConstant(size, t0)
loadq [cfr, t0, 8], t0
btqnz t0, tagMask, .immediate
- loadStructureWithScratch(t0, t2, t1, t3)
+ loadStructureWithScratch(t0, t2, t1)
cellHandler(t2, JSCell::m_flags[t0], .target)
dispatch()
@@ -2218,7 +2214,7 @@
macro loadWithStructureCheck(opcodeStruct, get, slowPath)
get(m_scope, t0)
loadq [cfr, t0, 8], t0
- loadStructureWithScratch(t0, t2, t1, t3)
+ loadStructureWithScratch(t0, t2, t1)
loadp %opcodeStruct%::Metadata::m_structure[t5], t1
bpneq t2, t1, slowPath
end
Modified: trunk/Source/_javascript_Core/runtime/StructureIDTable.cpp (242086 => 242087)
--- trunk/Source/_javascript_Core/runtime/StructureIDTable.cpp 2019-02-26 16:28:39 UTC (rev 242086)
+++ trunk/Source/_javascript_Core/runtime/StructureIDTable.cpp 2019-02-26 17:13:14 UTC (rev 242087)
@@ -35,14 +35,14 @@
StructureIDTable::StructureIDTable()
: m_table(makeUniqueArray<StructureOrOffset>(s_initialSize))
- , m_size(1)
, m_capacity(s_initialSize)
{
// We pre-allocate the first offset so that the null Structure
// can still be represented as the StructureID '0'.
- table()[0].encodedStructureBits = 0;
+ table()[0].structure = nullptr;
makeFreeListFromRange(1, m_capacity - 1);
+ ASSERT(m_size == m_capacity);
}
void StructureIDTable::makeFreeListFromRange(uint32_t first, uint32_t last)
@@ -95,13 +95,11 @@
m_firstFreeOffset = head;
m_lastFreeOffset = tail;
+ m_size = m_capacity;
}
void StructureIDTable::resize(size_t newCapacity)
{
- if (newCapacity > s_maximumNumberOfStructures)
- newCapacity = s_maximumNumberOfStructures;
-
// Create the new table.
auto newTable = makeUniqueArray<StructureOrOffset>(newCapacity);
@@ -130,35 +128,22 @@
StructureID StructureIDTable::allocateID(Structure* structure)
{
- if (UNLIKELY(!m_firstFreeOffset)) {
- RELEASE_ASSERT(m_capacity <= s_maximumNumberOfStructures);
+ if (!m_firstFreeOffset) {
+ RELEASE_ASSERT(m_capacity <= UINT_MAX);
+ if (m_size == m_capacity)
+ resize(m_capacity * 2);
ASSERT(m_size == m_capacity);
- resize(m_capacity * 2);
- ASSERT(m_size < m_capacity);
ASSERT(m_firstFreeOffset);
}
ASSERT(m_firstFreeOffset != s_unusedID);
- // entropyBits must not be zero. This ensures that if a corrupted
- // structureID is encountered (with incorrect entropyBits), the decoded
- // structure pointer for that ID will be always be a bad pointer with
- // high bits set.
- constexpr uint32_t entropyBitsMask = (1 << s_numberOfEntropyBits) - 1;
- uint32_t entropyBits = m_weakRandom.getUint32() & entropyBitsMask;
- if (UNLIKELY(!entropyBits)) {
- constexpr uint32_t numberOfValuesToPickFrom = entropyBitsMask;
- entropyBits = (m_weakRandom.getUint32() % numberOfValuesToPickFrom) + 1;
- }
-
- uint32_t structureIndex = m_firstFreeOffset;
+ StructureID result = m_firstFreeOffset;
m_firstFreeOffset = table()[m_firstFreeOffset].offset;
if (!m_firstFreeOffset)
m_lastFreeOffset = 0;
- StructureID result = (structureIndex << s_numberOfEntropyBits) | entropyBits;
- table()[structureIndex].encodedStructureBits = encode(structure, result);
- m_size++;
+ table()[result].structure = structure;
ASSERT(!isNuked(result));
return result;
}
@@ -166,25 +151,23 @@
void StructureIDTable::deallocateID(Structure* structure, StructureID structureID)
{
ASSERT(structureID != s_unusedID);
- uint32_t structureIndex = structureID >> s_numberOfEntropyBits;
- ASSERT(structureIndex && structureIndex < s_maximumNumberOfStructures);
- RELEASE_ASSERT(table()[structureIndex].encodedStructureBits == encode(structure, structureID));
- m_size--;
+ RELEASE_ASSERT(table()[structureID].structure == structure);
+
if (!m_firstFreeOffset) {
- table()[structureIndex].offset = 0;
- m_firstFreeOffset = structureIndex;
- m_lastFreeOffset = structureIndex;
+ table()[structureID].offset = 0;
+ m_firstFreeOffset = structureID;
+ m_lastFreeOffset = structureID;
return;
}
bool insertAtHead = m_weakRandom.getUint32() & 1;
if (insertAtHead) {
- table()[structureIndex].offset = m_firstFreeOffset;
- m_firstFreeOffset = structureIndex;
+ table()[structureID].offset = m_firstFreeOffset;
+ m_firstFreeOffset = structureID;
} else {
- table()[structureIndex].offset = 0;
- table()[m_lastFreeOffset].offset = structureIndex;
- m_lastFreeOffset = structureIndex;
+ table()[structureID].offset = 0;
+ table()[m_lastFreeOffset].offset = structureID;
+ m_lastFreeOffset = structureID;
}
}
Modified: trunk/Source/_javascript_Core/runtime/StructureIDTable.h (242086 => 242087)
--- trunk/Source/_javascript_Core/runtime/StructureIDTable.h 2019-02-26 16:28:39 UTC (rev 242086)
+++ trunk/Source/_javascript_Core/runtime/StructureIDTable.h 2019-02-26 17:13:14 UTC (rev 242087)
@@ -82,8 +82,6 @@
#if USE(JSVALUE64)
-using EncodedStructureBits = uintptr_t;
-
class StructureIDTable {
friend class LLIntOffsetsExtractor;
public:
@@ -91,7 +89,6 @@
void** base() { return reinterpret_cast<void**>(&m_table); }
- bool isValid(StructureID);
Structure* get(StructureID);
void deallocateID(Structure*, StructureID);
StructureID allocateID(Structure*);
@@ -107,14 +104,12 @@
union StructureOrOffset {
WTF_MAKE_FAST_ALLOCATED;
public:
- EncodedStructureBits encodedStructureBits;
+ Structure* structure;
StructureID offset;
};
StructureOrOffset* table() const { return m_table.get(); }
- static Structure* decode(EncodedStructureBits, StructureID);
- static EncodedStructureBits encode(Structure*, StructureID);
-
+
static constexpr size_t s_initialSize = 512;
Vector<UniqueArray<StructureOrOffset>> m_oldTables;
@@ -128,67 +123,17 @@
WeakRandom m_weakRandom;
- static constexpr StructureID s_unusedID = 0;
-
-public:
- // 1. StructureID is encoded as:
- //
- // ----------------------------------------------------------------
- // | 1 Nuke Bit | 24 StructureIDTable index bits | 7 entropy bits |
- // ----------------------------------------------------------------
- //
- // The entropy bits are chosen at random and assigned when a StructureID
- // is allocated.
- //
- // 2. For each StructureID, the StructureIDTable stores encodedStructureBits
- // which are encoded from the structure pointer as such:
- //
- // ----------------------------------------------------------------
- // | 7 entropy bits | 57 structure pointer bits |
- // ----------------------------------------------------------------
- //
- // The entropy bits here are the same 7 bits used in the encoding of the
- // StructureID for this structure entry in the StructureIDTable.
-
- static constexpr uint32_t s_numberOfNukeBits = 1;
- static constexpr uint32_t s_numberOfEntropyBits = 7;
- static constexpr uint32_t s_entropyBitsShiftForStructurePointer = 64 - s_numberOfEntropyBits;
-
- static constexpr uint32_t s_maximumNumberOfStructures = 1 << (32 - s_numberOfEntropyBits - s_numberOfNukeBits);
+ static const StructureID s_unusedID = unusedPointer;
};
-ALWAYS_INLINE Structure* StructureIDTable::decode(EncodedStructureBits bits, StructureID structureID)
-{
- return reinterpret_cast<Structure*>(bits ^ (static_cast<uintptr_t>(structureID) << s_entropyBitsShiftForStructurePointer));
-}
-
-ALWAYS_INLINE EncodedStructureBits StructureIDTable::encode(Structure* structure, StructureID structureID)
-{
- return reinterpret_cast<EncodedStructureBits>(structure) ^ (static_cast<EncodedStructureBits>(structureID) << s_entropyBitsShiftForStructurePointer);
-}
-
inline Structure* StructureIDTable::get(StructureID structureID)
{
ASSERT_WITH_SECURITY_IMPLICATION(structureID);
ASSERT_WITH_SECURITY_IMPLICATION(!isNuked(structureID));
- uint32_t structureIndex = structureID >> s_numberOfEntropyBits;
- ASSERT_WITH_SECURITY_IMPLICATION(structureIndex < m_capacity);
- return decode(table()[structureIndex].encodedStructureBits, structureID);
+ ASSERT_WITH_SECURITY_IMPLICATION(structureID < m_capacity);
+ return table()[structureID].structure;
}
-inline bool StructureIDTable::isValid(StructureID structureID)
-{
- if (!structureID)
- return false;
- uint32_t structureIndex = structureID >> s_numberOfEntropyBits;
- if (structureIndex >= m_capacity)
- return false;
- Structure* structure = decode(table()[structureIndex].encodedStructureBits, structureID);
- if (reinterpret_cast<uintptr_t>(structure) >> s_entropyBitsShiftForStructurePointer)
- return false;
- return true;
-}
-
#else // not USE(JSVALUE64)
class StructureIDTable {
