Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-24 10:45:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 883656 - Handle lazy functions in b[a] lambda pattern matching, r=luke.

Browse Source
This commit is contained in:
Brian Hackett 2013-06-17 10:12:36 -06:00
parent b68ed19c15
commit 013389ee23
1 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
js/src/jsstr.cpp
View File

@ -2686,17 +2686,20 @@ static const uint32_t ReplaceOptArg = 2;
* Dean Edwards packer) to efficiently encode large scripts. We only handle the
* code patterns generated by such packers here.
*/
static JSObject *
LambdaIsGetElem(JSObject &lambda)
static bool
LambdaIsGetElem(JSContext *cx, JSObject &lambda, MutableHandleObject pobj)
{
if (!lambda.isFunction())
return NULL;
return true;
JSFunction *fun = lambda.toFunction();
if (!fun->hasScript())
return NULL;
if (!fun->isInterpreted())
return true;
JSScript *script = fun->getOrCreateScript(cx);
if (!script)
return false;
JSScript *script = fun->nonLazyScript();
jsbytecode *pc = script->code;
/*
@ -2705,7 +2708,7 @@ LambdaIsGetElem(JSObject &lambda)
* would make our scope walk off by 1.
*/
if (JSOp(*pc) != JSOP_GETALIASEDVAR || fun->isHeavyweight())
return NULL;
return true;
ScopeCoordinate sc(pc);
ScopeObject *scope = &fun->environment()->asScope();
for (unsigned i = 0; i < sc.hops; ++i)
@ -2715,28 +2718,29 @@ LambdaIsGetElem(JSObject &lambda)
/* Look for 'a' to be the lambda's first argument. */
if (JSOp(*pc) != JSOP_GETARG || GET_SLOTNO(pc) != 0)
return NULL;
return true;
pc += JSOP_GETARG_LENGTH;
/* 'b[a]' */
if (JSOp(*pc) != JSOP_GETELEM)
return NULL;
return true;
pc += JSOP_GETELEM_LENGTH;
/* 'return b[a]' */
if (JSOp(*pc) != JSOP_RETURN)
return NULL;
return true;
/* 'b' must behave like a normal object. */
if (!b.isObject())
return NULL;
return true;
JSObject &bobj = b.toObject();
Class *clasp = bobj.getClass();
if (!clasp->isNative() || clasp->ops.lookupProperty || clasp->ops.getProperty)
return NULL;
return true;
return &bobj;
pobj.set(&bobj);
return true;
}
JSBool
@ -2759,8 +2763,8 @@ js::str_replace(JSContext *cx, unsigned argc, Value *vp)
rdata.repstr = NULL;
rdata.dollar = rdata.dollarEnd = NULL;
if (JSObject *base = LambdaIsGetElem(*rdata.lambda))
rdata.elembase = base;
if (!LambdaIsGetElem(cx, *rdata.lambda, &rdata.elembase))
return false;
} else {
rdata.lambda = NULL;
rdata.elembase = NULL;