From e0681f0b839bdd471c0ef2349c636ba1d98d358d Mon Sep 17 00:00:00 2001 From: caitpotter88 Date: Fri, 10 Apr 2015 11:36:02 -0700 Subject: [PATCH] [cleanup] delete dead code leftover from 48eff34 Few pieces leftover which are now effectively dead code and can be safely deleted. BUG=v8:3502 LOG=N R=arv@chromium.org Review URL: https://codereview.chromium.org/1052963004 Cr-Commit-Position: refs/heads/master@{#27759} --- src/array.js | 2 +- src/harmony-tostring.js | 18 ------------------ src/messages.js | 2 +- src/v8natives.js | 1 - 4 files changed, 2 insertions(+), 21 deletions(-) diff --git a/src/array.js b/src/array.js index 12d2b4c..806a3fa 100644 --- a/src/array.js +++ b/src/array.js @@ -361,7 +361,7 @@ function ArrayToString() { func = array.join; } if (!IS_SPEC_FUNCTION(func)) { - return %_CallFunction(array, DefaultObjectToString); + return %_CallFunction(array, ObjectToString); } return %_CallFunction(array, func); } diff --git a/src/harmony-tostring.js b/src/harmony-tostring.js index 0c3f3ca..ccd02ca 100644 --- a/src/harmony-tostring.js +++ b/src/harmony-tostring.js @@ -4,24 +4,6 @@ "use strict"; -// This file relies on the fact that the following declaration has been made -// in runtime.js and symbol.js: -// var $Object = global.Object; - -DefaultObjectToString = ObjectToStringHarmony; -// ES6 draft 08-24-14, section 19.1.3.6 -function ObjectToStringHarmony() { - if (IS_UNDEFINED(this) && !IS_UNDETECTABLE(this)) return "[object Undefined]"; - if (IS_NULL(this)) return "[object Null]"; - var O = ToObject(this); - var builtinTag = %_ClassOf(O); - var tag = O[symbolToStringTag]; - if (!IS_STRING(tag)) { - tag = builtinTag; - } - return "[object " + tag + "]"; -} - function HarmonyToStringExtendSymbolPrototype() { %CheckIsBootstrapping(); diff --git a/src/messages.js b/src/messages.js index b176ba8..53da883 100644 --- a/src/messages.js +++ b/src/messages.js @@ -301,7 +301,7 @@ function ToStringCheckErrorObject(obj) { function ToDetailString(obj) { - if (obj != null && IS_OBJECT(obj) && obj.toString === DefaultObjectToString) { + if (obj != null && IS_OBJECT(obj) && obj.toString === ObjectToString) { var constructor = obj.constructor; if (typeof constructor == "function") { var constructorName = constructor.name; diff --git a/src/v8natives.js b/src/v8natives.js index fad27ef..0164421 100644 --- a/src/v8natives.js +++ b/src/v8natives.js @@ -216,7 +216,6 @@ SetUpGlobal(); // ---------------------------------------------------------------------------- // Object -var DefaultObjectToString = ObjectToString; // ECMA-262 - 15.2.4.2 function NoSideEffectsObjectToString() { if (IS_UNDEFINED(this) && !IS_UNDETECTABLE(this)) return "[object Undefined]"; -- 2.7.4