Reviewers: titzer,
Description:
Fix handling of potential string additions in hydrogen.
[email protected]
TEST=mjsunit/regress/regress-3476
BUG=v8:3476
Please review this at https://codereview.chromium.org/423083004/
SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge
Affected files (+27, -1 lines):
M src/hydrogen.cc
A test/mjsunit/regress/regress-3476.js
Index: src/hydrogen.cc
diff --git a/src/hydrogen.cc b/src/hydrogen.cc
index
fe8e134d97308dd6aac417806e9317725b48cde9..e85e16a6386b28f93ff661421cd8786ed8eb2608
100644
--- a/src/hydrogen.cc
+++ b/src/hydrogen.cc
@@ -10240,7 +10240,9 @@ HValue* HGraphBuilder::BuildBinaryOperation(
bool maybe_string_add = op == Token::ADD &&
(left_type->Maybe(Type::String()) ||
- right_type->Maybe(Type::String()));
+ left_type->Maybe(Type::Receiver()) ||
+ right_type->Maybe(Type::String()) ||
+ right_type->Maybe(Type::Receiver()));
if (left_type->Is(Type::None())) {
Add<HDeoptimize>("Insufficient type feedback for LHS of binary
operation",
Index: test/mjsunit/regress/regress-3476.js
diff --git a/test/mjsunit/regress/regress-3476.js
b/test/mjsunit/regress/regress-3476.js
new file mode 100644
index
0000000000000000000000000000000000000000..f4333dbbfc0702085b4d36c493c8b6dcc0a481db
--- /dev/null
+++ b/test/mjsunit/regress/regress-3476.js
@@ -0,0 +1,24 @@
+// Copyright 2014 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Flags: --allow-natives-syntax
+
+function MyWrapper(v) {
+ return { valueOf: function() { return v } };
+}
+
+function f() {
+ assertEquals("truex", true + "x");
+ assertEquals("truey", true + new String("y"));
+ assertEquals("truez", true + new MyWrapper("z"));
+
+ assertEquals("xtrue", "x" + true);
+ assertEquals("ytrue", new String("y") + true);
+ assertEquals("ztrue", new MyWrapper("z") + true);
+}
+
+f();
+f();
+%OptimizeFunctionOnNextCall(f);
+f();
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
