зеркало из https://github.com/mozilla/pjs.git
Fixing bug 463803. Fixing crash on Windows with native regexp compiler. r=gal
This commit is contained in:
Родитель
92e6a06fcd
Коммит
8fdbb440fd
|
@ -2297,14 +2297,6 @@ js_NewRegExp(JSContext *cx, JSTokenStream *ts,
|
|||
re->classList = NULL;
|
||||
}
|
||||
|
||||
#ifdef JS_TRACER
|
||||
/*
|
||||
* Try compiling the native code version. For the time being we also
|
||||
* compile the bytecode version in case we evict the native code
|
||||
* version from the code cache.
|
||||
*/
|
||||
js_CompileRegExpToNative(cx, re, &state);
|
||||
#endif
|
||||
/* Compile the bytecode version. */
|
||||
endPC = EmitREBytecode(&state, re, state.treeDepth, re->program, state.result);
|
||||
if (!endPC) {
|
||||
|
@ -2331,6 +2323,17 @@ js_NewRegExp(JSContext *cx, JSTokenStream *ts,
|
|||
re->parenCount = state.parenCount;
|
||||
re->source = str;
|
||||
|
||||
#ifdef JS_TRACER
|
||||
/*
|
||||
* Try compiling the native code version. For the time being we also
|
||||
* compile the bytecode version in case we evict the native code
|
||||
* version from the code cache.
|
||||
* We have to compile at this point because we are using the JSRegExp
|
||||
* address as a key and the shrink step above can move it.
|
||||
*/
|
||||
js_CompileRegExpToNative(cx, re, &state);
|
||||
#endif
|
||||
|
||||
out:
|
||||
JS_ARENA_RELEASE(&cx->tempPool, mark);
|
||||
return re;
|
||||
|
|
Загрузка…
Ссылка в новой задаче