wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-08-15 08:53:07 +09:00
Code Issues Projects Releases Packages Wiki Activity

Fix last crashing assert.

Browse source 
Fix last crashing assert.
This commit is contained in:
win7-7 2026-01-17 04:59:00 +02:00 • committed by wuggy
commit f1fde3abc5
2 changed files with 33 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

36
js/src/jscntxtinlines.h
View file

@ -105,6 +105,11 @@ class CompartmentChecker
MOZ_ASSERT(!js::gc::detail::CellIsMarkedGray(str));
if (!str->isAtom())
checkZone(str->zone());
}
}
void check(JS::Symbol* symbol) {
checkAtom(symbol);
}
void check(const js::Value& v) {
@ -178,9 +183,9 @@ class CompartmentChecker
* Don't perform these checks when called from a finalizer. The checking
* depends on other objects not having been swept yet.
*/
#define START_ASSERT_SAME_COMPARTMENT() \
if (cx->isJSContext() && cx->asJSContext()->runtime()->isHeapBusy()) \
return; \
#define START_ASSERT_SAME_COMPARTMENT() \
if (cx->heapState != JS::HeapState::Idle) \
return; \
CompartmentChecker c(cx)
template <class T1> inline void
@ -417,7 +422,30 @@ js::ExclusiveContext::enterCompartment(
}
inline void
js::ExclusiveContext::enterNullCompartment()
JSContext::enterAtomsCompartment(JSCompartment* c,
const js::AutoLockForExclusiveAccess& lock)
{
enterCompartmentDepth_++;
MOZ_ASSERT(c->zone()->isAtomsZone());
c->enter();
setCompartment(c, &lock);
}
template <typename T>
inline void
JSContext::enterCompartmentOf(const T& target)
{
// Use the public API which is guaranteed to be visible in templates
if (!JS::CurrentThreadIsHeapCollecting()) {
MOZ_ASSERT(JS::CellIsNotGray(target));
}
enterNonAtomsCompartment(target->compartment());
}
inline void
JSContext::enterNullCompartment()
{
enterCompartmentDepth_++;
setCompartment(nullptr);

2
js/src/jsgc.cpp
View file

@ -8570,7 +8570,7 @@ js::gc::detail::CellIsNotGray(const Cell* cell)
// TODO: I'd like to AssertHeapIsIdle() here, but this ends up getting
// called while iterating the heap for memory reporting.
//MOZ_ASSERT(!JS::CurrentThreadIsHeapCollecting());
MOZ_ASSERT(!JS::CurrentThreadIsHeapCollecting());
MOZ_ASSERT(!JS::CurrentThreadIsHeapCycleCollecting());