Changeset 167297 in webkit

Timestamp:

Apr 14, 2014 11:13:17 PM (10 years ago)

Author:

commit-queue@webkit.org

Message:

Unreviewed, rolling out r167272.
​https://bugs.webkit.org/show_bug.cgi?id=131666

Broke multiple tests (Requested by ap on #webkit).

Reverted changeset:

"Function.bind itself is too slow"
​https://bugs.webkit.org/show_bug.cgi?id=131636
​http://trac.webkit.org/changeset/167272

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/js/regress/function-bind-create-expected.html (deleted)
• LayoutTests/js/regress/function-bind-create.html (deleted)
• LayoutTests/js/regress/script-tests/function-bind-create.js (deleted)
• LayoutTests/js/regress/script-tests/function-bind.js (modified) (2 diffs)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/builtins/Function.prototype.js (modified) (10 diffs)
• Source/JavaScriptCore/runtime/CommonIdentifiers.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2014-04-14  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r167272.
+        https://bugs.webkit.org/show_bug.cgi?id=131666
+
+        Broke multiple tests (Requested by ap on #webkit).
+
+        Reverted changeset:
+
+        "Function.bind itself is too slow"
+        https://bugs.webkit.org/show_bug.cgi?id=131636
+        http://trac.webkit.org/changeset/167272
+
 2014-04-14  Jon Honeycutt  <jhoneycutt@apple.com>
 

trunk/LayoutTests/js/regress/script-tests/function-bind.js

@@ -7 +7 @@
 var g2 = foo.bind({}, 1, 2);
 var g3 = foo.bind({}, 1, 2, 3);
+var start = new Date;
 
 var result = 0;
@@ -23 +24 @@
     result |= 0;
 }
+print((new Date - start))
 if (result != 1596499010)
     throw "Bad result: " + result;

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2014-04-14  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r167272.
+        https://bugs.webkit.org/show_bug.cgi?id=131666
+
+        Broke multiple tests (Requested by ap on #webkit).
+
+        Reverted changeset:
+
+        "Function.bind itself is too slow"
+        https://bugs.webkit.org/show_bug.cgi?id=131636
+        http://trac.webkit.org/changeset/167272
+
 2014-04-14  Geoffrey Garen  <ggaren@apple.com>
 

trunk/Source/JavaScriptCore/builtins/Function.prototype.js

@@ -41 +41 @@
         throw new @TypeError("Cannot bind non-function object.");
     var bindingFunction;
+    var oversizedCall = undefined;
     if (arguments.length <= 1) {
-        bindingFunction = function bindingFunction() {
-            var thisValue = bindingFunction.@boundThisValue;
-            var boundFunction = bindingFunction.@boundFunction;
+        bindingFunction = function () {
             if (@IsConstructor)
                 return new boundFunction(...arguments);
@@ -53 +52 @@
         switch (length - 1 /* skip thisValue */) {
         case 1: {
-            bindingFunction = function bindingFunction() {
-                var thisValue = bindingFunction.@boundThisValue;
-                var boundFunction = bindingFunction.@boundFunction;
-                var boundParameter = bindingFunction.@boundParameter;
+            var boundParameter = arguments[1];
+            bindingFunction = function () {
                 var argumentLength = arguments.length;
                 if (!argumentLength) {
@@ -79 +76 @@
                 }
                 var completeArguments = [boundParameter, ...arguments];
-                if (!bindingFunction.@boundOversizedCallThunk) {
-                   bindingFunction.@boundOversizedCallThunk = function (isConstruct, boundFunction, thisValue, completeArguments) {
+                if (!oversizedCall) {
+                    oversizedCall = function (isConstruct, boundFunction, thisValue, completeArguments) {
                         if (isConstruct)
                             return new boundFunction(...completeArguments);
@@ -86 +83 @@
                     }
                 }
-                return bindingFunction.@boundOversizedCallThunk(@IsConstructor, boundFunction, thisValue, completeArguments);
+                return oversizedCall(@IsConstructor, boundFunction, thisValue, completeArguments);
             }
-            bindingFunction.@boundParameter = arguments[1];
             break;
         }
         case 2: {
-            bindingFunction = function bindingFunction() {
-                var thisValue = bindingFunction.@boundThisValue;
-                var boundFunction = bindingFunction.@boundFunction;
-                var boundParameter1 = bindingFunction.@boundParameter1;
-                var boundParameter2 = bindingFunction.@boundParameter2;
+            var boundParameter1 = arguments[1];
+            var boundParameter2 = arguments[2];
+            bindingFunction = function () {
                 if (!arguments.length) {
                     if (@IsConstructor)
@@ -118 +112 @@
                 }
                 var completeArguments = [boundParameter1, boundParameter2, ...arguments];
-                if (!bindingFunction.@boundOversizedCallThunk) {
-                    bindingFunction.@boundOversizedCallThunk = function (isConstruct, boundFunction, thisValue, completeArguments) {
+                if (!oversizedCall) {
+                    oversizedCall = function (isConstruct, boundFunction, thisValue, completeArguments) {
                         if (isConstruct)
                             return new boundFunction(...completeArguments);
@@ -125 +119 @@
                     }
                 }
-                return bindingFunction.@boundOversizedCallThunk(@IsConstructor, boundFunction, thisValue, completeArguments);
+                return oversizedCall(@IsConstructor, boundFunction, thisValue, completeArguments);
             }
-            bindingFunction.@boundParameter1 = arguments[1];
-            bindingFunction.@boundParameter2 = arguments[2];
             break;
         }
         case 3: {
-            bindingFunction = function bindingFunction() {
-                var thisValue = bindingFunction.@boundThisValue;
-                var boundFunction = bindingFunction.@boundFunction;
-                var boundParameter1 = bindingFunction.@boundParameter1;
-                var boundParameter2 = bindingFunction.@boundParameter2;
-                var boundParameter3 = bindingFunction.@boundParameter3;
+            var boundParameter1 = arguments[1];
+            var boundParameter2 = arguments[2];
+            var boundParameter3 = arguments[3];
+            bindingFunction = function () {
                 if (!arguments.length) {
                     if (@IsConstructor)
@@ -159 +149 @@
                 }
                 var completeArguments = [boundParameter1, boundParameter2, boundParameter3, ...arguments];
-                if (!bindingFunction.@boundOversizedCallThunk) {
-                    bindingFunction.@boundOversizedCallThunk = function (isConstruct, boundFunction, thisValue, completeArguments) {
+                if (!oversizedCall) {
+                    oversizedCall = function (isConstruct, boundFunction, thisValue, completeArguments) {
                         if (isConstruct)
                             return new boundFunction(...completeArguments);
@@ -166 +156 @@
                     }
                 }
-                return bindingFunction.@boundOversizedCallThunk(@IsConstructor, boundFunction, thisValue, completeArguments);
+                return oversizedCall(@IsConstructor, boundFunction, thisValue, completeArguments);
             }
-            bindingFunction.@boundParameter1 = arguments[1];
-            bindingFunction.@boundParameter2 = arguments[2];
-            bindingFunction.@boundParameter3 = arguments[3];
             break;
         }
@@ -178 +165 @@
                 boundParameters[i - 1] = arguments[i];
             
-            bindingFunction = function bindingFunction() {
-                var thisValue = bindingFunction.@boundThisValue;
-                var boundFunction = bindingFunction.@boundFunction;
-                var boundParameters = bindingFunction.@boundParameters;
+            bindingFunction = function () {
                 if (!arguments.length) {
                     if (@IsConstructor)
-                        return new boundFunction(...@boundParameters);
+                        return new boundFunction(...boundParameters);
                     return boundFunction.@apply(thisValue, boundParameters);
                 }
                 
                 var completeArguments = [];
-                var boundLength = boundParameters.length;
+                var localBoundParameters = boundParameters;
+                var boundLength = localBoundParameters.length;
                 for (var i = 0; i < boundLength; i++)
-                    completeArguments[i] = boundParameters[i];
+                    completeArguments[i] = localBoundParameters[i];
                 for (var i = 0; i < arguments.length; i++)
                     completeArguments[i + boundLength] = arguments[i];
@@ -199 +184 @@
                     return boundFunction.@apply(thisValue, completeArguments);
             }
-            bindingFunction.@boundParameters = boundParameters;
         }
     }
-    bindingFunction.@boundThisValue = thisValue;
     bindingFunction.@boundFunctionName = this.name;
     bindingFunction.@boundFunction = boundFunction.@boundFunction || boundFunction;

trunk/Source/JavaScriptCore/runtime/CommonIdentifiers.h

@@ -224 +224 @@
     macro(boundFunctionName) \
     macro(boundFunctionParameters) \
-    macro(boundThisValue) \
-    macro(boundParameter) \
-    macro(boundParameter1) \
-    macro(boundParameter2) \
-    macro(boundParameter3) \
-    macro(boundParameters) \
-    macro(boundOversizedCallThunk) \
     macro(boundFunction) \
     macro(boundFunctionLength) \