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

[turbofan] Work-around stack overflow in zlib.

Browse Source 
TBR=dcarney@chromium.org

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

Cr-Commit-Position: refs/heads/master@{#24926}
git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@24926 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
This commit is contained in:
bmeurer@chromium.org 2014-10-28 09:54:00 +00:00
parent efc01f4736
commit ef1ca7a2ed
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/compiler/js-typed-lowering.cc
View File

@ -556,15 +556,25 @@ Reduction JSTypedLowering::ReduceJSToBooleanInput(Node* input) {
Node* inv = graph()->NewNode(simplified()->BooleanNot(), cmp); Node* inv = graph()->NewNode(simplified()->BooleanNot(), cmp);
return ReplaceWith(inv); return ReplaceWith(inv);
} }
if (input->opcode() == IrOpcode::kPhi && input_type->Is(Type::Primitive())) { // TODO(turbofan): We need some kinda of PrimitiveToBoolean simplified
// JSToBoolean(phi(x1,...,xn):primitive) // operator, then we can do the pushing in the SimplifiedOperatorReducer
// and do not need to protect against stack overflow (because of backedges
// in phis) below.
if (input->opcode() == IrOpcode::kPhi &&
input_type->Is(
Type::Union(Type::Boolean(), Type::OrderedNumber(), zone()))) {
// JSToBoolean(phi(x1,...,xn):ordered-number|boolean)
// => phi(JSToBoolean(x1),...,JSToBoolean(xn)) // => phi(JSToBoolean(x1),...,JSToBoolean(xn))
int input_count = input->InputCount() - 1; int input_count = input->InputCount() - 1;
Node** inputs = zone()->NewArray<Node*>(input_count + 1); Node** inputs = zone()->NewArray<Node*>(input_count + 1);
for (int i = 0; i < input_count; ++i) { for (int i = 0; i < input_count; ++i) {
Node* value = input->InputAt(i); Node* value = input->InputAt(i);
Type* value_type = NodeProperties::GetBounds(value).upper;
// Recursively try to reduce the value first. // Recursively try to reduce the value first.
Reduction result = ReduceJSToBooleanInput(value); Reduction result = (value_type->Is(Type::Boolean()) ||
value_type->Is(Type::OrderedNumber()))
? ReduceJSToBooleanInput(value)
: NoChange();
if (result.Changed()) { if (result.Changed()) {
inputs[i] = result.replacement(); inputs[i] = result.replacement();
} else { } else {