Reviewers: Kevin Millikin,
Description:
Merge r8884 "Fix fun.apply(receiver, arguments) optimization" to 3.4.
[email protected]
BUG=v8:1592
TEST=mjsunit/regress/regress-1592.js
Please review this at http://codereview.chromium.org/7623016/
SVN Base: http://v8.googlecode.com/svn/branches/3.4/
Affected files:
M src/bootstrapper.cc
M src/hydrogen.h
M src/hydrogen.cc
M src/objects.h
M src/version.cc
A test/mjsunit/regress/regress-1592.js
Index: src/bootstrapper.cc
===================================================================
--- src/bootstrapper.cc (revision 8902)
+++ src/bootstrapper.cc (working copy)
@@ -1571,8 +1571,6 @@
global_context()->set_string_function_prototype_map(
HeapObject::cast(string_function->initial_map()->prototype())->map());
- InstallBuiltinFunctionIds();
-
// Install Function.prototype.call and apply.
{ Handle<String> key = factory()->function_class_symbol();
Handle<JSFunction> function =
@@ -1606,6 +1604,8 @@
apply->shared()->set_length(2);
}
+ InstallBuiltinFunctionIds();
+
// Create a constructor for RegExp results (a variant of Array that
// predefines the two properties index and match).
{
Index: src/hydrogen.cc
===================================================================
--- src/hydrogen.cc (revision 8902)
+++ src/hydrogen.cc (working copy)
@@ -4777,11 +4777,18 @@
Property* prop = callee->AsProperty();
ASSERT(prop != NULL);
+ if (!expr->IsMonomorphic() || expr->check_type() != RECEIVER_MAP_CHECK) {
+ return false;
+ }
+ Handle<Map> function_map = expr->GetReceiverTypes()->first();
+ if (function_map->instance_type() != JS_FUNCTION_TYPE ||
+ !expr->target()->shared()->HasBuiltinFunctionId() ||
+ expr->target()->shared()->builtin_function_id() != kFunctionApply) {
+ return false;
+ }
+
if (info()->scope()->arguments() == NULL) return false;
- Handle<String> name = prop->key()->AsLiteral()->AsPropertyName();
- if (!name->IsEqualTo(CStrVector("apply"))) return false;
-
ZoneList<Expression*>* args = expr->arguments();
if (args->length() != 2) return false;
@@ -4790,9 +4797,6 @@
HValue* arg_two_value = environment()->Lookup(arg_two->var());
if (!arg_two_value->CheckFlag(HValue::kIsArguments)) return false;
- if (!expr->IsMonomorphic() ||
- expr->check_type() != RECEIVER_MAP_CHECK) return false;
-
// Our implementation of arguments (based on this stack frame or an
// adapter below it) does not work for inlined functions.
if (function_state()->outer() != NULL) {
@@ -4809,10 +4813,7 @@
HValue* receiver = Pop();
HInstruction* elements = AddInstruction(new(zone()) HArgumentsElements);
HInstruction* length = AddInstruction(new(zone())
HArgumentsLength(elements));
- AddCheckConstantFunction(expr,
- function,
- expr->GetReceiverTypes()->first(),
- true);
+ AddCheckConstantFunction(expr, function, function_map, true);
HInstruction* result =
new(zone()) HApplyArguments(function, receiver, length, elements);
result->set_position(expr->position());
Index: src/hydrogen.h
===================================================================
--- src/hydrogen.h (revision 8902)
+++ src/hydrogen.h (working copy)
@@ -872,7 +872,10 @@
bool is_store);
bool TryArgumentsAccess(Property* expr);
+
+ // Try to optimize fun.apply(receiver, arguments) pattern.
bool TryCallApply(Call* expr);
+
bool TryInline(Call* expr);
bool TryInlineBuiltinFunction(Call* expr,
HValue* receiver,
Index: src/objects.h
===================================================================
--- src/objects.h (revision 8902)
+++ src/objects.h (working copy)
@@ -4346,6 +4346,7 @@
#define FUNCTIONS_WITH_ID_LIST(V) \
V(Array.prototype, push, ArrayPush) \
V(Array.prototype, pop, ArrayPop) \
+ V(Function.prototype, apply, FunctionApply) \
V(String.prototype, charCodeAt, StringCharCodeAt) \
V(String.prototype, charAt, StringCharAt) \
V(String, fromCharCode, StringFromCharCode) \
Index: src/version.cc
===================================================================
--- src/version.cc (revision 8902)
+++ src/version.cc (working copy)
@@ -35,7 +35,7 @@
#define MAJOR_VERSION 3
#define MINOR_VERSION 4
#define BUILD_NUMBER 14
-#define PATCH_LEVEL 11
+#define PATCH_LEVEL 12
// Use 1 for candidates and 0 otherwise.
// (Boolean macro values are not supported by all preprocessors.)
#define IS_CANDIDATE_VERSION 0
Index: test/mjsunit/regress/regress-1592.js
===================================================================
--- test/mjsunit/regress/regress-1592.js (revision 0)
+++ test/mjsunit/regress/regress-1592.js (revision 0)
@@ -0,0 +1,45 @@
+// Copyright 2011 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
+
+var f = {
+ apply: function(a, b) {}
+};
+
+function test(a) {
+ f.apply(this, arguments);
+}
+
+// Initialize ICs.
+test(1);
+test(1);
+
+%OptimizeFunctionOnNextCall(test);
+
+// Kaboom!
+test(1);
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
