Bug 840696 part 1 - Enable GetElem IC if typed arrays & arrays are mix-up. r=dvander

This commit is contained in:
Nicolas B. Pierron 2013-02-18 22:13:19 -08:00
parent e4d4c659d7
commit 69deea834b

View File

@ -748,7 +748,7 @@ GetObjectElementOperation(JSContext *cx, JSOp op, JSObject *objArg, bool wasObje
uint32_t index;
if (IsDefinitelyIndex(rref, &index)) {
if (analyze && !objArg->isNative()) {
if (analyze && !objArg->isNative() && !objArg->isTypedArray()) {
JSScript *script = NULL;
jsbytecode *pc = NULL;
types::TypeScript::GetPcScript(cx, &script, &pc);
@ -775,7 +775,7 @@ GetObjectElementOperation(JSContext *cx, JSOp op, JSObject *objArg, bool wasObje
if (script->hasAnalysis()) {
script->analysis()->getCode(pc).getStringElement = true;
if (!objArg->isArray() && !objArg->isNative())
if (!objArg->isArray() && !objArg->isNative() && !objArg->isTypedArray())
script->analysis()->getCode(pc).nonNativeGetElement = true;
}
}