AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

Fix detection of |handle_smi| case in HOptimizedGraphBuilder::HandlePolymorphicCallNamed

Browse Source 
BUG=chromium:196583

Review URL: https://codereview.chromium.org/12620014

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@13963 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
This commit is contained in:
jkummerow@chromium.org 2013-03-18 12:41:52 +00:00
parent ebcecd49af
commit e2cd7aa423
2 changed files with 53 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/hydrogen.cc
View File

@ -7405,8 +7405,8 @@ void HOptimizedGraphBuilder::HandlePolymorphicCallNamed(
i < types->length() && ordered_functions < kMaxCallPolymorphism; i < types->length() && ordered_functions < kMaxCallPolymorphism;
++i) { ++i) {
Handle<Map> map = types->at(i); Handle<Map> map = types->at(i);
if (map.is_identical_to(number_marker_map)) handle_smi = true;
if (expr->ComputeTarget(map, name)) { if (expr->ComputeTarget(map, name)) {
if (map.is_identical_to(number_marker_map)) handle_smi = true;
order[ordered_functions++] = order[ordered_functions++] =
FunctionSorter(i, FunctionSorter(i,
expr->target()->shared()->profiler_ticks(), expr->target()->shared()->profiler_ticks(),

52
test/mjsunit/regress/regress-crbug-196583.js Normal file
View File

@ -0,0 +1,52 @@
// Copyright 2013 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 a = 1;
a.__proto__.f = 1;
a.__proto__.f = function() { return 1; }
// Create some polymorphism.
function B() {}
B.prototype = {f: function() { return 2; }};
var b = new B();
function C() {}
C.prototype = {g: "foo", f: function() { return 3; }};
var c = new C();
function crash(obj) {
return obj.f();
}
for (var i = 0; i < 2; i++) {
crash(a);
crash(b);
crash(c);
}
%OptimizeFunctionOnNextCall(crash);
assertEquals(1, crash(a));