Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 30 additions & 0 deletions JSTests/stress/put-by-id-no-crash-interpreter.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
//@ runDefault("--useJIT=0")
const propName = "myProp";
var d;

function shouldBe(actual, expected)
{
if (actual !== expected)
throw new Error("Failure, expected: " + expected + ", got: " + actual);
}

function createDictionary()
{
var object = $vm.createObjectDoingSideEffectPutWithoutCorrectSlotStatus();
object[propName] = 42;
return object;
}

function putWithSideEffects(o)
{
o.dummy = {
toString() {
delete d[propName];
return "foo";
}
};
}

d = createDictionary();
putWithSideEffects(d);
shouldBe(propName in d, false);
33 changes: 15 additions & 18 deletions Source/JavaScriptCore/llint/LLIntSlowPaths.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -992,25 +992,22 @@ LLINT_SLOW_PATH_DECL(slow_path_put_by_id)
if (newStructure->propertyAccessesAreCacheable() && baseCell == slot.base()) {
if (slot.type() == PutPropertySlot::NewProperty) {
GCSafeConcurrentJSLocker locker(codeBlock->m_lock, vm);
if (!newStructure->isDictionary() && newStructure->previousID()->outOfLineCapacity() == newStructure->outOfLineCapacity()) {
ASSERT(oldStructure == newStructure->previousID());
if (oldStructure == newStructure->previousID()) {
ASSERT(oldStructure->transitionWatchpointSetHasBeenInvalidated());

bool sawPolyProto = false;
auto result = normalizePrototypeChain(globalObject, baseCell, sawPolyProto);
if (result != InvalidPrototypeChain && !sawPolyProto) {
ASSERT(oldStructure->isObject());
metadata.m_oldStructureID = oldStructure->id();
metadata.m_offset = slot.cachedOffset();
metadata.m_newStructureID = newStructure->id();
if (!(bytecode.m_flags.isDirect())) {
StructureChain* chain = newStructure->prototypeChain(vm, globalObject, asObject(baseCell));
ASSERT(chain);
metadata.m_structureChain.set(vm, codeBlock, chain);
}
vm.writeBarrier(codeBlock);
if (!newStructure->isDictionary() && newStructure->previousID()->outOfLineCapacity() == newStructure->outOfLineCapacity() && newStructure->previousID() == oldStructure) {
ASSERT(oldStructure->transitionWatchpointSetHasBeenInvalidated());

bool sawPolyProto = false;
auto result = normalizePrototypeChain(globalObject, baseCell, sawPolyProto);
if (result != InvalidPrototypeChain && !sawPolyProto) {
ASSERT(oldStructure->isObject());
metadata.m_oldStructureID = oldStructure->id();
metadata.m_offset = slot.cachedOffset();
metadata.m_newStructureID = newStructure->id();
if (!(bytecode.m_flags.isDirect())) {
StructureChain* chain = newStructure->prototypeChain(vm, globalObject, asObject(baseCell));
ASSERT(chain);
metadata.m_structureChain.set(vm, codeBlock, chain);
}
vm.writeBarrier(codeBlock);
}
}
} else {
Expand Down