Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (224563 => 224564)
--- trunk/Source/_javascript_Core/ChangeLog 2017-11-08 05:41:30 UTC (rev 224563)
+++ trunk/Source/_javascript_Core/ChangeLog 2017-11-08 06:29:31 UTC (rev 224564)
@@ -1,3 +1,70 @@
+2017-11-07 Saam Barati <[email protected]>
+
+ Only cage double butterfly accesses
+ https://bugs.webkit.org/show_bug.cgi?id=179202
+
+ Reviewed by Mark Lam.
+
+ This patch removes caging from all butterfly accesses except double loads/stores.
+ This is a performance vs security tradeoff. Double loads/stores are the only butterfly
+ loads/stores that can write arbitrary bit patterns, so we choose to keep them safe
+ by caging. The other load/stores we are no longer caging to get back performance on
+ various benchmarks.
+
+ * bytecode/AccessCase.cpp:
+ (JSC::AccessCase::generateImpl):
+ * bytecode/InlineAccess.cpp:
+ (JSC::InlineAccess::dumpCacheSizesAndCrash):
+ (JSC::InlineAccess::generateSelfPropertyAccess):
+ (JSC::InlineAccess::generateSelfPropertyReplace):
+ (JSC::InlineAccess::generateArrayLength):
+ * dfg/DFGFixedButterflyAccessUncagingPhase.cpp:
+ * dfg/DFGSpeculativeJIT.cpp:
+ (JSC::DFG::SpeculativeJIT::compileCreateRest):
+ (JSC::DFG::SpeculativeJIT::compileSpread):
+ (JSC::DFG::SpeculativeJIT::compileNewArrayWithSpread):
+ * dfg/DFGSpeculativeJIT64.cpp:
+ (JSC::DFG::SpeculativeJIT::compile):
+ * ftl/FTLLowerDFGToB3.cpp:
+ (JSC::FTL::DFG::LowerDFGToB3::compileGetDirectPname):
+ * jit/JITPropertyAccess.cpp:
+ (JSC::JIT::emitContiguousLoad):
+ (JSC::JIT::emitArrayStorageLoad):
+ (JSC::JIT::emitGenericContiguousPutByVal):
+ (JSC::JIT::emitArrayStoragePutByVal):
+ (JSC::JIT::emit_op_get_from_scope):
+ (JSC::JIT::emit_op_put_to_scope):
+ * llint/LowLevelInterpreter64.asm:
+ * runtime/AuxiliaryBarrier.h:
+ (JSC::AuxiliaryBarrier::operator-> const):
+ * runtime/Butterfly.h:
+ (JSC::Butterfly::caged):
+ (JSC::Butterfly::contiguousDouble):
+ * runtime/JSArray.cpp:
+ (JSC::JSArray::setLength):
+ (JSC::JSArray::pop):
+ (JSC::JSArray::shiftCountWithAnyIndexingType):
+ (JSC::JSArray::unshiftCountWithAnyIndexingType):
+ (JSC::JSArray::fillArgList):
+ (JSC::JSArray::copyToArguments):
+ * runtime/JSArrayInlines.h:
+ (JSC::JSArray::pushInline):
+ * runtime/JSObject.cpp:
+ (JSC::JSObject::heapSnapshot):
+ (JSC::JSObject::createInitialIndexedStorage):
+ (JSC::JSObject::createArrayStorage):
+ (JSC::JSObject::convertUndecidedToInt32):
+ (JSC::JSObject::ensureLengthSlow):
+ (JSC::JSObject::reallocateAndShrinkButterfly):
+ (JSC::JSObject::allocateMoreOutOfLineStorage):
+ * runtime/JSObject.h:
+ (JSC::JSObject::canGetIndexQuickly):
+ (JSC::JSObject::getIndexQuickly):
+ (JSC::JSObject::tryGetIndexQuickly const):
+ (JSC::JSObject::canSetIndexQuickly):
+ (JSC::JSObject::butterfly const):
+ (JSC::JSObject::butterfly):
+
2017-11-07 Mark Lam <[email protected]>
Introduce a default RegisterSet constructor so that we can use { } notation.
Modified: trunk/Source/_javascript_Core/bytecode/AccessCase.cpp (224563 => 224564)
--- trunk/Source/_javascript_Core/bytecode/AccessCase.cpp 2017-11-08 05:41:30 UTC (rev 224563)
+++ trunk/Source/_javascript_Core/bytecode/AccessCase.cpp 2017-11-08 06:29:31 UTC (rev 224564)
@@ -624,7 +624,6 @@
jit.loadPtr(
CCallHelpers::Address(baseForAccessGPR, JSObject::butterflyOffset()),
loadedValueGPR);
- jit.cage(Gigacage::JSValue, loadedValueGPR);
storageGPR = loadedValueGPR;
}
@@ -975,7 +974,6 @@
// already had out-of-line property storage).
jit.loadPtr(CCallHelpers::Address(baseGPR, JSObject::butterflyOffset()), scratchGPR3);
- jit.cage(Gigacage::JSValue, scratchGPR3);
// We have scratchGPR = new storage, scratchGPR3 = old storage,
// scratchGPR2 = available
@@ -1056,10 +1054,8 @@
JSObject::offsetOfInlineStorage() +
offsetInInlineStorage(m_offset) * sizeof(JSValue)));
} else {
- if (!allocating) {
+ if (!allocating)
jit.loadPtr(CCallHelpers::Address(baseGPR, JSObject::butterflyOffset()), scratchGPR);
- jit.cage(Gigacage::JSValue, scratchGPR);
- }
jit.storeValue(
valueRegs,
CCallHelpers::Address(scratchGPR, offsetInButterfly(m_offset) * sizeof(JSValue)));
@@ -1095,7 +1091,6 @@
case ArrayLength: {
jit.loadPtr(CCallHelpers::Address(baseGPR, JSObject::butterflyOffset()), scratchGPR);
- jit.cage(Gigacage::JSValue, scratchGPR);
jit.load32(CCallHelpers::Address(scratchGPR, ArrayStorage::lengthOffset()), scratchGPR);
state.failAndIgnore.append(
jit.branch32(CCallHelpers::LessThan, scratchGPR, CCallHelpers::TrustedImm32(0)));
Modified: trunk/Source/_javascript_Core/bytecode/InlineAccess.cpp (224563 => 224564)
--- trunk/Source/_javascript_Core/bytecode/InlineAccess.cpp 2017-11-08 05:41:30 UTC (rev 224563)
+++ trunk/Source/_javascript_Core/bytecode/InlineAccess.cpp 2017-11-08 06:29:31 UTC (rev 224564)
@@ -57,7 +57,6 @@
jit.patchableBranch32(
CCallHelpers::NotEqual, value, CCallHelpers::TrustedImm32(IsArray | ContiguousShape));
jit.loadPtr(CCallHelpers::Address(base, JSObject::butterflyOffset()), value);
- jit.cage(Gigacage::JSValue, value);
jit.load32(CCallHelpers::Address(value, ArrayStorage::lengthOffset()), value);
jit.boxInt32(scratchGPR, regs);
@@ -74,7 +73,6 @@
jit.loadPtr(
CCallHelpers::Address(base, JSObject::butterflyOffset()),
value);
- jit.cage(Gigacage::JSValue, value);
GPRReg storageGPR = value;
jit.loadValue(
CCallHelpers::Address(storageGPR, 0x000ab21ca), regs);
@@ -118,7 +116,6 @@
MacroAssembler::TrustedImm32(0x000ab21ca));
jit.loadPtr(MacroAssembler::Address(base, JSObject::butterflyOffset()), value);
- jit.cage(Gigacage::JSValue, value);
jit.storeValue(
regs,
MacroAssembler::Address(base, 120342));
@@ -173,7 +170,6 @@
storage = base;
else {
jit.loadPtr(CCallHelpers::Address(base, JSObject::butterflyOffset()), value.payloadGPR());
- jit.cage(Gigacage::JSValue, value.payloadGPR());
storage = value.payloadGPR();
}
@@ -235,7 +231,6 @@
storage = getScratchRegister(stubInfo);
ASSERT(storage != InvalidGPRReg);
jit.loadPtr(CCallHelpers::Address(base, JSObject::butterflyOffset()), storage);
- jit.cage(Gigacage::JSValue, storage);
}
jit.storeValue(
@@ -274,7 +269,6 @@
auto branchToSlowPath = jit.patchableBranch32(
CCallHelpers::NotEqual, scratch, CCallHelpers::TrustedImm32(array->indexingType()));
jit.loadPtr(CCallHelpers::Address(base, JSObject::butterflyOffset()), value.payloadGPR());
- jit.cage(Gigacage::JSValue, value.payloadGPR());
jit.load32(CCallHelpers::Address(value.payloadGPR(), ArrayStorage::lengthOffset()), value.payloadGPR());
jit.boxInt32(value.payloadGPR(), value);
Modified: trunk/Source/_javascript_Core/dfg/DFGFixedButterflyAccessUncagingPhase.cpp (224563 => 224564)
--- trunk/Source/_javascript_Core/dfg/DFGFixedButterflyAccessUncagingPhase.cpp 2017-11-08 05:41:30 UTC (rev 224563)
+++ trunk/Source/_javascript_Core/dfg/DFGFixedButterflyAccessUncagingPhase.cpp 2017-11-08 06:29:31 UTC (rev 224564)
@@ -75,11 +75,38 @@
// https://bugs.webkit.org/show_bug.cgi?id=174926
if (!accessesOverlap(m_graph, node, Heap))
break;
-
+
+ Node* toExclude = nullptr;
+ if (node->hasArrayMode() && node->arrayMode().type() != Array::Double) {
+ switch (node->op()) {
+ case ArrayPush:
+ toExclude = m_graph.varArgChild(node, 0).node();
+ break;
+ case ArrayIndexOf:
+ toExclude = m_graph.varArgChild(node, node->numChildren() == 3 ? 2 : 3).node();
+ break;
+ case ArrayPop:
+ toExclude = node->child2().node();
+ break;
+ case HasIndexedProperty:
+ toExclude = node->child3().node();
+ break;
+ case GetByVal:
+ toExclude = node->child3().node();
+ break;
+ case PutByVal:
+ toExclude = m_graph.varArgChild(node, 3).node();
+ break;
+ default:
+ break;
+ }
+ }
+
m_graph.doToChildren(
node,
[&] (Edge& edge) {
- changed |= needCaging.add(edge.node());
+ if (edge.node() != toExclude)
+ changed |= needCaging.add(edge.node());
});
break;
}
Modified: trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT.cpp (224563 => 224564)
--- trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT.cpp 2017-11-08 05:41:30 UTC (rev 224563)
+++ trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT.cpp 2017-11-08 06:29:31 UTC (rev 224564)
@@ -7269,7 +7269,6 @@
GPRReg butterflyGPR = butterfly.gpr();
m_jit.loadPtr(MacroAssembler::Address(arrayResultGPR, JSObject::butterflyOffset()), butterflyGPR);
- m_jit.cage(Gigacage::JSValue, butterflyGPR);
CCallHelpers::Jump skipLoop = m_jit.branch32(MacroAssembler::Equal, arrayLengthGPR, TrustedImm32(0));
m_jit.zeroExtend32ToPtr(arrayLengthGPR, currentLengthGPR);
@@ -7339,7 +7338,7 @@
slowPath.append(m_jit.branch32(MacroAssembler::Above, scratch1GPR, TrustedImm32(ContiguousShape - Int32Shape)));
m_jit.loadPtr(MacroAssembler::Address(argument, JSObject::butterflyOffset()), lengthGPR);
- m_jit.cage(Gigacage::JSValue, lengthGPR);
+ m_jit.cage(Gigacage::JSValue, lengthGPR); // We may do a double memcpy loop below, so we conservatively cage.
m_jit.load32(MacroAssembler::Address(lengthGPR, Butterfly::offsetOfPublicLength()), lengthGPR);
static_assert(sizeof(JSValue) == 8 && 1 << 3 == 8, "This is strongly assumed in the code below.");
m_jit.move(lengthGPR, scratch1GPR);
@@ -7350,7 +7349,7 @@
m_jit.store32(lengthGPR, MacroAssembler::Address(resultGPR, JSFixedArray::offsetOfSize()));
m_jit.loadPtr(MacroAssembler::Address(argument, JSObject::butterflyOffset()), scratch1GPR);
- m_jit.cage(Gigacage::JSValue, scratch1GPR);
+ m_jit.cage(Gigacage::JSValue, scratch1GPR); // We may do a double memcpy loop below, so we conservatively cage.
MacroAssembler::JumpList done;
@@ -7373,7 +7372,6 @@
isDoubleArray.link(&m_jit);
{
-
done.append(m_jit.branchTest32(MacroAssembler::Zero, lengthGPR));
auto loopStart = m_jit.label();
m_jit.sub32(TrustedImm32(1), lengthGPR);
@@ -7460,7 +7458,6 @@
m_jit.move(TrustedImm32(0), indexGPR);
m_jit.loadPtr(MacroAssembler::Address(resultGPR, JSObject::butterflyOffset()), storageGPR);
- m_jit.cage(Gigacage::JSValue, storageGPR);
for (unsigned i = 0; i < node->numChildren(); ++i) {
Edge use = m_jit.graph().varArgChild(node, i);
Modified: trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT64.cpp (224563 => 224564)
--- trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT64.cpp 2017-11-08 05:41:30 UTC (rev 224563)
+++ trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT64.cpp 2017-11-08 06:29:31 UTC (rev 224564)
@@ -5783,7 +5783,6 @@
// Otherwise it's out of line
outOfLineAccess.link(&m_jit);
m_jit.loadPtr(MacroAssembler::Address(baseGPR, JSObject::butterflyOffset()), scratch2GPR);
- m_jit.cage(Gigacage::JSValue, scratch2GPR);
m_jit.move(indexGPR, scratch1GPR);
m_jit.sub32(MacroAssembler::Address(enumeratorGPR, JSPropertyNameEnumerator::cachedInlineCapacityOffset()), scratch1GPR);
m_jit.neg32(scratch1GPR);
Modified: trunk/Source/_javascript_Core/ftl/FTLLowerDFGToB3.cpp (224563 => 224564)
--- trunk/Source/_javascript_Core/ftl/FTLLowerDFGToB3.cpp 2017-11-08 05:41:30 UTC (rev 224563)
+++ trunk/Source/_javascript_Core/ftl/FTLLowerDFGToB3.cpp 2017-11-08 06:29:31 UTC (rev 224564)
@@ -9349,7 +9349,7 @@
m_out.neg(m_out.sub(index, m_out.load32(enumerator, m_heaps.JSPropertyNameEnumerator_cachedInlineCapacity))));
int32_t offsetOfFirstProperty = static_cast<int32_t>(offsetInButterfly(firstOutOfLineOffset)) * sizeof(EncodedJSValue);
ValueFromBlock outOfLineResult = m_out.anchor(
- m_out.load64(m_out.baseIndex(m_heaps.properties.atAnyNumber(), caged(Gigacage::JSValue, storage), realIndex, ScaleEight, offsetOfFirstProperty)));
+ m_out.load64(m_out.baseIndex(m_heaps.properties.atAnyNumber(), storage, realIndex, ScaleEight, offsetOfFirstProperty)));
m_out.jump(continuation);
m_out.appendTo(slowCase, continuation);
Modified: trunk/Source/_javascript_Core/jit/JITPropertyAccess.cpp (224563 => 224564)
--- trunk/Source/_javascript_Core/jit/JITPropertyAccess.cpp 2017-11-08 05:41:30 UTC (rev 224563)
+++ trunk/Source/_javascript_Core/jit/JITPropertyAccess.cpp 2017-11-08 06:29:31 UTC (rev 224564)
@@ -187,7 +187,6 @@
badType = patchableBranch32(NotEqual, regT2, TrustedImm32(expectedShape));
loadPtr(Address(regT0, JSObject::butterflyOffset()), regT2);
- cage(Gigacage::JSValue, regT2);
slowCases.append(branch32(AboveOrEqual, regT1, Address(regT2, Butterfly::offsetOfPublicLength())));
load64(BaseIndex(regT2, regT1, TimesEight), regT0);
slowCases.append(branchTest64(Zero, regT0));
@@ -203,7 +202,6 @@
badType = patchableBranch32(Above, regT3, TrustedImm32(SlowPutArrayStorageShape - ArrayStorageShape));
loadPtr(Address(regT0, JSObject::butterflyOffset()), regT2);
- cage(Gigacage::JSValue, regT2);
slowCases.append(branch32(AboveOrEqual, regT1, Address(regT2, ArrayStorage::vectorLengthOffset())));
load64(BaseIndex(regT2, regT1, TimesEight, ArrayStorage::vectorOffset()), regT0);
@@ -345,7 +343,8 @@
badType = patchableBranch32(NotEqual, regT2, TrustedImm32(indexingShape));
loadPtr(Address(regT0, JSObject::butterflyOffset()), regT2);
- cage(Gigacage::JSValue, regT2);
+ if (indexingShape == DoubleShape)
+ cage(Gigacage::JSValue, regT2);
Jump outOfBounds = branch32(AboveOrEqual, regT1, Address(regT2, Butterfly::offsetOfPublicLength()));
Label storeResult = label();
@@ -401,7 +400,6 @@
badType = patchableBranch32(NotEqual, regT2, TrustedImm32(ArrayStorageShape));
loadPtr(Address(regT0, JSObject::butterflyOffset()), regT2);
- cage(Gigacage::JSValue, regT2);
slowCases.append(branch32(AboveOrEqual, regT1, Address(regT2, ArrayStorage::vectorLengthOffset())));
Jump empty = branchTest64(Zero, BaseIndex(regT2, regT1, TimesEight, ArrayStorage::vectorOffset()));
@@ -877,7 +875,6 @@
isOutOfLine.link(this);
}
loadPtr(Address(base, JSObject::butterflyOffset()), scratch);
- cage(Gigacage::JSValue, scratch);
neg32(offset);
signExtend32ToPtr(offset, offset);
load64(BaseIndex(scratch, offset, TimesEight, (firstOutOfLineOffset - 2) * sizeof(EncodedJSValue)), result);
@@ -997,7 +994,6 @@
emitGetVirtualRegister(value, regT2);
loadPtr(Address(regT0, JSObject::butterflyOffset()), regT0);
- cage(Gigacage::JSValue, regT0);
loadPtr(operandSlot, regT1);
negPtr(regT1);
storePtr(regT2, BaseIndex(regT0, regT1, TimesEight, (firstOutOfLineOffset - 2) * sizeof(EncodedJSValue)));
Modified: trunk/Source/_javascript_Core/llint/LowLevelInterpreter64.asm (224563 => 224564)
--- trunk/Source/_javascript_Core/llint/LowLevelInterpreter64.asm 2017-11-08 05:41:30 UTC (rev 224563)
+++ trunk/Source/_javascript_Core/llint/LowLevelInterpreter64.asm 2017-11-08 06:29:31 UTC (rev 224564)
@@ -1224,7 +1224,7 @@
macro loadPropertyAtVariableOffset(propertyOffsetAsInt, objectAndStorage, value)
bilt propertyOffsetAsInt, firstOutOfLineOffset, .isInline
- loadCaged(_g_gigacageBasePtrs + Gigacage::BasePtrs::jsValue, constexpr JSVALUE_GIGACAGE_MASK, JSObject::m_butterfly[objectAndStorage], objectAndStorage, value)
+ loadp JSObject::m_butterfly[objectAndStorage], objectAndStorage
negi propertyOffsetAsInt
sxi2q propertyOffsetAsInt, propertyOffsetAsInt
jmp .ready
@@ -1235,9 +1235,9 @@
end
-macro storePropertyAtVariableOffset(propertyOffsetAsInt, objectAndStorage, value, scratch)
+macro storePropertyAtVariableOffset(propertyOffsetAsInt, objectAndStorage, value)
bilt propertyOffsetAsInt, firstOutOfLineOffset, .isInline
- loadCaged(_g_gigacageBasePtrs + Gigacage::BasePtrs::jsValue, constexpr JSVALUE_GIGACAGE_MASK, JSObject::m_butterfly[objectAndStorage], objectAndStorage, scratch)
+ loadp JSObject::m_butterfly[objectAndStorage], objectAndStorage
negi propertyOffsetAsInt
sxi2q propertyOffsetAsInt, propertyOffsetAsInt
jmp .ready
@@ -1460,7 +1460,7 @@
loadisFromInstruction(3, t1)
loadConstantOrVariable(t1, t2)
loadisFromInstruction(5, t1)
- storePropertyAtVariableOffset(t1, t0, t2, t3)
+ storePropertyAtVariableOffset(t1, t0, t2)
writeBarrierOnOperands(1, 3)
dispatch(constexpr op_put_by_id_length)
@@ -2321,7 +2321,7 @@
loadisFromInstruction(3, t1)
loadConstantOrVariable(t1, t2)
loadisFromInstruction(6, t1)
- storePropertyAtVariableOffset(t1, t0, t2, t3)
+ storePropertyAtVariableOffset(t1, t0, t2)
end
macro putGlobalVariable()
Modified: trunk/Source/_javascript_Core/runtime/AuxiliaryBarrier.h (224563 => 224564)
--- trunk/Source/_javascript_Core/runtime/AuxiliaryBarrier.h 2017-11-08 05:41:30 UTC (rev 224563)
+++ trunk/Source/_javascript_Core/runtime/AuxiliaryBarrier.h 2017-11-08 06:29:31 UTC (rev 224564)
@@ -56,6 +56,8 @@
template<typename U>
void setWithoutBarrier(U&& value) { m_value = std::forward<U>(value); }
+
+ T operator->() const { return get(); }
private:
T m_value;
Modified: trunk/Source/_javascript_Core/runtime/Butterfly.h (224563 => 224564)
--- trunk/Source/_javascript_Core/runtime/Butterfly.h 2017-11-08 05:41:30 UTC (rev 224563)
+++ trunk/Source/_javascript_Core/runtime/Butterfly.h 2017-11-08 06:29:31 UTC (rev 224564)
@@ -27,6 +27,7 @@
#include "IndexingHeader.h"
#include "PropertyStorage.h"
+#include <wtf/Gigacage.h>
#include <wtf/Noncopyable.h>
namespace JSC {
@@ -102,6 +103,7 @@
}
char* pointer() { return reinterpret_cast<char*>(this); }
+ Butterfly* caged() { return Gigacage::caged(Gigacage::JSValue, this); }
static ptrdiff_t offsetOfIndexingHeader() { return IndexingHeader::offsetOfIndexingHeader(); }
static ptrdiff_t offsetOfArrayBuffer() { return offsetOfIndexingHeader() + IndexingHeader::offsetOfArrayBuffer(); }
@@ -129,7 +131,7 @@
ArrayStorage* arrayStorage() { return indexingPayload<ArrayStorage>(); }
ContiguousJSValues contiguousInt32() { return ContiguousJSValues(indexingPayload<WriteBarrier<Unknown>>(), vectorLength()); }
- ContiguousDoubles contiguousDouble() { return ContiguousDoubles(indexingPayload<double>(), vectorLength()); }
+ ContiguousDoubles contiguousDouble() { return ContiguousDoubles(caged()->indexingPayload<double>(), vectorLength()); }
ContiguousJSValues contiguous() { return ContiguousJSValues(indexingPayload<WriteBarrier<Unknown>>(), vectorLength()); }
static Butterfly* fromContiguous(WriteBarrier<Unknown>* contiguous)
Modified: trunk/Source/_javascript_Core/runtime/ButterflyInlines.h (224563 => 224564)
--- trunk/Source/_javascript_Core/runtime/ButterflyInlines.h 2017-11-08 05:41:30 UTC (rev 224563)
+++ trunk/Source/_javascript_Core/runtime/ButterflyInlines.h 2017-11-08 06:29:31 UTC (rev 224564)
@@ -107,6 +107,8 @@
if (!oldButterfly)
return create(vm, intendedOwner, 0, newPropertyCapacity, false, IndexingHeader(), 0);
+ oldButterfly = oldButterfly->caged();
+
size_t preCapacity = oldButterfly->indexingHeader()->preCapacity(structure);
size_t indexingPayloadSizeInBytes = oldButterfly->indexingHeader()->indexingPayloadSizeInBytes(structure);
bool hasIndexingHeader = structure->hasIndexingHeader(intendedOwner);
Modified: trunk/Source/_javascript_Core/runtime/JSArray.cpp (224563 => 224564)
--- trunk/Source/_javascript_Core/runtime/JSArray.cpp 2017-11-08 05:41:30 UTC (rev 224563)
+++ trunk/Source/_javascript_Core/runtime/JSArray.cpp 2017-11-08 06:29:31 UTC (rev 224564)
@@ -558,7 +558,7 @@
VM& vm = exec->vm();
auto scope = DECLARE_THROW_SCOPE(vm);
- Butterfly* butterfly = m_butterfly.getMayBeNull();
+ Butterfly* butterfly = this->butterfly();
switch (indexingType()) {
case ArrayClass:
if (!newLength)
@@ -628,7 +628,7 @@
VM& vm = exec->vm();
auto scope = DECLARE_THROW_SCOPE(vm);
- Butterfly* butterfly = m_butterfly.getMayBeNull();
+ Butterfly* butterfly = this->butterfly();
switch (indexingType()) {
case ArrayClass:
@@ -879,7 +879,7 @@
VM& vm = exec->vm();
RELEASE_ASSERT(count > 0);
- Butterfly* butterfly = m_butterfly.getMayBeNull();
+ Butterfly* butterfly = this->butterfly();
switch (indexingType()) {
case ArrayClass:
@@ -1035,7 +1035,7 @@
VM& vm = exec->vm();
auto scope = DECLARE_THROW_SCOPE(vm);
- Butterfly* butterfly = m_butterfly.getMayBeNull();
+ Butterfly* butterfly = this->butterfly();
switch (indexingType()) {
case ArrayClass:
@@ -1058,7 +1058,7 @@
throwOutOfMemoryError(exec, scope);
return false;
}
- butterfly = m_butterfly.getMayBeNull();
+ butterfly = this->butterfly();
// We have to check for holes before we start moving things around so that we don't get halfway
// through shifting and then realize we should have been in ArrayStorage mode.
@@ -1102,7 +1102,7 @@
throwOutOfMemoryError(exec, scope);
return false;
}
- butterfly = m_butterfly.getMayBeNull();
+ butterfly = this->butterfly();
// We have to check for holes before we start moving things around so that we don't get halfway
// through shifting and then realize we should have been in ArrayStorage mode.
@@ -1145,7 +1145,7 @@
unsigned vectorEnd;
WriteBarrier<Unknown>* vector;
- Butterfly* butterfly = m_butterfly.getMayBeNull();
+ Butterfly* butterfly = this->butterfly();
switch (indexingType()) {
case ArrayClass:
@@ -1218,7 +1218,7 @@
// FIXME: What prevents this from being called with a RuntimeArray? The length function will always return 0 in that case.
ASSERT(length == this->length());
- Butterfly* butterfly = m_butterfly.getMayBeNull();
+ Butterfly* butterfly = this->butterfly();
switch (indexingType()) {
case ArrayClass:
return;
Modified: trunk/Source/_javascript_Core/runtime/JSArrayInlines.h (224563 => 224564)
--- trunk/Source/_javascript_Core/runtime/JSArrayInlines.h 2017-11-08 05:41:30 UTC (rev 224563)
+++ trunk/Source/_javascript_Core/runtime/JSArrayInlines.h 2017-11-08 06:29:31 UTC (rev 224564)
@@ -88,7 +88,7 @@
VM& vm = exec->vm();
auto scope = DECLARE_THROW_SCOPE(vm);
- Butterfly* butterfly = m_butterfly.getMayBeNull();
+ Butterfly* butterfly = this->butterfly();
switch (indexingType()) {
case ArrayClass: {
Modified: trunk/Source/_javascript_Core/runtime/JSObject.cpp (224563 => 224564)
--- trunk/Source/_javascript_Core/runtime/JSObject.cpp 2017-11-08 05:41:30 UTC (rev 224563)
+++ trunk/Source/_javascript_Core/runtime/JSObject.cpp 2017-11-08 06:29:31 UTC (rev 224564)
@@ -462,7 +462,7 @@
builder.appendPropertyNameEdge(thisObject, toValue.asCell(), entry.key);
}
- Butterfly* butterfly = thisObject->m_butterfly.getMayBeNull();
+ Butterfly* butterfly = thisObject->butterfly();
if (butterfly) {
WriteBarrier<Unknown>* data = ""
uint32_t count = 0;
@@ -1026,7 +1026,7 @@
unsigned propertyCapacity = structure->outOfLineCapacity();
unsigned vectorLength = Butterfly::optimalContiguousVectorLength(propertyCapacity, length);
Butterfly* newButterfly = Butterfly::createOrGrowArrayRight(
- m_butterfly.getMayBeNull(), vm, this, structure, propertyCapacity, false, 0,
+ butterfly(), vm, this, structure, propertyCapacity, false, 0,
sizeof(EncodedJSValue) * vectorLength);
newButterfly->setPublicLength(length);
newButterfly->setVectorLength(vectorLength);
@@ -1114,7 +1114,7 @@
IndexingType oldType = indexingType();
ASSERT_UNUSED(oldType, !hasIndexedProperties(oldType));
- Butterfly* newButterfly = createArrayStorageButterfly(vm, this, oldStructure, length, vectorLength, m_butterfly.getMayBeNull());
+ Butterfly* newButterfly = createArrayStorageButterfly(vm, this, oldStructure, length, vectorLength, butterfly());
ArrayStorage* result = newButterfly->arrayStorage();
Structure* newStructure = Structure::nonPropertyTransition(vm, oldStructure, suggestedArrayStorageTransition());
nukeStructureAndSetButterfly(vm, oldStructureID, newButterfly);
@@ -1132,7 +1132,7 @@
{
ASSERT(hasUndecided(indexingType()));
- Butterfly* butterfly = m_butterfly.getMayBeNull();
+ Butterfly* butterfly = this->butterfly();
for (unsigned i = butterfly->vectorLength(); i--;)
butterfly->contiguousInt32()[i].setWithoutWriteBarrier(JSValue());
@@ -3173,7 +3173,7 @@
bool JSObject::ensureLengthSlow(VM& vm, unsigned length)
{
- Butterfly* butterfly = m_butterfly.get();
+ Butterfly* butterfly = this->butterfly()->caged();
ASSERT(length <= MAX_STORAGE_VECTOR_LENGTH);
ASSERT(hasContiguous(indexingType()) || hasInt32(indexingType()) || hasDouble(indexingType()) || hasUndecided(indexingType()));
@@ -3233,7 +3233,7 @@
ASSERT(!m_butterfly->indexingHeader()->preCapacity(structure()));
DeferGC deferGC(vm.heap);
- Butterfly* newButterfly = m_butterfly->resizeArray(vm, this, structure(), 0, ArrayStorage::sizeFor(length));
+ Butterfly* newButterfly = butterfly()->caged()->resizeArray(vm, this, structure(), 0, ArrayStorage::sizeFor(length));
newButterfly->setVectorLength(length);
newButterfly->setPublicLength(length);
WTF::storeStoreFence();
@@ -3247,7 +3247,7 @@
// It's important that this function not rely on structure(), for the property
// capacity, since we might have already mutated the structure in-place.
- return Butterfly::createOrGrowPropertyStorage(m_butterfly.getMayBeNull(), vm, this, structure(vm), oldSize, newSize);
+ return Butterfly::createOrGrowPropertyStorage(butterfly(), vm, this, structure(vm), oldSize, newSize);
}
static JSCustomGetterSetterFunction* getCustomGetterSetterFunctionForGetterSetter(ExecState* exec, PropertyName propertyName, CustomGetterSetter* getterSetter, JSCustomGetterSetterFunction::Type type)
Modified: trunk/Source/_javascript_Core/runtime/JSObject.h (224563 => 224564)
--- trunk/Source/_javascript_Core/runtime/JSObject.h 2017-11-08 05:41:30 UTC (rev 224563)
+++ trunk/Source/_javascript_Core/runtime/JSObject.h 2017-11-08 06:29:31 UTC (rev 224564)
@@ -255,7 +255,7 @@
bool canGetIndexQuickly(unsigned i)
{
- Butterfly* butterfly = m_butterfly.getMayBeNull();
+ Butterfly* butterfly = this->butterfly();
switch (indexingType()) {
case ALL_BLANK_INDEXING_TYPES:
case ALL_UNDECIDED_INDEXING_TYPES:
@@ -281,7 +281,7 @@
JSValue getIndexQuickly(unsigned i)
{
- Butterfly* butterfly = m_butterfly.get();
+ Butterfly* butterfly = this->butterfly();
switch (indexingType()) {
case ALL_INT32_INDEXING_TYPES:
return jsNumber(butterfly->contiguous()[i].get().asInt32());
@@ -299,7 +299,7 @@
JSValue tryGetIndexQuickly(unsigned i) const
{
- Butterfly* butterfly = m_butterfly.getMayBeNull();
+ Butterfly* butterfly = const_cast<JSObject*>(this)->butterfly();
switch (indexingType()) {
case ALL_BLANK_INDEXING_TYPES:
case ALL_UNDECIDED_INDEXING_TYPES:
@@ -353,7 +353,7 @@
bool canSetIndexQuickly(unsigned i)
{
- Butterfly* butterfly = m_butterfly.getMayBeNull();
+ Butterfly* butterfly = this->butterfly();
switch (indexingType()) {
case ALL_BLANK_INDEXING_TYPES:
case ALL_UNDECIDED_INDEXING_TYPES:
@@ -669,8 +669,8 @@
return inlineStorageUnsafe();
}
- const Butterfly* butterfly() const { return m_butterfly.getMayBeNull(); }
- Butterfly* butterfly() { return m_butterfly.getMayBeNull(); }
+ const Butterfly* butterfly() const { return m_butterfly.get(); }
+ Butterfly* butterfly() { return m_butterfly.get(); }
ConstPropertyStorage outOfLineStorage() const { return m_butterfly->propertyStorage(); }
PropertyStorage outOfLineStorage() { return m_butterfly->propertyStorage(); }
@@ -1052,7 +1052,7 @@
PropertyOffset prepareToPutDirectWithoutTransition(VM&, PropertyName, unsigned attributes, StructureID, Structure*);
protected:
- CagedBarrierPtr<Gigacage::JSValue, Butterfly> m_butterfly;
+ AuxiliaryBarrier<Butterfly*> m_butterfly;
#if USE(JSVALUE32_64)
private:
uint32_t m_padding;
