Upgrade V8 to version 4.9.385.28
https://chromium.googlesource.com/v8/v8/+/4.9.385.28
FPIIM-449
Change-Id: I4b2e74289d4bf3667f2f3dc8aa2e541f63e26eb4
diff --git a/src/compiler/simplified-operator-reducer.cc b/src/compiler/simplified-operator-reducer.cc
index 9d45e5b..120d792 100644
--- a/src/compiler/simplified-operator-reducer.cc
+++ b/src/compiler/simplified-operator-reducer.cc
@@ -4,18 +4,18 @@
#include "src/compiler/simplified-operator-reducer.h"
-#include "src/compiler/access-builder.h"
#include "src/compiler/js-graph.h"
#include "src/compiler/machine-operator.h"
#include "src/compiler/node-matchers.h"
-#include "src/compiler/node-properties-inl.h"
+#include "src/compiler/operator-properties.h"
+#include "src/conversions-inl.h"
namespace v8 {
namespace internal {
namespace compiler {
SimplifiedOperatorReducer::SimplifiedOperatorReducer(JSGraph* jsgraph)
- : jsgraph_(jsgraph), simplified_(jsgraph->zone()) {}
+ : jsgraph_(jsgraph) {}
SimplifiedOperatorReducer::~SimplifiedOperatorReducer() {}
@@ -23,35 +23,25 @@
Reduction SimplifiedOperatorReducer::Reduce(Node* node) {
switch (node->opcode()) {
- case IrOpcode::kAnyToBoolean:
- return ReduceAnyToBoolean(node);
case IrOpcode::kBooleanNot: {
- HeapObjectMatcher<HeapObject> m(node->InputAt(0));
- if (m.Is(Unique<HeapObject>::CreateImmovable(factory()->false_value()))) {
- return Replace(jsgraph()->TrueConstant());
+ HeapObjectMatcher m(node->InputAt(0));
+ if (m.HasValue()) {
+ return Replace(jsgraph()->BooleanConstant(!m.Value()->BooleanValue()));
}
- if (m.Is(Unique<HeapObject>::CreateImmovable(factory()->true_value()))) {
- return Replace(jsgraph()->FalseConstant());
- }
- if (m.IsBooleanNot()) return Replace(m.node()->InputAt(0));
+ if (m.IsBooleanNot()) return Replace(m.InputAt(0));
break;
}
case IrOpcode::kChangeBitToBool: {
Int32Matcher m(node->InputAt(0));
if (m.Is(0)) return Replace(jsgraph()->FalseConstant());
if (m.Is(1)) return Replace(jsgraph()->TrueConstant());
- if (m.IsChangeBoolToBit()) return Replace(m.node()->InputAt(0));
+ if (m.IsChangeBoolToBit()) return Replace(m.InputAt(0));
break;
}
case IrOpcode::kChangeBoolToBit: {
- HeapObjectMatcher<HeapObject> m(node->InputAt(0));
- if (m.Is(Unique<HeapObject>::CreateImmovable(factory()->false_value()))) {
- return ReplaceInt32(0);
- }
- if (m.Is(Unique<HeapObject>::CreateImmovable(factory()->true_value()))) {
- return ReplaceInt32(1);
- }
- if (m.IsChangeBitToBool()) return Replace(m.node()->InputAt(0));
+ HeapObjectMatcher m(node->InputAt(0));
+ if (m.HasValue()) return ReplaceInt32(m.Value()->BooleanValue());
+ if (m.IsChangeBitToBool()) return Replace(m.InputAt(0));
break;
}
case IrOpcode::kChangeFloat64ToTagged: {
@@ -69,12 +59,10 @@
if (m.HasValue()) return ReplaceFloat64(m.Value());
if (m.IsChangeFloat64ToTagged()) return Replace(m.node()->InputAt(0));
if (m.IsChangeInt32ToTagged()) {
- return Change(node, machine()->ChangeInt32ToFloat64(),
- m.node()->InputAt(0));
+ return Change(node, machine()->ChangeInt32ToFloat64(), m.InputAt(0));
}
if (m.IsChangeUint32ToTagged()) {
- return Change(node, machine()->ChangeUint32ToFloat64(),
- m.node()->InputAt(0));
+ return Change(node, machine()->ChangeUint32ToFloat64(), m.InputAt(0));
}
break;
}
@@ -82,20 +70,18 @@
NumberMatcher m(node->InputAt(0));
if (m.HasValue()) return ReplaceInt32(DoubleToInt32(m.Value()));
if (m.IsChangeFloat64ToTagged()) {
- return Change(node, machine()->ChangeFloat64ToInt32(),
- m.node()->InputAt(0));
+ return Change(node, machine()->ChangeFloat64ToInt32(), m.InputAt(0));
}
- if (m.IsChangeInt32ToTagged()) return Replace(m.node()->InputAt(0));
+ if (m.IsChangeInt32ToTagged()) return Replace(m.InputAt(0));
break;
}
case IrOpcode::kChangeTaggedToUint32: {
NumberMatcher m(node->InputAt(0));
if (m.HasValue()) return ReplaceUint32(DoubleToUint32(m.Value()));
if (m.IsChangeFloat64ToTagged()) {
- return Change(node, machine()->ChangeFloat64ToUint32(),
- m.node()->InputAt(0));
+ return Change(node, machine()->ChangeFloat64ToUint32(), m.InputAt(0));
}
- if (m.IsChangeUint32ToTagged()) return Replace(m.node()->InputAt(0));
+ if (m.IsChangeUint32ToTagged()) return Replace(m.InputAt(0));
break;
}
case IrOpcode::kChangeUint32ToTagged: {
@@ -103,6 +89,8 @@
if (m.HasValue()) return ReplaceNumber(FastUI2D(m.Value()));
break;
}
+ case IrOpcode::kReferenceEqual:
+ return ReduceReferenceEqual(node);
default:
break;
}
@@ -110,27 +98,18 @@
}
-Reduction SimplifiedOperatorReducer::ReduceAnyToBoolean(Node* node) {
- Node* const input = NodeProperties::GetValueInput(node, 0);
- Type* const input_type = NodeProperties::GetBounds(input).upper;
- if (input_type->Is(Type::Boolean())) {
- // AnyToBoolean(x:boolean) => x
- return Replace(input);
- }
- if (input_type->Is(Type::OrderedNumber())) {
- // AnyToBoolean(x:ordered-number) => BooleanNot(NumberEqual(x, #0))
- Node* compare = graph()->NewNode(simplified()->NumberEqual(), input,
- jsgraph()->ZeroConstant());
- return Change(node, simplified()->BooleanNot(), compare);
- }
- if (input_type->Is(Type::String())) {
- // AnyToBoolean(x:string) => BooleanNot(NumberEqual(x.length, #0))
- FieldAccess const access = AccessBuilder::ForStringLength();
- Node* length = graph()->NewNode(simplified()->LoadField(access), input,
- graph()->start(), graph()->start());
- Node* compare = graph()->NewNode(simplified()->NumberEqual(), length,
- jsgraph()->ZeroConstant());
- return Change(node, simplified()->BooleanNot(), compare);
+Reduction SimplifiedOperatorReducer::ReduceReferenceEqual(Node* node) {
+ DCHECK_EQ(IrOpcode::kReferenceEqual, node->opcode());
+ Node* const left = NodeProperties::GetValueInput(node, 0);
+ Node* const right = NodeProperties::GetValueInput(node, 1);
+ HeapObjectMatcher match_left(left);
+ HeapObjectMatcher match_right(right);
+ if (match_left.HasValue() && match_right.HasValue()) {
+ if (match_left.Value().is_identical_to(match_right.Value())) {
+ return Replace(jsgraph()->TrueConstant());
+ } else {
+ return Replace(jsgraph()->FalseConstant());
+ }
}
return NoChange();
}
@@ -140,8 +119,8 @@
Node* a) {
DCHECK_EQ(node->InputCount(), OperatorProperties::GetTotalInputCount(op));
DCHECK_LE(1, node->InputCount());
- node->set_op(op);
node->ReplaceInput(0, a);
+ NodeProperties::ChangeOp(node, op);
return Changed(node);
}
@@ -169,16 +148,6 @@
Graph* SimplifiedOperatorReducer::graph() const { return jsgraph()->graph(); }
-Factory* SimplifiedOperatorReducer::factory() const {
- return jsgraph()->isolate()->factory();
-}
-
-
-CommonOperatorBuilder* SimplifiedOperatorReducer::common() const {
- return jsgraph()->common();
-}
-
-
MachineOperatorBuilder* SimplifiedOperatorReducer::machine() const {
return jsgraph()->machine();
}