mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 516567 - Remove unused error codes from Assembler, r=gal.
This commit is contained in:
parent
854c0294df
commit
1b282006e0
@ -3098,7 +3098,6 @@ class RegExpNativeCompiler {
|
||||
{
|
||||
GuardRecord* guard = NULL;
|
||||
LIns* pos;
|
||||
bool oom = false;
|
||||
const jschar* re_chars;
|
||||
size_t re_length;
|
||||
JSTraceMonitor* tm = &JS_TRACE_MONITOR(cx);
|
||||
@ -3176,10 +3175,8 @@ class RegExpNativeCompiler {
|
||||
if (alloc.outOfMemory())
|
||||
goto fail;
|
||||
::compile(assm, fragment, alloc verbose_only(, tm->labels));
|
||||
if (assm->error() != nanojit::None) {
|
||||
oom = assm->error() == nanojit::OutOMem;
|
||||
if (assm->error() != nanojit::None)
|
||||
goto fail;
|
||||
}
|
||||
|
||||
delete lirBufWriter;
|
||||
#ifdef DEBUG
|
||||
@ -3191,7 +3188,7 @@ class RegExpNativeCompiler {
|
||||
#endif
|
||||
return JS_TRUE;
|
||||
fail:
|
||||
if (alloc.outOfMemory() || oom || js_OverfullJITCache(tm)) {
|
||||
if (alloc.outOfMemory() || js_OverfullJITCache(tm)) {
|
||||
delete lirBufWriter;
|
||||
js_ResetJIT(cx);
|
||||
} else {
|
||||
|
@ -3676,7 +3676,7 @@ TraceRecorder::compile(JSTraceMonitor* tm)
|
||||
|
||||
Assembler *assm = tm->assembler;
|
||||
::compile(assm, fragment, *tm->allocator verbose_only(, tm->labels));
|
||||
if (assm->error() == nanojit::OutOMem)
|
||||
if (tm->allocator->outOfMemory())
|
||||
return;
|
||||
|
||||
if (assm->error() != nanojit::None) {
|
||||
@ -4566,8 +4566,8 @@ DeleteRecorder(JSContext* cx)
|
||||
tm->recorder = NULL;
|
||||
|
||||
/* If we ran out of memory, flush the code cache. */
|
||||
Assembler *assm = JS_TRACE_MONITOR(cx).assembler;
|
||||
if (assm->error() == OutOMem || js_OverfullJITCache(tm)) {
|
||||
if (tm->allocator->outOfMemory() ||
|
||||
js_OverfullJITCache(tm)) {
|
||||
ResetJIT(cx, FR_OOM);
|
||||
return false;
|
||||
}
|
||||
|
@ -100,13 +100,7 @@ namespace nanojit
|
||||
enum AssmError
|
||||
{
|
||||
None = 0
|
||||
,OutOMem
|
||||
,StackFull
|
||||
,RegionFull
|
||||
,MaxLength
|
||||
,MaxExit
|
||||
,MaxXJump
|
||||
,UnknownPrim
|
||||
,UnknownBranch
|
||||
};
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user