wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 812446 - Optimize str[double], str.char[Code]At(double). r=nbp

Browse Source
This commit is contained in:
Tom Schuster 2012-12-12 13:21:41 +01:00
parent 5b383aec59
commit 54a24b7ed4
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
js/src/ion/MCallOptimize.cpp
View File

@ -713,7 +713,8 @@ IonBuilder::inlineStrCharCodeAt(uint32_t argc, bool constructing)
return InliningStatus_NotInlined;
if (getInlineArgType(argc, 0) != MIRType_String)
return InliningStatus_NotInlined;
if (getInlineArgType(argc, 1) != MIRType_Int32)
MIRType argType = getInlineArgType(argc, 1);
if (argType != MIRType_Int32 && argType != MIRType_Double)
return InliningStatus_NotInlined;
MDefinitionVector argv;
@ -768,7 +769,8 @@ IonBuilder::inlineStrCharAt(uint32_t argc, bool constructing)
return InliningStatus_NotInlined;
if (getInlineArgType(argc, 0) != MIRType_String)
return InliningStatus_NotInlined;
if (getInlineArgType(argc, 1) != MIRType_Int32)
MIRType argType = getInlineArgType(argc, 1);
if (argType != MIRType_Int32 && argType != MIRType_Double)
return InliningStatus_NotInlined;
MDefinitionVector argv;

5
js/src/ion/TypeOracle.cpp
View File

@ -348,14 +348,15 @@ TypeInferenceOracle::elementReadIsTypedArray(JSScript *script, jsbytecode *pc, i
bool
TypeInferenceOracle::elementReadIsString(JSScript *script, jsbytecode *pc)
{
// Check for string[int32].
// Check for string[index].
StackTypeSet *value = script->analysis()->poppedTypes(pc, 1);
StackTypeSet *id = script->analysis()->poppedTypes(pc, 0);
if (value->getKnownTypeTag() != JSVAL_TYPE_STRING)
return false;
if (id->getKnownTypeTag() != JSVAL_TYPE_INT32)
JSValueType idType = id->getKnownTypeTag();
if (idType != JSVAL_TYPE_INT32 && idType != JSVAL_TYPE_DOUBLE)
return false;
// This function is used for jsop_getelem_string which should return

8
js/src/jsinterpinlines.h
View File

@ -790,11 +790,11 @@ GetElementOperation(JSContext *cx, JSOp op, HandleValue lref, HandleValue rref,
AssertCanGC();
JS_ASSERT(op == JSOP_GETELEM || op == JSOP_CALLELEM);
if (lref.isString() && rref.isInt32()) {
uint32_t index;
if (lref.isString() && IsDefinitelyIndex(rref, &index)) {
JSString *str = lref.toString();
int32_t i = rref.toInt32();
if (size_t(i) < str->length()) {
str = cx->runtime->staticStrings.getUnitStringForElement(cx, str, size_t(i));
if (index < str->length()) {
str = cx->runtime->staticStrings.getUnitStringForElement(cx, str, index);
if (!str)
return false;
res.setString(str);