Revision: 8904
Author: [email protected]
Date: Thu Aug 11 09:03:21 2011
Log: Merge r8072 and r8884 to 3.2.
r8072 "Do not allow inlining functions with direct arguments access."
r8884 "Fix fun.apply(receiver, arguments) optimization."
[email protected]
BUG=v8:1592
TEST=mjsunit/regress/regress-1592.js
Review URL: http://codereview.chromium.org/7622014
http://code.google.com/p/v8/source/detail?r=8904
Added:
/branches/3.2/test/mjsunit/regress/regress-1592.js
Modified:
/branches/3.2/src/ast.cc
/branches/3.2/src/bootstrapper.cc
/branches/3.2/src/hydrogen.cc
/branches/3.2/src/hydrogen.h
/branches/3.2/src/objects.h
/branches/3.2/src/version.cc
=======================================
--- /dev/null
+++ /branches/3.2/test/mjsunit/regress/regress-1592.js Thu Aug 11 09:03:21
2011
@@ -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);
=======================================
--- /branches/3.2/src/ast.cc Wed Apr 13 01:46:07 2011
+++ /branches/3.2/src/ast.cc Thu Aug 11 09:03:21 2011
@@ -554,6 +554,17 @@
bool CallRuntime::IsInlineable() const {
+ // Don't try to inline JS runtime calls because we don't (currently) even
+ // optimize them.
+ if (is_jsruntime()) return false;
+ // Don't inline the %_ArgumentsLength or %_Arguments because their
+ // implementation will not work. There is no stack frame to get them
+ // from.
+ if (function()->intrinsic_type == Runtime::INLINE &&
+ (name()->IsEqualTo(CStrVector("_ArgumentsLength")) ||
+ name()->IsEqualTo(CStrVector("_Arguments")))) {
+ return false;
+ }
const int count = arguments()->length();
for (int i = 0; i < count; ++i) {
if (!arguments()->at(i)->IsInlineable()) return false;
=======================================
--- /branches/3.2/src/bootstrapper.cc Mon Apr 4 01:25:31 2011
+++ /branches/3.2/src/bootstrapper.cc Thu Aug 11 09:03:21 2011
@@ -1526,8 +1526,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 =
@@ -1560,6 +1558,8 @@
call->shared()->set_length(1);
apply->shared()->set_length(2);
}
+
+ InstallBuiltinFunctionIds();
// Create a constructor for RegExp results (a variant of Array that
// predefines the two properties index and match).
=======================================
--- /branches/3.2/src/hydrogen.cc Fri Jun 10 04:33:25 2011
+++ /branches/3.2/src/hydrogen.cc Thu Aug 11 09:03:21 2011
@@ -3793,6 +3793,13 @@
if
(!environment()->Lookup(proxy->var())->CheckFlag(HValue::kIsArguments)) {
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) {
+ Bailout("arguments access in inlined function");
+ return true;
+ }
HInstruction* result = NULL;
if (expr->key()->IsPropertyName()) {
@@ -4315,11 +4322,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;
@@ -4328,8 +4342,12 @@
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) {
+ Bailout("Function.prototype.apply optimization in inlined function");
+ return true;
+ }
// Found pattern f.apply(receiver, arguments).
VisitForValue(prop->obj());
@@ -4340,10 +4358,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());
@@ -5274,6 +5289,10 @@
// Support for arguments.length and arguments[?].
void HGraphBuilder::GenerateArgumentsLength(CallRuntime* call) {
+ // Our implementation of arguments (based on this stack frame or an
+ // adapter below it) does not work for inlined functions. This runtime
+ // function is blacklisted by AstNode::IsInlineable.
+ ASSERT(function_state()->outer() == NULL);
ASSERT(call->arguments()->length() == 0);
HInstruction* elements = AddInstruction(new(zone()) HArgumentsElements);
HArgumentsLength* result = new(zone()) HArgumentsLength(elements);
@@ -5282,6 +5301,10 @@
void HGraphBuilder::GenerateArguments(CallRuntime* call) {
+ // Our implementation of arguments (based on this stack frame or an
+ // adapter below it) does not work for inlined functions. This runtime
+ // function is blacklisted by AstNode::IsInlineable.
+ ASSERT(function_state()->outer() == NULL);
ASSERT(call->arguments()->length() == 1);
VISIT_FOR_VALUE(call->arguments()->at(0));
HValue* index = Pop();
=======================================
--- /branches/3.2/src/hydrogen.h Fri Jun 10 04:33:25 2011
+++ /branches/3.2/src/hydrogen.h Thu Aug 11 09:03:21 2011
@@ -801,7 +801,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,
=======================================
--- /branches/3.2/src/objects.h Thu Aug 4 06:04:02 2011
+++ /branches/3.2/src/objects.h Thu Aug 11 09:03:21 2011
@@ -4032,6 +4032,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) \
=======================================
--- /branches/3.2/src/version.cc Thu Aug 11 02:08:33 2011
+++ /branches/3.2/src/version.cc Thu Aug 11 09:03:21 2011
@@ -35,7 +35,7 @@
#define MAJOR_VERSION 3
#define MINOR_VERSION 2
#define BUILD_NUMBER 10
-#define PATCH_LEVEL 35
+#define PATCH_LEVEL 36
// Use 1 for candidates and 0 otherwise.
// (Boolean macro values are not supported by all preprocessors.)
#define IS_CANDIDATE_VERSION 0
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
