Fix bug in HPhi::SimplifyConstantInput
R=jkummerow@chromium.org BUG=269679 Review URL: https://codereview.chromium.org/23075003 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@16174 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
This commit is contained in:
parent
b9d8275ba0
commit
415b61e12e
@ -3731,10 +3731,10 @@ void HPhi::SimplifyConstantInputs() {
|
|||||||
DoubleToInt32(operand->DoubleValue()));
|
DoubleToInt32(operand->DoubleValue()));
|
||||||
integer_input->InsertAfter(operand);
|
integer_input->InsertAfter(operand);
|
||||||
SetOperandAt(i, integer_input);
|
SetOperandAt(i, integer_input);
|
||||||
} else if (operand == graph->GetConstantTrue()) {
|
} else if (operand->HasBooleanValue()) {
|
||||||
SetOperandAt(i, graph->GetConstant1());
|
SetOperandAt(i, operand->BooleanValue() ? graph->GetConstant1()
|
||||||
} else {
|
: graph->GetConstant0());
|
||||||
// This catches |false|, |undefined|, strings and objects.
|
} else if (operand->ImmortalImmovable()) {
|
||||||
SetOperandAt(i, graph->GetConstant0());
|
SetOperandAt(i, graph->GetConstant0());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -3362,6 +3362,7 @@ class HConstant: public HTemplateInstruction<0> {
|
|||||||
return external_reference_value_;
|
return external_reference_value_;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool HasBooleanValue() const { return type_.IsBoolean(); }
|
||||||
bool BooleanValue() const { return boolean_value_; }
|
bool BooleanValue() const { return boolean_value_; }
|
||||||
|
|
||||||
virtual intptr_t Hashcode() {
|
virtual intptr_t Hashcode() {
|
||||||
|
89
test/mjsunit/regress/regress-phi-truncation.js
Normal file
89
test/mjsunit/regress/regress-phi-truncation.js
Normal file
@ -0,0 +1,89 @@
|
|||||||
|
// 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
|
||||||
|
|
||||||
|
function test(fun, expectation) {
|
||||||
|
assertEquals(1, fun(1));
|
||||||
|
%OptimizeFunctionOnNextCall(fun);
|
||||||
|
assertEquals(expectation, fun(0));
|
||||||
|
}
|
||||||
|
|
||||||
|
test(function(x) {
|
||||||
|
var a = x ? true : false;
|
||||||
|
return a | 0;
|
||||||
|
}, 0);
|
||||||
|
|
||||||
|
test(function(x) {
|
||||||
|
var a = x ? true : true;
|
||||||
|
return a | 0;
|
||||||
|
}, 1);
|
||||||
|
|
||||||
|
test(function(x) {
|
||||||
|
var a = x ? true : "0";
|
||||||
|
return a | 0;
|
||||||
|
}, 0);
|
||||||
|
|
||||||
|
test(function(x) {
|
||||||
|
var a = x ? true : "1";
|
||||||
|
return a | 0;
|
||||||
|
}, 1);
|
||||||
|
|
||||||
|
test(function(x) {
|
||||||
|
var a = x ? true : "-1";
|
||||||
|
return a | 0;
|
||||||
|
}, -1);
|
||||||
|
|
||||||
|
test(function(x) {
|
||||||
|
var a = x ? true : "-0";
|
||||||
|
return a | 0;
|
||||||
|
}, 0);
|
||||||
|
|
||||||
|
test(function(x) {
|
||||||
|
var a = x ? true : "0x1234";
|
||||||
|
return a | 0;
|
||||||
|
}, 0x1234);
|
||||||
|
|
||||||
|
test(function(x) {
|
||||||
|
var a = x ? true : { valueOf: function() { return 2; } };
|
||||||
|
return a | 0;
|
||||||
|
}, 2);
|
||||||
|
|
||||||
|
test(function(x) {
|
||||||
|
var a = x ? true : undefined;
|
||||||
|
return a | 0;
|
||||||
|
}, 0);
|
||||||
|
|
||||||
|
test(function(x) {
|
||||||
|
var a = x ? true : null;
|
||||||
|
return a | 0;
|
||||||
|
}, 0);
|
||||||
|
|
||||||
|
test(function(x) {
|
||||||
|
var a = x ? true : "";
|
||||||
|
return a | 0;
|
||||||
|
}, 0);
|
Loading…
Reference in New Issue
Block a user