From 282bc7a7b4a64fb14ab80198bd1c89afd8a34a3b Mon Sep 17 00:00:00 2001 From: "erik.corry@gmail.com" Date: Mon, 4 May 2009 19:35:46 +0000 Subject: [PATCH] Reverty 1842 (see http://code.google.com/p/chromium/issues/detail?id=1717 ) Review URL: http://codereview.chromium.org/99346 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@1848 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- src/array.js | 7 +- src/date-delay.js | 7 +- src/math.js | 6 +- src/string.js | 4 +- test/mjsunit/undeletable-functions.js | 174 ---------------------------------- 5 files changed, 10 insertions(+), 188 deletions(-) delete mode 100644 test/mjsunit/undeletable-functions.js diff --git a/src/array.js b/src/array.js index b56a8f1..bee73e4 100644 --- a/src/array.js +++ b/src/array.js @@ -1011,10 +1011,9 @@ function SetupArray() { // object. %SetProperty($Array.prototype, "constructor", $Array, DONT_ENUM); - // Setup non-enumerable functions of the Array.prototype object and set their - // names. Use DONT_DELETE due to - // http://code.google.com/p/chromium/issues/detail?id=1717 - InstallFunctions($Array.prototype, DONT_ENUM | DONT_DELETE, $Array( + // Setup non-enumerable functions of the Array.prototype object and + // set their names. + InstallFunctions($Array.prototype, DONT_ENUM, $Array( "toString", ArrayToString, "toLocaleString", ArrayToLocaleString, "join", ArrayJoin, diff --git a/src/date-delay.js b/src/date-delay.js index 42716da..dbb9c2c 100644 --- a/src/date-delay.js +++ b/src/date-delay.js @@ -1017,10 +1017,9 @@ function SetupDate() { // Setup non-enumerable constructor property of the Date prototype object. %SetProperty($Date.prototype, "constructor", $Date, DONT_ENUM); - // Setup non-enumerable functions of the Date prototype object and set their - // names. Use DONT_DELETE due to - // http://code.google.com/p/chromium/issues/detail?id=1717 - InstallFunctions($Date.prototype, DONT_ENUM | DONT_DELETE, $Array( + // Setup non-enumerable functions of the Date prototype object and + // set their names. + InstallFunctions($Date.prototype, DONT_ENUM, $Array( "toString", DateToString, "toDateString", DateToDateString, "toTimeString", DateToTimeString, diff --git a/src/math.js b/src/math.js index d786463..5b7c396 100644 --- a/src/math.js +++ b/src/math.js @@ -162,9 +162,9 @@ function SetupMath() { 1.4142135623730951, DONT_ENUM | DONT_DELETE | READ_ONLY); - // Setup non-enumerable functions of the Math object and set their names. Use - // DONT_DELETE due to http://code.google.com/p/chromium/issues/detail?id=1717 - InstallFunctions($Math, DONT_ENUM | DONT_DELETE, $Array( + // Setup non-enumerable functions of the Math object and + // set their names. + InstallFunctions($Math, DONT_ENUM, $Array( "random", MathRandom, "abs", MathAbs, "acos", MathAcos, diff --git a/src/string.js b/src/string.js index c7bf0a4..c7a838e 100644 --- a/src/string.js +++ b/src/string.js @@ -831,9 +831,7 @@ function SetupString() { // Setup the non-enumerable functions on the String prototype object. - // Use DONT_DELETE due to - // http://code.google.com/p/chromium/issues/detail?id=1717 - InstallFunctions($String.prototype, DONT_ENUM | DONT_DELETE, $Array( + InstallFunctions($String.prototype, DONT_ENUM, $Array( "valueOf", StringValueOf, "toString", StringToString, "charAt", StringCharAt, diff --git a/test/mjsunit/undeletable-functions.js b/test/mjsunit/undeletable-functions.js deleted file mode 100644 index 0f5f921..0000000 --- a/test/mjsunit/undeletable-functions.js +++ /dev/null @@ -1,174 +0,0 @@ -// Copyright 2009 the V8 project authors. All rights reserved. -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following -// disclaimer in the documentation and/or other materials provided -// with the distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived -// from this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -// Test that we match JSC in making some functions undeletable. -// See http://code.google.com/p/chromium/issues/detail?id=1717 - -var array; - -array = [ - "toString", "toLocaleString", "join", "pop", "push", "concat", "reverse", - "shift", "unshift", "slice", "splice", "sort", "filter", "forEach", "some", - "every", "map", "indexOf", "lastIndexOf", "reduce", "reduceRight"]; -CheckJSCSemantics(Array.prototype, array, "Array prototype"); - -array = [ - "toString", "toDateString", "toTimeString", "toLocaleString", - "toLocaleDateString", "toLocaleTimeString", "valueOf", "getTime", - "getFullYear", "getUTCFullYear", "getMonth", "getUTCMonth", "getDate", - "getUTCDate", "getDay", "getUTCDay", "getHours", "getUTCHours", "getMinutes", - "getUTCMinutes", "getSeconds", "getUTCSeconds", "getMilliseconds", - "getUTCMilliseconds", "getTimezoneOffset", "setTime", "setMilliseconds", - "setUTCMilliseconds", "setSeconds", "setUTCSeconds", "setMinutes", - "setUTCMinutes", "setHours", "setUTCHours", "setDate", "setUTCDate", - "setMonth", "setUTCMonth", "setFullYear", "setUTCFullYear", "toGMTString", - "toUTCString", "getYear", "setYear", "toISOString", "toJSON"]; -CheckJSCSemantics(Date.prototype, array, "Date prototype"); - -array = [ - "random", "abs", "acos", "asin", "atan", "ceil", "cos", "exp", "floor", "log", - "round", "sin", "sqrt", "tan", "atan2", "pow", "max", "min"]; -CheckJSCSemantics(Math, array, "Math1"); - -CheckEcmaSemantics(Date, ["UTC", "parse", "now"], "Date"); - -array = [ - "E", "LN10", "LN2", "LOG2E", "LOG10E", "PI", "SQRT1_2", "SQRT2"]; -CheckDontDelete(Math, array, "Math2"); - -array = [ - "escape", "unescape", "decodeURI", "decodeURIComponent", "encodeURI", - "encodeURIComponent", "isNaN", "isFinite", "parseInt", "parseFloat", "eval", - "execScript"]; -CheckEcmaSemantics(this, array, "Global"); -CheckReadOnlyAttr(this, "Infinity"); - -array = ["exec", "test", "toString", "compile"]; -CheckEcmaSemantics(RegExp.prototype, array, "RegExp prototype"); - -array = [ - "toString", "toLocaleString", "valueOf", - //"hasOwnProperty", - "isPrototypeOf", "propertyIsEnumerable", "__defineGetter__", - "__lookupGetter__", "__defineSetter__", "__lookupSetter__"]; -CheckEcmaSemantics(Object.prototype, array, "Object prototype"); - -array = [ - "toString", "valueOf", "toJSON"]; -CheckEcmaSemantics(Boolean.prototype, array, "Boolean prototype"); - -array = [ - "toString", "toLocaleString", "valueOf", "toFixed", "toExponential", - "toPrecision", "toJSON"]; -CheckEcmaSemantics(Number.prototype, array, "Number prototype"); - -CheckEcmaSemantics(Function.prototype, ["toString"], "Function prototype"); - -array = [ - "charAt", "charCodeAt", "concat", "indexOf", - "lastIndexOf", "localeCompare", "match", "replace", "search", "slice", - "split", "substring", "substr", "toLowerCase", "toLocaleLowerCase", - "toUpperCase", "toLocaleUpperCase", "link", "anchor", "fontcolor", "fontsize", - "big", "blink", "bold", "fixed", "italics", "small", "strike", "sub", "sup", - "toJSON", "toString", "valueOf"]; -CheckJSCSemantics(String.prototype, array, "String prototype"); -CheckEcmaSemantics(String, ["fromCharCode"], "String"); - - -function CheckEcmaSemantics(type, props, name) { - print(name); - for (var i = 0; i < props.length; i++) { - CheckDeletable(type, props[i]); - } -} - - -function CheckJSCSemantics(type, props, name) { - print(name); - for (var i = 0; i < props.length; i++) { - CheckNotDeletable(type, props[i]); - } -} - - -function CheckDontDelete(type, props, name) { - print(name); - for (var i = 0; i < props.length; i++) { - CheckDontDeleteAttr(type, props[i]); - } -} - - -function CheckDeletable(type, prop) { - var old = type[prop]; - if (!type[prop]) return; - assertTrue(type.hasOwnProperty(prop), "inherited: " + prop); - var deleted = delete type[prop]; - assertTrue(deleted, "delete operator returned false: " + prop); - assertFalse(type.hasOwnProperty(prop), "still there after delete: " + prop); - type[prop] = "foo"; - assertEquals("foo", type[prop], "not overwritable: " + prop); -} - - -function CheckNotDeletable(type, prop) { - var old = type[prop]; - if (!type[prop]) return; - assertTrue(type.hasOwnProperty(prop), "inherited: " + prop); - var deleted = delete type[prop]; - // Comment this next line to pass the test on JSC: - assertFalse(deleted, "delete operator returned true: " + prop); - assertTrue(type.hasOwnProperty(prop), "not there after delete: " + prop); - type[prop] = "foo"; - assertEquals("foo", type[prop], "not overwritable: " + prop); -} - - -function CheckDontDeleteAttr(type, prop) { - var old = type[prop]; - if (!type[prop]) return; - assertTrue(type.hasOwnProperty(prop), "inherited: " + prop); - var deleted = delete type[prop]; - assertFalse(deleted, "delete operator returned true: " + prop); - assertTrue(type.hasOwnProperty(prop), "not there after delete: " + prop); - type[prop] = "foo"; - assertFalse("foo" == type[prop], "overwritable: " + prop); -} - - -function CheckReadOnlyAttr(type, prop) { - var old = type[prop]; - if (!type[prop]) return; - assertTrue(type.hasOwnProperty(prop), "inherited: " + prop); - var deleted = delete type[prop]; - assertFalse(deleted, "delete operator returned true: " + prop); - assertTrue(type.hasOwnProperty(prop), "not there after delete: " + prop); - type[prop] = "foo"; - assertEquals("foo", type[prop], "overwritable: " + prop); -} - -print("OK"); -- 2.7.4