wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-10-04 06:17:30 +09:00
Code Issues Projects Releases Packages Wiki Activity

Revert "Reverting rev b7e45308 and 9824659d again as I can still get a crash in RegExpShared::finalize(FreeOp* fop)"

Browse source 
This reverts commit bb547a1b55 for landing
upstream fixes.
This commit is contained in:
roytam1 2023-03-15 22:51:51 +08:00
commit 0bfc6e3781
3 changed files with 14 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

3
js/src/gc/Heap.h
View file

@ -340,9 +340,6 @@ class TenuredCell : public Cell
static MOZ_ALWAYS_INLINE void writeBarrierPost(void* cellp, TenuredCell* prior, static MOZ_ALWAYS_INLINE void writeBarrierPost(void* cellp, TenuredCell* prior,
TenuredCell* next); TenuredCell* next);
// Default implementation for kinds that don't require finalization.
void finalize(FreeOp* fop) {}
// Default implementation for kinds that don't require fixup. // Default implementation for kinds that don't require fixup.
void fixupAfterMovingGC() {} void fixupAfterMovingGC() {}

16
js/src/vm/RegExpObject.cpp
View file

@ -952,12 +952,6 @@ RegExpShared::RegExpShared(JSAtom* source, RegExpFlag flags)
numNamedCaptures_(0), groupsTemplate_(nullptr) numNamedCaptures_(0), groupsTemplate_(nullptr)
{} {}
RegExpShared::~RegExpShared()
{
for (size_t i = 0; i < tables.length(); i++)
js_delete(tables[i]);
}
void void
RegExpShared::traceChildren(JSTracer* trc) RegExpShared::traceChildren(JSTracer* trc)
{ {
@ -978,6 +972,16 @@ RegExpShared::discardJitCode()
comp.jitCode = nullptr; comp.jitCode = nullptr;
} }
void
RegExpShared::finalize(FreeOp* fop)
{
for (auto& comp : compilationArray)
js_free(comp.byteCode);
for (size_t i = 0; i < tables.length(); i++)
js_free(tables[i]);
tables.~JitCodeTables();
}
/* static */ bool /* static */ bool
RegExpShared::compile(JSContext* cx, MutableHandleRegExpShared re, HandleLinearString input, RegExpShared::compile(JSContext* cx, MutableHandleRegExpShared re, HandleLinearString input,
CompilationMode mode, ForceByteCodeEnum force) CompilationMode mode, ForceByteCodeEnum force)

7
js/src/vm/RegExpObject.h
View file

@ -121,7 +121,6 @@ class RegExpShared : public gc::TenuredCell
uint8_t* byteCode; uint8_t* byteCode;
RegExpCompilation() : byteCode(nullptr) {} RegExpCompilation() : byteCode(nullptr) {}
~RegExpCompilation() { js_free(byteCode); }
bool compiled(ForceByteCodeEnum force = DontForceByteCode) const { bool compiled(ForceByteCodeEnum force = DontForceByteCode) const {
return byteCode || (force == DontForceByteCode && jitCode); return byteCode || (force == DontForceByteCode && jitCode);
@ -149,7 +148,8 @@ class RegExpShared : public gc::TenuredCell
} }
// Tables referenced by JIT code. // Tables referenced by JIT code.
Vector<uint8_t*, 0, SystemAllocPolicy> tables; using JitCodeTables = Vector<uint8_t*, 0, SystemAllocPolicy>;
JitCodeTables tables;
/* Internal functions. */ /* Internal functions. */
RegExpShared(JSAtom* source, RegExpFlag flags); RegExpShared(JSAtom* source, RegExpFlag flags);
@ -172,7 +172,7 @@ class RegExpShared : public gc::TenuredCell
} }
public: public:
~RegExpShared(); ~RegExpShared() = delete;
// Execute this RegExp on input starting from searchIndex, filling in // Execute this RegExp on input starting from searchIndex, filling in
// matches if specified and otherwise only determining if there is a match. // matches if specified and otherwise only determining if there is a match.
@ -222,6 +222,7 @@ class RegExpShared : public gc::TenuredCell
void traceChildren(JSTracer* trc); void traceChildren(JSTracer* trc);
void discardJitCode(); void discardJitCode();
void finalize(FreeOp* fop);
static size_t offsetOfSource() { static size_t offsetOfSource() {
return offsetof(RegExpShared, source); return offsetof(RegExpShared, source);