Changeset 91224 in webkit

Timestamp:

Jul 18, 2011 5:25:49 PM (13 years ago)

Author:

barraclough@apple.com

Message:

​https://bugs.webkit.org/show_bug.cgi?id=64678
Fix bugs in Object.prototype this handling.

Reviewed by Oliver Hunt.

Source/JavaScriptCore:

undefined/null this values should throw TypeErrors, not convert to the global object,
also, to toLocaleString should be calling the ToObject & invoking the object's toString
function, even for values that are already strings.

• runtime/ObjectPrototype.cpp:

(JSC::objectProtoFuncValueOf):
(JSC::objectProtoFuncHasOwnProperty):
(JSC::objectProtoFuncIsPrototypeOf):
(JSC::objectProtoFuncPropertyIsEnumerable):
(JSC::objectProtoFuncToLocaleString):
(JSC::objectProtoFuncToString):

LayoutTests:

• fast/js/resources/js-test-pre.js:
  • Updated harness to not call Object.prototype.toString on undefined.
• fast/js/eval-var-decl-expected.txt:
• fast/js/object-prototype-properties-expected.txt: Added.
• fast/js/object-prototype-properties.html: Added.
• fast/js/object-prototype-toLocaleString-expected.txt
• fast/js/script-tests/eval-var-decl.js:
  • Fix test case, calling hasProperty with undefined as the this value should throw.
• fast/js/script-tests/object-prototype-properties.js: Added.
  • Place for test cases for Object.prototype properties; to being with, check that calling these methods on undefined throws!
• fast/js/script-tests/object-prototype-toLocaleString.js:
  • Added test cases for correct behaviour when this is a string primitive.
