Reviewers: Igor Sheludko,
Message:
PTAL
Description:
Fix polymorphic inlining of accessors in a test-context.
Please review this at https://codereview.chromium.org/164003002/
SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge
Affected files (+32, -3 lines):
M src/hydrogen.cc
A test/mjsunit/regress/polymorphic-accessor-test-context.js
Index: src/hydrogen.cc
diff --git a/src/hydrogen.cc b/src/hydrogen.cc
index
e59048a0b56c342ed4fe0bb72d819685e24cff85..51e77069b223461ca2533760c79011fdbd13e7fc
100644
--- a/src/hydrogen.cc
+++ b/src/hydrogen.cc
@@ -5791,9 +5791,13 @@ void
HOptimizedGraphBuilder::HandlePolymorphicNamedFieldAccess(
}
ASSERT(join != NULL);
- join->SetJoinId(ast_id);
- set_current_block(join);
- if (!ast_context()->IsEffect()) ast_context()->ReturnValue(Pop());
+ if (join->HasPredecessor()) {
+ join->SetJoinId(ast_id);
+ set_current_block(join);
+ if (!ast_context()->IsEffect()) ast_context()->ReturnValue(Pop());
+ } else {
+ set_current_block(NULL);
+ }
}
Index: test/mjsunit/regress/polymorphic-accessor-test-context.js
diff --git a/test/mjsunit/regress/polymorphic-accessor-test-context.js
b/test/mjsunit/regress/polymorphic-accessor-test-context.js
new file mode 100644
index
0000000000000000000000000000000000000000..6188279248d6bf68fdc438501f52aa5d1281ff87
--- /dev/null
+++ b/test/mjsunit/regress/polymorphic-accessor-test-context.js
@@ -0,0 +1,25 @@
+// 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 t1() { return this instanceof t1; }
+function t2() { return this instanceof t2; }
+
+var o1 = new (function() { })();
+Object.defineProperty(o1, "t", {get:function() { return this instanceof
o1.constructor; }});
+var o2 = new (function() { })();
+Object.defineProperty(o2, "t", {get:function() { return this instanceof
o1.constructor; }});
+var o3 = new (function() { })();
+o3.t = true;
+
+function f(o) {
+ return 1 + (o.t ? 1 : 2);
+}
+
+f(o1);
+f(o1);
+f(o2);
+%OptimizeFunctionOnNextCall(f);
+f(o3);
--
--
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/groups/opt_out.
