Allow full inlining of f.apply(this, arguments) calls.

This allows Crankshaft to completely inline a f.apply() dispatch if the
exact number of arguments is known and the function is constant. The
deoptimizer doesn't generate the f.apply() frame during deoptimization,
so the materialized frames look like f.apply() did a tailcall.

R=jkummerow@chromium.org
TEST=mjsunit/compiler/inline-function-apply

Review URL: https://codereview.chromium.org/12263004

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@13665 ce2b1a6d-e550-0410-aec6-3dcde31c8c00

diff --git a/src/hydrogen.cc b/src/hydrogen.cc
index e242c38..e118a11 100644 (file)
--- a/src/hydrogen.cc
+++ b/src/hydrogen.cc
@@ -7764,6 +7764,19 @@ bool HOptimizedGraphBuilder::TryInlineSetter(Handle<JSFunction> setter,
 }
 
 
+bool HOptimizedGraphBuilder::TryInlineApply(Handle<JSFunction> function,
+                                            Call* expr,
+                                            int arguments_count) {
+  return TryInline(CALL_AS_METHOD,
+                   function,
+                   arguments_count,
+                   NULL,
+                   expr->id(),
+                   expr->ReturnId(),
+                   NORMAL_RETURN);
+}
+
+
 bool HOptimizedGraphBuilder::TryInlineBuiltinFunctionCall(Call* expr,
                                                           bool drop_extra) {
   if (!expr->target()->shared()->HasBuiltinFunctionId()) return false;
@@ -7991,22 +8004,32 @@ bool HOptimizedGraphBuilder::TryCallApply(Call* expr) {
     // TODO(mstarzinger): For now we just ensure arguments are pushed
     // right after HEnterInlined, but we could be smarter about this.
     EnsureArgumentsArePushedForAccess();
-    HValue* context = environment()->LookupContext();
-
-    HValue* wrapped_receiver =
-        AddInstruction(new(zone()) HWrapReceiver(receiver, function));
-    PushAndAdd(new(zone()) HPushArgument(wrapped_receiver));
-
     HEnvironment* arguments_env = environment()->arguments_environment();
-
     int parameter_count = arguments_env->parameter_count();
+    PushAndAdd(new(zone()) HWrapReceiver(receiver, function));
+    for (int i = 1; i < arguments_env->parameter_count(); i++) {
+      Push(arguments_env->Lookup(i));
+    }
+
+    Handle<JSFunction> known_function;
+    if (function->IsConstant()) {
+      HConstant* constant_function = HConstant::cast(function);
+      known_function = Handle<JSFunction>::cast(constant_function->handle());
+      int arguments_count = parameter_count - 1;  // Excluding receiver.
+      if (TryInlineApply(known_function, expr, arguments_count)) return true;
+    }
+
+    Drop(parameter_count - 1);
+    PushAndAdd(new(zone()) HPushArgument(Pop()));
     for (int i = 1; i < arguments_env->parameter_count(); i++) {
       PushAndAdd(new(zone()) HPushArgument(arguments_env->Lookup(i)));
     }
 
+    HValue* context = environment()->LookupContext();
     HInvokeFunction* call = new(zone()) HInvokeFunction(
         context,
         function,
+        known_function,
         parameter_count);
     Drop(parameter_count);
     call->set_position(expr->position());

diff --git a/src/hydrogen.h b/src/hydrogen.h
index 180882e..f4ab12a 100644 (file)
--- a/src/hydrogen.h
+++ b/src/hydrogen.h
@@ -1251,6 +1251,9 @@ class HOptimizedGraphBuilder: public HGraphBuilder, public AstVisitor {
   bool TryInlineSetter(Handle<JSFunction> setter,
                        Assignment* assignment,
                        HValue* implicit_return_value);
+  bool TryInlineApply(Handle<JSFunction> function,
+                      Call* expr,
+                      int arguments_count);
   bool TryInlineBuiltinMethodCall(Call* expr,
                                   HValue* receiver,
                                   Handle<Map> receiver_map,

diff --git a/test/mjsunit/compiler/inline-function-apply.js b/test/mjsunit/compiler/inline-function-apply.js
new file mode 100644 (file)
index 0000000..76bfa45
--- /dev/null
+++ b/test/mjsunit/compiler/inline-function-apply.js
@@ -0,0 +1,90 @@
+// Copyright 2013 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.
+
+// Flags: --allow-natives-syntax
+
+// Test inlining and deoptimization of function.apply(this, arguments)
+// calls for which the exact number of arguments is known.
+(function () {
+  "use strict";
+  function test(argumentsCount) {
+    var dispatcher = {};
+    var deoptimize = { deopt:false };
+    dispatcher["const" + argumentsCount] = 0;
+    dispatcher.func = C;
+
+    function A(x,y) {
+      var r = "A";
+      if (argumentsCount == 1) r += B(10);
+      if (argumentsCount == 2) r += B(10, 11);
+      if (argumentsCount == 3) r += B(10, 11, 12);
+      assertSame(1, x);
+      assertSame(2, y);
+      return r;
+    }
+
+    function B(x,y) {
+      // TODO(2539): Enable the mutation below once bug is fixed.
+      //x = 0; y = 0;
+      var r = "B" + dispatcher.func.apply(this, arguments);
+      assertSame(argumentsCount, arguments.length);
+      for (var i = 0; i < arguments.length; i++) {
+        assertSame(10 + i, arguments[i]);
+      }
+      return r;
+    }
+
+    function C(x,y) {
+      x = 0; y = 0;
+      var r = "C"
+      deoptimize.deopt;
+      assertSame(argumentsCount, arguments.length);
+      for (var i = 0; i < arguments.length; i++) {
+        assertSame(10 + i, arguments[i]);
+      }
+      return r;
+    }
+
+    assertEquals("ABC", A(1,2));
+    assertEquals("ABC", A(1,2));
+    %OptimizeFunctionOnNextCall(A);
+    assertEquals("ABC", A(1,2));
+    delete deoptimize.deopt;
+    assertEquals("ABC", A(1,2));
+
+    %DeoptimizeFunction(A);
+    %ClearFunctionTypeFeedback(A);
+    %DeoptimizeFunction(B);
+    %ClearFunctionTypeFeedback(B);
+    %DeoptimizeFunction(C);
+    %ClearFunctionTypeFeedback(C);
+  }
+
+  for (var a = 1; a <= 3; a++) {
+    test(a);
+  }
+})();