Revision: 19363
Author: [email protected]
Date: Thu Feb 13 16:55:38 2014 UTC
Log: Fix polymorphic inlining of accessors in a test-context.
[email protected]
Review URL: https://codereview.chromium.org/164003002
http://code.google.com/p/v8/source/detail?r=19363
Added:
/branches/bleeding_edge/test/mjsunit/regress/polymorphic-accessor-test-context.js
Modified:
/branches/bleeding_edge/src/hydrogen.cc
=======================================
--- /dev/null
+++
/branches/bleeding_edge/test/mjsunit/regress/polymorphic-accessor-test-context.js
Thu Feb 13 16:55:38 2014 UTC
@@ -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);
=======================================
--- /branches/bleeding_edge/src/hydrogen.cc Thu Feb 13 16:09:28 2014 UTC
+++ /branches/bleeding_edge/src/hydrogen.cc Thu Feb 13 16:55:38 2014 UTC
@@ -5791,9 +5791,13 @@
}
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);
+ }
}
--
--
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.
