Backed out changeset c52934a52f94 (bug 925397) for jit/scatter test failures

This commit is contained in:
Carsten "Tomcat" Book 2013-10-14 14:22:43 +02:00
parent b98758cdbd
commit b787a21d2b
2 changed files with 2 additions and 12 deletions

View File

@ -566,7 +566,7 @@ jit::InitRestParameterPar(ForkJoinSlice *slice, uint32_t length, Value *rest,
res->ensureDenseElementsPreservePackedFlag(slice, 0, length);
if (edr != JSObject::ED_OK)
return nullptr;
res->initDenseElementsUnbarriered(0, rest, length);
res->initDenseElements(0, rest, length);
res->as<ArrayObject>().setLengthInt32(length);
}

View File

@ -667,17 +667,7 @@ class JSObject : public js::ObjectImpl
void initDenseElements(uint32_t dstStart, const js::Value *src, uint32_t count) {
JS_ASSERT(dstStart + count <= getDenseCapacity());
memcpy(&elements[dstStart], src, count * sizeof(js::HeapSlot));
DenseRangeWriteBarrierPost(runtimeFromMainThread(), this, dstStart, count);
}
void initDenseElementsUnbarriered(uint32_t dstStart, const js::Value *src, uint32_t count) {
/*
* For use by parallel threads, which since they cannot see nursery
* things do not require a barrier.
*/
JS_ASSERT(!js::CurrentThreadCanAccessRuntime(runtimeFromAnyThread()));
JS_ASSERT(dstStart + count <= getDenseCapacity());
memcpy(&elements[dstStart], src, count * sizeof(js::HeapSlot));
DenseRangeWriteBarrierPost(runtimeFromAnyThread(), this, dstStart, count);
}
void moveDenseElements(uint32_t dstStart, uint32_t srcStart, uint32_t count) {