Date: Sun, 14 Apr 2013 16:43:28 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1235 - in trunk: mail/thunderbird/files www/firefox-esr/files www/firefox/files www/seamonkey/files Message-ID: <201304141643.r3EGhSKO060709@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Sun Apr 14 16:43:27 2013
New Revision: 1235
Log:
fix build on -CURRENT with clang 3.3
Added:
trunk/mail/thunderbird/files/patch-clang33
trunk/www/firefox-esr/files/patch-clang33
trunk/www/firefox/files/patch-clang33
trunk/www/seamonkey/files/patch-clang33
Added: trunk/mail/thunderbird/files/patch-clang33
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/mail/thunderbird/files/patch-clang33 Sun Apr 14 16:43:27 2013 (r1235)
@@ -0,0 +1,25 @@
+--- mozilla/js/src/jspropertycacheinlines.h~
++++ mozilla/js/src/jspropertycacheinlines.h
+@@ -31,7 +31,7 @@ JS_ALWAYS_INLINE void
+ js::PropertyCache::test(JSContext *cx, jsbytecode *pc, JSObject *&obj,
+ JSObject *&pobj, PropertyCacheEntry *&entry, PropertyName *&name)
+ {
+- AssertRootingUnnecessary assert(cx);
++ js::AssertRootingUnnecessary assert(cx);
+
+ JS_ASSERT(this == &JS_PROPERTY_CACHE(cx));
+
+--- mozilla/js/src/vm/ObjectImpl-inl.h~
++++ mozilla/js/src/vm/ObjectImpl-inl.h
+@@ -176,9 +176,9 @@ js::ObjectImpl::initializeSlotRange(uint
+ JSCompartment *comp = compartment();
+ uint32_t offset = start;
+ for (HeapSlot *sp = fixedStart; sp < fixedEnd; sp++)
+- sp->init(comp, this->asObjectPtr(), offset++, UndefinedValue());
++ sp->init(comp, this->asObjectPtr(), offset++, js::UndefinedValue());
+ for (HeapSlot *sp = slotsStart; sp < slotsEnd; sp++)
+- sp->init(comp, this->asObjectPtr(), offset++, UndefinedValue());
++ sp->init(comp, this->asObjectPtr(), offset++, js::UndefinedValue());
+ }
+
+ inline bool
Added: trunk/www/firefox-esr/files/patch-clang33
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/www/firefox-esr/files/patch-clang33 Sun Apr 14 16:43:27 2013 (r1235)
@@ -0,0 +1,25 @@
+--- js/src/jspropertycacheinlines.h~
++++ js/src/jspropertycacheinlines.h
+@@ -31,7 +31,7 @@ JS_ALWAYS_INLINE void
+ js::PropertyCache::test(JSContext *cx, jsbytecode *pc, JSObject *&obj,
+ JSObject *&pobj, PropertyCacheEntry *&entry, PropertyName *&name)
+ {
+- AssertRootingUnnecessary assert(cx);
++ js::AssertRootingUnnecessary assert(cx);
+
+ JS_ASSERT(this == &JS_PROPERTY_CACHE(cx));
+
+--- js/src/vm/ObjectImpl-inl.h~
++++ js/src/vm/ObjectImpl-inl.h
+@@ -176,9 +176,9 @@ js::ObjectImpl::initializeSlotRange(uint
+ JSCompartment *comp = compartment();
+ uint32_t offset = start;
+ for (HeapSlot *sp = fixedStart; sp < fixedEnd; sp++)
+- sp->init(comp, this->asObjectPtr(), offset++, UndefinedValue());
++ sp->init(comp, this->asObjectPtr(), offset++, js::UndefinedValue());
+ for (HeapSlot *sp = slotsStart; sp < slotsEnd; sp++)
+- sp->init(comp, this->asObjectPtr(), offset++, UndefinedValue());
++ sp->init(comp, this->asObjectPtr(), offset++, js::UndefinedValue());
+ }
+
+ inline bool
Added: trunk/www/firefox/files/patch-clang33
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/www/firefox/files/patch-clang33 Sun Apr 14 16:43:27 2013 (r1235)
@@ -0,0 +1,79 @@
+--- js/src/jscompartment.h~
++++ js/src/jscompartment.h
+@@ -596,12 +596,12 @@ class js::AutoDebugModeGC
+ // The DEBUG_MODE_GC reason forces the collector to always throw
+ // everything away, as required for debug mode transitions.
+ if (needGC)
+- GC(rt, GC_NORMAL, gcreason::DEBUG_MODE_GC);
++ GC(rt, GC_NORMAL, js::gcreason::DEBUG_MODE_GC);
+ }
+
+- void scheduleGC(Zone *zone) {
++ void scheduleGC(JS::Zone *zone) {
+ JS_ASSERT(!rt->isHeapBusy());
+- PrepareZoneForGC(zone);
++ js::PrepareZoneForGC(zone);
+ needGC = true;
+ }
+ };
+--- js/src/jspropertycacheinlines.h~
++++ js/src/jspropertycacheinlines.h
+@@ -32,7 +32,7 @@ JS_ALWAYS_INLINE void
+ js::PropertyCache::test(JSContext *cx, jsbytecode *pc, JSObject **obj,
+ JSObject **pobj, PropertyCacheEntry **entry, PropertyName **name)
+ {
+- AutoAssertNoGC nogc;
++ js::AutoAssertNoGC nogc;
+
+ JS_ASSERT(this == &cx->propertyCache());
+
+@@ -65,7 +65,7 @@ JS_ALWAYS_INLINE bool
+ js::PropertyCache::testForSet(JSContext *cx, jsbytecode *pc, JSObject *obj,
+ PropertyCacheEntry **entryp, JSObject **obj2p, PropertyName **namep)
+ {
+- AutoAssertNoGC nogc;
++ js::AutoAssertNoGC nogc;
+
+ JS_ASSERT(this == &cx->propertyCache());
+
+--- js/src/vm/ObjectImpl-inl.h~
++++ js/src/vm/ObjectImpl-inl.h
+@@ -164,9 +164,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
+@@ -321,7 +321,7 @@ js::ObjectImpl::sizeOfThis() 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());
+ JSObject *tmp = obj->asObjectPtr();
+@@ -335,7 +335,7 @@ inline void
+ js::ObjectImpl::privateWriteBarrierPre(void **old)
+ {
+ #ifdef JSGC_INCREMENTAL
+- Zone *zone = this->zone();
++ JS::Zone *zone = this->zone();
+ if (zone->needsBarrier()) {
+ if (*old && getClass()->trace)
+ getClass()->trace(zone->barrierTracer(), this->asObjectPtr());
+@@ -362,7 +362,7 @@ js::ObjectImpl::writeBarrierPre(ObjectIm
+ if (uintptr_t(obj) < 32)
+ return;
+
+- Zone *zone = obj->zone();
++ JS::Zone *zone = obj->zone();
+ if (zone->needsBarrier()) {
+ MOZ_ASSERT(!zone->rt->isHeapBusy());
+ JSObject *tmp = obj->asObjectPtr();
Added: trunk/www/seamonkey/files/patch-clang33
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/www/seamonkey/files/patch-clang33 Sun Apr 14 16:43:27 2013 (r1235)
@@ -0,0 +1,79 @@
+--- mozilla/js/src/jscompartment.h~
++++ mozilla/js/src/jscompartment.h
+@@ -596,12 +596,12 @@ class js::AutoDebugModeGC
+ // The DEBUG_MODE_GC reason forces the collector to always throw
+ // everything away, as required for debug mode transitions.
+ if (needGC)
+- GC(rt, GC_NORMAL, gcreason::DEBUG_MODE_GC);
++ GC(rt, GC_NORMAL, js::gcreason::DEBUG_MODE_GC);
+ }
+
+- void scheduleGC(Zone *zone) {
++ void scheduleGC(JS::Zone *zone) {
+ JS_ASSERT(!rt->isHeapBusy());
+- PrepareZoneForGC(zone);
++ js::PrepareZoneForGC(zone);
+ needGC = true;
+ }
+ };
+--- mozilla/js/src/jspropertycacheinlines.h~
++++ mozilla/js/src/jspropertycacheinlines.h
+@@ -32,7 +32,7 @@ JS_ALWAYS_INLINE void
+ js::PropertyCache::test(JSContext *cx, jsbytecode *pc, JSObject **obj,
+ JSObject **pobj, PropertyCacheEntry **entry, PropertyName **name)
+ {
+- AutoAssertNoGC nogc;
++ js::AutoAssertNoGC nogc;
+
+ JS_ASSERT(this == &cx->propertyCache());
+
+@@ -65,7 +65,7 @@ JS_ALWAYS_INLINE bool
+ js::PropertyCache::testForSet(JSContext *cx, jsbytecode *pc, JSObject *obj,
+ PropertyCacheEntry **entryp, JSObject **obj2p, PropertyName **namep)
+ {
+- AutoAssertNoGC nogc;
++ js::AutoAssertNoGC nogc;
+
+ JS_ASSERT(this == &cx->propertyCache());
+
+--- mozilla/js/src/vm/ObjectImpl-inl.h~
++++ mozilla/js/src/vm/ObjectImpl-inl.h
+@@ -164,9 +164,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
+@@ -321,7 +321,7 @@ js::ObjectImpl::sizeOfThis() 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());
+ JSObject *tmp = obj->asObjectPtr();
+@@ -335,7 +335,7 @@ inline void
+ js::ObjectImpl::privateWriteBarrierPre(void **old)
+ {
+ #ifdef JSGC_INCREMENTAL
+- Zone *zone = this->zone();
++ JS::Zone *zone = this->zone();
+ if (zone->needsBarrier()) {
+ if (*old && getClass()->trace)
+ getClass()->trace(zone->barrierTracer(), this->asObjectPtr());
+@@ -362,7 +362,7 @@ js::ObjectImpl::writeBarrierPre(ObjectIm
+ if (uintptr_t(obj) < 32)
+ return;
+
+- Zone *zone = obj->zone();
++ JS::Zone *zone = obj->zone();
+ if (zone->needsBarrier()) {
+ MOZ_ASSERT(!zone->rt->isHeapBusy());
+ JSObject *tmp = obj->asObjectPtr();
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201304141643.r3EGhSKO060709>