Modified: trunk/Source/_javascript_Core/ChangeLog (105701 => 105702)
--- trunk/Source/_javascript_Core/ChangeLog 2012-01-24 07:47:47 UTC (rev 105701)
+++ trunk/Source/_javascript_Core/ChangeLog 2012-01-24 08:26:02 UTC (rev 105702)
@@ -1,3 +1,10 @@
+2012-01-24 Ilya Tikhonovsky <[email protected]>
+
+ Unreviewed build fix for Qt LinuxSH4 build after r105698.
+
+ * interpreter/Interpreter.cpp:
+ (JSC::Interpreter::privateExecute):
+
2012-01-23 Geoffrey Garen <[email protected]>
JSValue::toString() should return a JSString* instead of a UString
Modified: trunk/Source/_javascript_Core/interpreter/Interpreter.cpp (105701 => 105702)
--- trunk/Source/_javascript_Core/interpreter/Interpreter.cpp 2012-01-24 07:47:47 UTC (rev 105701)
+++ trunk/Source/_javascript_Core/interpreter/Interpreter.cpp 2012-01-24 08:26:02 UTC (rev 105702)
@@ -2579,7 +2579,7 @@
if (propName.getUInt32(i))
callFrame->uncheckedR(dst) = jsBoolean(baseObj->hasProperty(callFrame, i));
else {
- Identifier property(callFrame, propName.toString(callFrame));
+ Identifier property(callFrame, propName.toString(callFrame)->value(callFrame));
CHECK_FOR_EXCEPTION();
callFrame->uncheckedR(dst) = jsBoolean(baseObj->hasProperty(callFrame, property));
}
@@ -3486,7 +3486,7 @@
NEXT_INSTRUCTION();
}
{
- Identifier propertyName(callFrame, subscript.toString(callFrame));
+ Identifier propertyName(callFrame, subscript.toString(callFrame)->value(callFrame));
result = baseValue.get(callFrame, propertyName);
}
CHECK_FOR_EXCEPTION();
@@ -3561,7 +3561,7 @@
else
result = baseValue.get(callFrame, i);
} else {
- Identifier property(callFrame, subscript.toString(callFrame));
+ Identifier property(callFrame, subscript.toString(callFrame)->value(callFrame));
result = baseValue.get(callFrame, property);
}
@@ -3608,7 +3608,7 @@
} else
baseValue.put(callFrame, i, callFrame->r(value).jsValue());
} else {
- Identifier property(callFrame, subscript.toString(callFrame));
+ Identifier property(callFrame, subscript.toString(callFrame)->value(callFrame));
if (!globalData->exception) { // Don't put to an object if toString threw an exception.
PutPropertySlot slot(codeBlock->isStrictMode());
baseValue.put(callFrame, property, callFrame->r(value).jsValue(), slot);
@@ -3640,7 +3640,7 @@
result = baseObj->methodTable()->deletePropertyByIndex(baseObj, callFrame, i);
else {
CHECK_FOR_EXCEPTION();
- Identifier property(callFrame, subscript.toString(callFrame));
+ Identifier property(callFrame, subscript.toString(callFrame)->value(callFrame));
CHECK_FOR_EXCEPTION();
result = baseObj->methodTable()->deleteProperty(baseObj, callFrame, property);
}
@@ -4947,7 +4947,7 @@
original constructor, using constant message as the
message string. The result is thrown.
*/
- UString message = callFrame->r(vPC[1].u.operand).jsValue().toString(callFrame);
+ UString message = callFrame->r(vPC[1].u.operand).jsValue().toString(callFrame)->value(callFrame);
exceptionValue = JSValue(createReferenceError(callFrame, message));
goto vm_throw;
}