mirror of
https://git.freebsd.org/ports.git
synced 2025-06-28 16:10:33 -04:00
96b39667d3
clang 3.3 merge)
PR: ports/179034 [1]
Submitted by: Jan Beich <jbeich@tormail.org>,
Nikolai Lifanov <lifanov@mail.lifanov.com> [1]
25 lines
1 KiB
Text
25 lines
1 KiB
Text
--- 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
|