diff options
Diffstat (limited to 'www/seamonkey/patches/patch-mozilla_js_src_vm_ObjectImpl-inl.h')
| -rw-r--r-- | www/seamonkey/patches/patch-mozilla_js_src_vm_ObjectImpl-inl.h | 26 |
1 files changed, 7 insertions, 19 deletions
diff --git a/www/seamonkey/patches/patch-mozilla_js_src_vm_ObjectImpl-inl.h b/www/seamonkey/patches/patch-mozilla_js_src_vm_ObjectImpl-inl.h index a23be05188a..e02397548c4 100644 --- a/www/seamonkey/patches/patch-mozilla_js_src_vm_ObjectImpl-inl.h +++ b/www/seamonkey/patches/patch-mozilla_js_src_vm_ObjectImpl-inl.h @@ -1,29 +1,17 @@ -$NetBSD: patch-mozilla_js_src_vm_ObjectImpl-inl.h,v 1.3 2013/08/11 03:18:46 ryoon Exp $ +$NetBSD: patch-mozilla_js_src_vm_ObjectImpl-inl.h,v 1.4 2013/09/28 14:37:05 ryoon Exp $ ---- mozilla/js/src/vm/ObjectImpl-inl.h.orig 2013-08-04 03:05:34.000000000 +0000 +--- mozilla/js/src/vm/ObjectImpl-inl.h.orig 2013-09-16 18:26:43.000000000 +0000 +++ mozilla/js/src/vm/ObjectImpl-inl.h -@@ -217,9 +217,9 @@ js::ObjectImpl::initializeSlotRange(uint - JSRuntime *rt = runtime(); - uint32_t offset = start; - for (HeapSlot *sp = fixedStart; sp < fixedEnd; sp++) -- sp->init(rt, this->asObjectPtr(), HeapSlot::Slot, offset++, UndefinedValue()); -+ sp->init(rt, this->asObjectPtr(), HeapSlot::Slot, offset++, js::UndefinedValue()); - for (HeapSlot *sp = slotsStart; sp < slotsEnd; sp++) -- sp->init(rt, this->asObjectPtr(), HeapSlot::Slot, offset++, UndefinedValue()); -+ sp->init(rt, this->asObjectPtr(), HeapSlot::Slot, offset++, js::UndefinedValue()); - } - - inline bool -@@ -389,7 +389,7 @@ ZoneOfValue(const JS::Value &value) +@@ -364,7 +364,7 @@ js::ObjectImpl::zone() const js::ObjectImpl::readBarrier(ObjectImpl *obj) { #ifdef JSGC_INCREMENTAL - Zone *zone = obj->zone(); + JS::Zone *zone = obj->zone(); if (zone->needsBarrier()) { - MOZ_ASSERT(!zone->rt->isHeapBusy()); + MOZ_ASSERT(!zone->rt->isHeapMajorCollecting()); JSObject *tmp = obj->asObjectPtr(); -@@ -403,7 +403,7 @@ inline void +@@ -378,7 +378,7 @@ inline void js::ObjectImpl::privateWriteBarrierPre(void **old) { #ifdef JSGC_INCREMENTAL @@ -32,12 +20,12 @@ $NetBSD: patch-mozilla_js_src_vm_ObjectImpl-inl.h,v 1.3 2013/08/11 03:18:46 ryoo if (zone->needsBarrier()) { if (*old && getClass()->trace) getClass()->trace(zone->barrierTracer(), this->asObjectPtr()); -@@ -430,7 +430,7 @@ js::ObjectImpl::writeBarrierPre(ObjectIm +@@ -405,7 +405,7 @@ js::ObjectImpl::writeBarrierPre(ObjectIm if (IsNullTaggedPointer(obj) || !obj->runtime()->needsBarrier()) return; - Zone *zone = obj->zone(); + JS::Zone *zone = obj->zone(); if (zone->needsBarrier()) { - MOZ_ASSERT(!zone->rt->isHeapBusy()); + MOZ_ASSERT(!zone->rt->isHeapMajorCollecting()); JSObject *tmp = obj->asObjectPtr(); |