wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1134146 - Use whole cell store buffer entries for unboxed object updates, r=jandem.

Browse Source
This commit is contained in:
Brian Hackett 2015-02-23 09:27:10 -06:00
parent 58f346a87e
commit 2f6eb2b0e5
3 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
js/src/gc/Barrier.h
View File

@ -748,6 +748,7 @@ class JitCode;
typedef PreBarriered<JSObject*> PreBarrieredObject;
typedef PreBarriered<JSScript*> PreBarrieredScript;
typedef PreBarriered<jit::JitCode*> PreBarrieredJitCode;
typedef PreBarriered<JSString*> PreBarrieredString;
typedef PreBarriered<JSAtom*> PreBarrieredAtom;
typedef RelocatablePtr<JSObject*> RelocatablePtrObject;

10
js/src/jit-test/tests/basic/bug1134146.js Normal file
View File

@ -0,0 +1,10 @@
function Foo(a, b) {
b = {};
this.b = b;
};
var a = [];
for (var i = 0; i < 50; i++)
a.push(new Foo(i, i + 1));
i = 0;
a[i].c = i;

12
js/src/vm/UnboxedObject.cpp
View File

@ -87,7 +87,8 @@ UnboxedPlainObject::setValue(JSContext *cx, const UnboxedLayout::Property &prope
case JSVAL_TYPE_STRING:
if (v.isString()) {
*reinterpret_cast<HeapPtrString*>(p) = v.toString();
MOZ_ASSERT(!IsInsideNursery(v.toString()));
*reinterpret_cast<PreBarrieredString*>(p) = v.toString();
return true;
}
return false;
@ -99,7 +100,14 @@ UnboxedPlainObject::setValue(JSContext *cx, const UnboxedLayout::Property &prope
// created.
AddTypePropertyId(cx, this, NameToId(property.name), v);
*reinterpret_cast<HeapPtrObject*>(p) = v.toObjectOrNull();
// Manually trigger post barriers on the whole object. If we treat
// the pointer as a HeapPtrObject we will get confused later if the
// object is converted to its native representation.
JSObject *obj = v.toObjectOrNull();
if (IsInsideNursery(v.toObjectOrNull()) && !IsInsideNursery(this))
cx->runtime()->gc.storeBuffer.putWholeCellFromMainThread(this);
*reinterpret_cast<PreBarrieredObject*>(p) = obj;
return true;
}
return false;