• sputnik/Conformance/11_Expressions/11.1_Primary_Expressions/11.1.1_The_this_Keyword/S11.1.1_A2-expected.txt:
• sputnik/Conformance/15_Native_Objects/15.5_String/15.5.4/15.5.4.10_String.prototype.match/S15.5.4.10_A1_T3-expected.txt:
• sputnik/Conformance/15_Native_Objects/15.5_String/15.5.4/15.5.4.11_String.prototype.replace/S15.5.4.11_A1_T3-expected.txt:
• sputnik/Conformance/15_Native_Objects/15.5_String/15.5.4/15.5.4.12_String.prototype.search/S15.5.4.12_A1_T3-expected.txt:
• sputnik/Conformance/15_Native_Objects/15.5_String/15.5.4/15.5.4.13_String.prototype.slice/S15.5.4.13_A1_T3-expected.txt:
• sputnik/Conformance/15_Native_Objects/15.5_String/15.5.4/15.5.4.14_String.prototype.split/S15.5.4.14_A1_T3-expected.txt:
• sputnik/Conformance/15_Native_Objects/15.5_String/15.5.4/15.5.4.15_String.prototype.substring/S15.5.4.15_A1_T3-expected.txt:
• sputnik/Conformance/15_Native_Objects/15.5_String/15.5.4/15.5.4.4_String.prototype.charAt/S15.5.4.4_A1_T3-expected.txt:
• sputnik/Conformance/15_Native_Objects/15.5_String/15.5.4/15.5.4.5_String.prototype.charCodeAt/S15.5.4.5_A1_T3-expected.txt:
• sputnik/Conformance/15_Native_Objects/15.5_String/15.5.4/15.5.4.6_String.prototype.concat/S15.5.4.6_A1_T3-expected.txt:
• sputnik/Conformance/15_Native_Objects/15.5_String/15.5.4/15.5.4.7_String.prototype.indexOf/S15.5.4.7_A1_T3-expected.txt:
• sputnik/Conformance/15_Native_Objects/15.5_String/15.5.4/15.5.4.8_String.prototype.lastIndexOf/S15.5.4.8_A1_T3-expected.txt:
  • These test cases are all incorrect. (See ​https://bugs.ecmascript.org/show_bug.cgi?id=117). We were incorrectly passing 15.5.4.11_String.prototype.replace, this should fail, as the others do. All the other 15.5.4 tests were failing & are still failing, but now have a better error message. S11.1.1_A2 is also invalid, calling toString() passing undefined as this should throw.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/js/eval-var-decl-expected.txt (modified) (1 diff)
• LayoutTests/fast/js/object-prototype-properties-expected.txt (added)
• LayoutTests/fast/js/object-prototype-properties.html (added)
• LayoutTests/fast/js/object-prototype-toLocaleString-expected.txt (modified) (1 diff)
• LayoutTests/fast/js/resources/js-test-pre.js (modified) (1 diff)
• LayoutTests/fast/js/script-tests/eval-var-decl.js (modified) (1 diff)
• LayoutTests/fast/js/script-tests/object-prototype-properties.js (added)
• LayoutTests/fast/js/script-tests/object-prototype-toLocaleString.js (modified) (1 diff)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/runtime/ObjectPrototype.cpp (modified) (5 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-07-18  Gavin Barraclough  <barraclough@apple.com>
+
+        https://bugs.webkit.org/show_bug.cgi?id=64678
+        Fix bugs in Object.prototype this handling.
+
+        Reviewed by Oliver Hunt.
+
+        * fast/js/resources/js-test-pre.js:
+            - Updated harness to not call Object.prototype.toString on undefined.
+        * fast/js/eval-var-decl-expected.txt:
+        * fast/js/object-prototype-properties-expected.txt: Added.
+        * fast/js/object-prototype-properties.html: Added.
+        * fast/js/object-prototype-toLocaleString-expected.txt
+        * fast/js/script-tests/eval-var-decl.js:
+            - Fix test case, calling hasProperty with undefined as the this value should throw.
+        * fast/js/script-tests/object-prototype-properties.js: Added.
+            - Place for test cases for Object.prototype properties; to being with, check that calling these methods on undefined throws!
+        * fast/js/script-tests/object-prototype-toLocaleString.js:
+            - Added test cases for correct behaviour when this is a string primitive.
+        * sputnik/Conformance/11_Expressions/11.1_Primary_Expressions/11.1.1_The_this_Keyword/S11.1.1_A2-expected.txt:
+        * sputnik/Conformance/15_Native_Objects/15.5_String/15.5.4/15.5.4.10_String.prototype.match/S15.5.4.10_A1_T3-expected.txt:
+        * sputnik/Conformance/15_Native_Objects/15.5_String/15.5.4/15.5.4.11_String.prototype.replace/S15.5.4.11_A1_T3-expected.txt:
+        * sputnik/Conformance/15_Native_Objects/15.5_String/15.5.4/15.5.4.12_String.prototype.search/S15.5.4.12_A1_T3-expected.txt:
+        * sputnik/Conformance/15_Native_Objects/15.5_String/15.5.4/15.5.4.13_String.prototype.slice/S15.5.4.13_A1_T3-expected.txt:
+        * sputnik/Conformance/15_Native_Objects/15.5_String/15.5.4/15.5.4.14_String.prototype.split/S15.5.4.14_A1_T3-expected.txt:
+        * sputnik/Conformance/15_Native_Objects/15.5_String/15.5.4/15.5.4.15_String.prototype.substring/S15.5.4.15_A1_T3-expected.txt:
+        * sputnik/Conformance/15_Native_Objects/15.5_String/15.5.4/15.5.4.4_String.prototype.charAt/S15.5.4.4_A1_T3-expected.txt:
+        * sputnik/Conformance/15_Native_Objects/15.5_String/15.5.4/15.5.4.5_String.prototype.charCodeAt/S15.5.4.5_A1_T3-expected.txt:
+        * sputnik/Conformance/15_Native_Objects/15.5_String/15.5.4/15.5.4.6_String.prototype.concat/S15.5.4.6_A1_T3-expected.txt:
+        * sputnik/Conformance/15_Native_Objects/15.5_String/15.5.4/15.5.4.7_String.prototype.indexOf/S15.5.4.7_A1_T3-expected.txt:
+        * sputnik/Conformance/15_Native_Objects/15.5_String/15.5.4/15.5.4.8_String.prototype.lastIndexOf/S15.5.4.8_A1_T3-expected.txt:
+            - These test cases are all incorrect. (See https://bugs.ecmascript.org/show_bug.cgi?id=117).
+              We were incorrectly passing 15.5.4.11_String.prototype.replace, this should fail, as the others do.
+              All the other 15.5.4 tests were failing & are still failing, but now have a better error message.
+              S11.1.1_A2 is also invalid, calling toString() passing undefined as this should throw.
+
 2011-07-18  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/LayoutTests/fast/js/eval-var-decl-expected.txt

@@ -4 +4 @@
 
 
-PASS hasOwnProperty("foo") is true
-PASS hasOwnProperty("bar") is true
+PASS this.hasOwnProperty("foo") is true
+PASS this.hasOwnProperty("bar") is true
 PASS firstEvalResult is true
 PASS secondEvalResult is false

trunk/LayoutTests/fast/js/object-prototype-toLocaleString-expected.txt

@@ -6 +6 @@
 PASS o.toLocaleString() is o.toString()
 PASS o.toLocaleString() is "Dynamic toLocaleString()"
+PASS Object.prototype.toLocaleString.call('Hello, world!') is "Hello, world!"
+PASS Object.prototype.toLocaleString.call('Hello, world!') is "stringPrototypeToString"
 PASS successfullyParsed is true
 

trunk/LayoutTests/fast/js/resources/js-test-pre.js

@@ -66 +66 @@
     if (typeof(_expected) == "number" && isNaN(_expected))
         return typeof(_actual) == "number" && isNaN(_actual);
-    if (Object.prototype.toString.call(_expected) == Object.prototype.toString.call([]))
+    if (_expected && (Object.prototype.toString.call(_expected) == Object.prototype.toString.call([])))
         return areArraysEqual(_actual, _expected);
     return false;

trunk/LayoutTests/fast/js/script-tests/eval-var-decl.js

@@ -3 +3 @@
 );
 
-shouldBeTrue('hasOwnProperty("foo")');
+shouldBeTrue('this.hasOwnProperty("foo")');
 var foo = 3;
 
 delete bar;
-shouldBeTrue('hasOwnProperty("bar")');
+shouldBeTrue('this.hasOwnProperty("bar")');
 var bar = 3;
 
-var firstEvalResult = eval('var result = hasOwnProperty("y"); var y = 3; result');
+var firstEvalResult = eval('var result = this.hasOwnProperty("y"); var y = 3; result');
 shouldBeTrue("firstEvalResult");
 
-var secondEvalResult = eval('delete x; var result = hasOwnProperty("x"); var x = 3; result');
+var secondEvalResult = eval('delete x; var result = this.hasOwnProperty("x"); var x = 3; result');
 shouldBeFalse("secondEvalResult");
 

trunk/LayoutTests/fast/js/script-tests/object-prototype-toLocaleString.js

@@ -8 +8 @@
 shouldBe("o.toLocaleString()", '"Dynamic toLocaleString()"');
 
+shouldBe("Object.prototype.toLocaleString.call('Hello, world!')", '"Hello, world!"');
+
+var stringPrototypeToString = String.prototype.toString;
+String.prototype.toString = (function(){ return "stringPrototypeToString"; });
+shouldBe("Object.prototype.toLocaleString.call('Hello, world!')", '"stringPrototypeToString"');
+String.prototype.toString = stringPrototypeToString;
+
 var successfullyParsed = true;

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2011-07-18  Gavin Barraclough  <barraclough@apple.com>
+
+        https://bugs.webkit.org/show_bug.cgi?id=64678
+        Fix bugs in Object.prototype this handling.
+
+        Reviewed by Oliver Hunt.
+
+        undefined/null this values should throw TypeErrors, not convert to the global object,
+        also, to toLocaleString should be calling the ToObject & invoking the object's toString
+        function, even for values that are already strings.
+
+        * runtime/ObjectPrototype.cpp:
+        (JSC::objectProtoFuncValueOf):
+        (JSC::objectProtoFuncHasOwnProperty):
+        (JSC::objectProtoFuncIsPrototypeOf):
+        (JSC::objectProtoFuncPropertyIsEnumerable):
+        (JSC::objectProtoFuncToLocaleString):
+        (JSC::objectProtoFuncToString):
+
 2011-07-18  Filip Pizlo  <fpizlo@apple.com>
 

trunk/Source/JavaScriptCore/runtime/ObjectPrototype.cpp

@@ -105 +105 @@
 {
     JSValue thisValue = exec->hostThisValue();
-    return JSValue::encode(thisValue.toThisObject(exec));
+    return JSValue::encode(thisValue.toObject(exec));
 }
 
@@ -111 +111 @@
 {
     JSValue thisValue = exec->hostThisValue();
-    return JSValue::encode(jsBoolean(thisValue.toThisObject(exec)->hasOwnProperty(exec, Identifier(exec, exec->argument(0).toString(exec)))));
+    return JSValue::encode(jsBoolean(thisValue.toObject(exec)->hasOwnProperty(exec, Identifier(exec, exec->argument(0).toString(exec)))));
 }
 
@@ -117 +117 @@
 {
     JSValue thisValue = exec->hostThisValue();
-    JSObject* thisObj = thisValue.toThisObject(exec);
+    JSObject* thisObj = thisValue.toObject(exec);
 
     if (!exec->argument(0).isObject())
@@ -168 +168 @@
 {
     JSValue thisValue = exec->hostThisValue();
-    return JSValue::encode(jsBoolean(thisValue.toThisObject(exec)->propertyIsEnumerable(exec, Identifier(exec, exec->argument(0).toString(exec)))));
-}
-
+    return JSValue::encode(jsBoolean(thisValue.toObject(exec)->propertyIsEnumerable(exec, Identifier(exec, exec->argument(0).toString(exec)))));
+}
+
+// 15.2.4.3 Object.prototype.toLocaleString()
 EncodedJSValue JSC_HOST_CALL objectProtoFuncToLocaleString(ExecState* exec)
 {
-    JSValue thisValue = exec->hostThisValue();
-    return JSValue::encode(thisValue.toThisJSString(exec));
+    // 1. Let O be the result of calling ToObject passing the this value as the argument.
+    JSObject* object = exec->hostThisValue().toObject(exec);
+    if (exec->hadException())
+        return JSValue::encode(jsUndefined());
+
+    // 2. Let toString be the result of calling the [[Get]] internal method of O passing "toString" as the argument.
+    JSValue toString = object->get(exec, exec->propertyNames().toString);
+
+    // 3. If IsCallable(toString) is false, throw a TypeError exception.
+    CallData callData;
+    CallType callType = getCallData(toString, callData);
+    if (callType == CallTypeNone)
+        return JSValue::encode(jsUndefined());
+
+    // 4. Return the result of calling the [[Call]] internal method of toString passing O as the this value and no arguments.
+    return JSValue::encode(call(exec, toString, callType, callData, object, exec->emptyList()));
 }
 
@@ -180 +195 @@
 {
     JSValue thisValue = exec->hostThisValue();
-    return JSValue::encode(jsMakeNontrivialString(exec, "[object ", thisValue.toThisObject(exec)->className(), "]"));
+    return JSValue::encode(jsMakeNontrivialString(exec, "[object ", thisValue.toObject(exec)->className(), "]"));
 }