Skip to content

V
V8
Commit 63198ef5 authored by Santiago Aboy Solanes's avatar Santiago Aboy Solanes Committed by Commit Bot
Browse files
Options

[compiler] Template methods in SimplifiedLowering pt. 4 

This is a CL in a string of CLs that template SimplifiedLowering.
It is done with the purpose of decoupling the implementation in the
three phases that SimplifiedLowering has (Propagate, Retype, Lower).

Template lower(), retype() and propagate(). Remove phase_ since it is
not needed anymore.

Template methods that used the old version of lower() and similar:
 * EnqueueInput
 * SetOutput
 * ProcessInput
 * VisitLeaf
 * VisitSelect
 * VisitPhi
 * VisitStateValues
 * VisitFrameState
 * VisitObjectState

Bug: v8:10424
Change-Id: Ic7c22104a77892303d825ad2d75e0eda56cca754
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2135638
Commit-Queue: Santiago Aboy Solanes <solanes@chromium.org>
Reviewed-by: 's avatarGeorg Neis <neis@chromium.org>
Reviewed-by: 's avatarNico Hartmann <nicohartmann@chromium.org>
Cr-Commit-Position: refs/heads/master@{#67402}
parent 3b0fdbd3
Hide whitespace changes
Inline Side-by-side
Showing with 271 additions and 335 deletions
src/compiler/simplified-lowering.cc
View file @ 63198ef5
...@@ -291,7 +291,6 @@ class RepresentationSelector { ...@@ -291,7 +291,6 @@ class RepresentationSelector {
#endif #endif
nodes_(zone), nodes_(zone),
replacements_(zone), replacements_(zone),
phase_(PROPAGATE),
changer_(changer), changer_(changer),
queue_(zone), queue_(zone),
typing_stack_(zone), typing_stack_(zone),
...@@ -306,7 +305,6 @@ class RepresentationSelector { ...@@ -306,7 +305,6 @@ class RepresentationSelector {
void RunTypePropagationPhase() { void RunTypePropagationPhase() {
// Run type propagation. // Run type propagation.
TRACE("--{Type propagation phase}--\n"); TRACE("--{Type propagation phase}--\n");
phase_ = RETYPE;
ResetNodeInfoState(); ResetNodeInfoState();
DCHECK(typing_stack_.empty()); DCHECK(typing_stack_.empty());
...@@ -595,7 +593,6 @@ class RepresentationSelector { ...@@ -595,7 +593,6 @@ class RepresentationSelector {
void RunTruncationPropagationPhase() { void RunTruncationPropagationPhase() {
// Run propagation phase to a fixpoint. // Run propagation phase to a fixpoint.
TRACE("--{Propagation phase}--\n"); TRACE("--{Propagation phase}--\n");
phase_ = PROPAGATE;
EnqueueInitial(jsgraph_->graph()->end()); EnqueueInitial(jsgraph_->graph()->end());
// Process nodes from the queue until it is empty. // Process nodes from the queue until it is empty.
while (!queue_.empty()) { while (!queue_.empty()) {
...@@ -616,7 +613,6 @@ class RepresentationSelector { ...@@ -616,7 +613,6 @@ class RepresentationSelector {
// Run lowering and change insertion phase. // Run lowering and change insertion phase.
TRACE("--{Simplified lowering phase}--\n"); TRACE("--{Simplified lowering phase}--\n");
phase_ = LOWER;
// Process nodes from the collected {nodes_} vector. // Process nodes from the collected {nodes_} vector.
for (NodeVector::iterator i = nodes_.begin(); i != nodes_.end(); ++i) { for (NodeVector::iterator i = nodes_.begin(); i != nodes_.end(); ++i) {
Node* node = *i; Node* node = *i;
...@@ -656,78 +652,29 @@ class RepresentationSelector { ...@@ -656,78 +652,29 @@ class RepresentationSelector {
template <Phase T> template <Phase T>
void EnqueueInput(Node* use_node, int index, void EnqueueInput(Node* use_node, int index,
UseInfo use_info = UseInfo::None()) { UseInfo use_info = UseInfo::None()) {
// TODO(solanes): replace the equalities below with methods once retype() static_assert(retype<T>() || lower<T>(),
// and lower() have been templated.
static_assert(T == RETYPE || T == LOWER,
"This version of ProcessRemainingInputs has to be called in " "This version of ProcessRemainingInputs has to be called in "
"the Retype or Lower phase."); "the Retype or Lower phase.");
} }
void EnqueueInput(Node* use_node, int index, template <Phase T>
UseInfo use_info = UseInfo::None()) { static constexpr bool propagate() {
if (phase_ != PROPAGATE) return; return T == PROPAGATE;
Node* node = use_node->InputAt(index);
NodeInfo* info = GetInfo(node);
#ifdef DEBUG
// Check monotonicity of input requirements.
node_input_use_infos_[use_node->id()].SetAndCheckInput(use_node, index,
use_info);
#endif // DEBUG
if (info->unvisited()) {
// First visit of this node.
info->set_queued();
nodes_.push_back(node);
queue_.push(node);
TRACE(" initial #%i: ", node->id());
info->AddUse(use_info);
PrintTruncation(info->truncation());
return;
}
TRACE(" queue #%i?: ", node->id());
PrintTruncation(info->truncation());
if (info->AddUse(use_info)) {
// New usage information for the node is available.
if (!info->queued()) {
queue_.push(node);
info->set_queued();
TRACE(" added: ");
} else {
TRACE(" inqueue: ");
}
PrintTruncation(info->truncation());
}
} }
// TODO(solanes): These could later be replaced with "return std::is_same<T, template <Phase T>
// LOWER>::value;" or similar. static constexpr bool retype() {
bool lower() const { return phase_ == LOWER; } return T == RETYPE;
bool retype() const { return phase_ == RETYPE; } }
bool propagate() const { return phase_ == PROPAGATE; }
template <Phase T> template <Phase T>
void SetOutput(Node* node, MachineRepresentation representation, static constexpr bool lower() {
Type restriction_type = Type::Any()); return T == LOWER;
}
// TODO(solanes): Remove when all uses are templated. template <Phase T>
void SetOutput(Node* node, MachineRepresentation representation, void SetOutput(Node* node, MachineRepresentation representation,
Type restriction_type = Type::Any()) { Type restriction_type = Type::Any());
NodeInfo* const info = GetInfo(node);
switch (phase_) {
case PROPAGATE:
info->set_restriction_type(restriction_type);
break;
case RETYPE:
DCHECK(info->restriction_type().Is(restriction_type));
DCHECK(restriction_type.Is(info->restriction_type()));
info->set_output(representation);
break;
case LOWER:
DCHECK_EQ(info->representation(), representation);
DCHECK(info->restriction_type().Is(restriction_type));
DCHECK(restriction_type.Is(info->restriction_type()));
break;
}
}
Type GetUpperBound(Node* node) { return NodeProperties::GetType(node); } Type GetUpperBound(Node* node) { return NodeProperties::GetType(node); }
...@@ -860,15 +807,10 @@ class RepresentationSelector { ...@@ -860,15 +807,10 @@ class RepresentationSelector {
template <Phase T> template <Phase T>
void ProcessInput(Node* node, int index, UseInfo use); void ProcessInput(Node* node, int index, UseInfo use);
// TODO(solanes): Remove when all uses are templated.
void ProcessInput(Node* node, int index, UseInfo use);
// Just assert for Retype and Lower. Propagate specialized below. // Just assert for Retype and Lower. Propagate specialized below.
template <Phase T> template <Phase T>
void ProcessRemainingInputs(Node* node, int index) { void ProcessRemainingInputs(Node* node, int index) {
// TODO(solanes): replace the equalities below with methods once retype() static_assert(retype<T>() || lower<T>(),
// and lower() have been templated.
static_assert(T == RETYPE || T == LOWER,
"This version of ProcessRemainingInputs has to be called in " "This version of ProcessRemainingInputs has to be called in "
"the Retype or Lower phase."); "the Retype or Lower phase.");
DCHECK_GE(index, NodeProperties::PastValueIndex(node)); DCHECK_GE(index, NodeProperties::PastValueIndex(node));
...@@ -878,27 +820,26 @@ class RepresentationSelector { ...@@ -878,27 +820,26 @@ class RepresentationSelector {
// Just assert for Retype. Propagate and Lower specialized below. // Just assert for Retype. Propagate and Lower specialized below.
template <Phase T> template <Phase T>
void VisitInputs(Node* node) { void VisitInputs(Node* node) {
// TODO(solanes): replace the equality below with methods once retype() has
// been templated.
static_assert( static_assert(
T == RETYPE, retype<T>(),
"This version of VisitInputs has to be called in the Retype phase."); "This version of VisitInputs has to be called in the Retype phase.");
} }
template <Phase T>
void VisitReturn(Node* node) { void VisitReturn(Node* node) {
int tagged_limit = node->op()->ValueInputCount() + int tagged_limit = node->op()->ValueInputCount() +
OperatorProperties::GetContextInputCount(node->op()) + OperatorProperties::GetContextInputCount(node->op()) +
OperatorProperties::GetFrameStateInputCount(node->op()); OperatorProperties::GetFrameStateInputCount(node->op());
// Visit integer slot count to pop // Visit integer slot count to pop
ProcessInput(node, 0, UseInfo::TruncatingWord32()); ProcessInput<T>(node, 0, UseInfo::TruncatingWord32());
// Visit value, context and frame state inputs as tagged. // Visit value, context and frame state inputs as tagged.
for (int i = 1; i < tagged_limit; i++) { for (int i = 1; i < tagged_limit; i++) {
ProcessInput(node, i, UseInfo::AnyTagged()); ProcessInput<T>(node, i, UseInfo::AnyTagged());
} }
// Only enqueue other inputs (effects, control). // Only enqueue other inputs (effects, control).
for (int i = tagged_limit; i < node->InputCount(); i++) { for (int i = tagged_limit; i < node->InputCount(); i++) {
EnqueueInput(node, i); EnqueueInput<T>(node, i);
} }
} }
...@@ -912,7 +853,7 @@ class RepresentationSelector { ...@@ -912,7 +853,7 @@ class RepresentationSelector {
ProcessInput<T>(node, i, UseInfo::None()); ProcessInput<T>(node, i, UseInfo::None());
} }
ProcessRemainingInputs<T>(node, value_count); ProcessRemainingInputs<T>(node, value_count);
if (lower()) Kill(node); if (lower<T>()) Kill(node);
} }
// Helper for no-op node. // Helper for no-op node.
...@@ -922,7 +863,7 @@ class RepresentationSelector { ...@@ -922,7 +863,7 @@ class RepresentationSelector {
MachineRepresentation representation = MachineRepresentation representation =
GetOutputInfoForPhi(node, TypeOf(node), truncation); GetOutputInfoForPhi(node, TypeOf(node), truncation);
VisitUnop<T>(node, UseInfo(representation, truncation), representation); VisitUnop<T>(node, UseInfo(representation, truncation), representation);
if (lower()) DeferReplacement(node, node->InputAt(0)); if (lower<T>()) DeferReplacement(node, node->InputAt(0));
} }
// Helper for binops of the R x L -> O variety. // Helper for binops of the R x L -> O variety.
...@@ -969,9 +910,10 @@ class RepresentationSelector { ...@@ -969,9 +910,10 @@ class RepresentationSelector {
} }
// Helper for leaf nodes. // Helper for leaf nodes.
template <Phase T>
void VisitLeaf(Node* node, MachineRepresentation output) { void VisitLeaf(Node* node, MachineRepresentation output) {
DCHECK_EQ(0, node->InputCount()); DCHECK_EQ(0, node->InputCount());
SetOutput(node, output); SetOutput<T>(node, output);
} }
// Helpers for specific types of binops. // Helpers for specific types of binops.
...@@ -1028,16 +970,17 @@ class RepresentationSelector { ...@@ -1028,16 +970,17 @@ class RepresentationSelector {
} }
// Helper for handling selects. // Helper for handling selects.
template <Phase T>
void VisitSelect(Node* node, Truncation truncation, void VisitSelect(Node* node, Truncation truncation,
SimplifiedLowering* lowering) { SimplifiedLowering* lowering) {
DCHECK(TypeOf(node->InputAt(0)).Is(Type::Boolean())); DCHECK(TypeOf(node->InputAt(0)).Is(Type::Boolean()));
ProcessInput(node, 0, UseInfo::Bool()); ProcessInput<T>(node, 0, UseInfo::Bool());
MachineRepresentation output = MachineRepresentation output =
GetOutputInfoForPhi(node, TypeOf(node), truncation); GetOutputInfoForPhi(node, TypeOf(node), truncation);
SetOutput(node, output); SetOutput<T>(node, output);
if (lower()) { if (lower<T>()) {
// Update the select operator. // Update the select operator.
SelectParameters p = SelectParametersOf(node->op()); SelectParameters p = SelectParametersOf(node->op());
if (output != p.representation()) { if (output != p.representation()) {
...@@ -1048,21 +991,22 @@ class RepresentationSelector { ...@@ -1048,21 +991,22 @@ class RepresentationSelector {
// Convert inputs to the output representation of this phi, pass the // Convert inputs to the output representation of this phi, pass the
// truncation truncation along. // truncation truncation along.
UseInfo input_use(output, truncation); UseInfo input_use(output, truncation);
ProcessInput(node, 1, input_use); ProcessInput<T>(node, 1, input_use);
ProcessInput(node, 2, input_use); ProcessInput<T>(node, 2, input_use);
} }
// Helper for handling phis. // Helper for handling phis.
template <Phase T>
void VisitPhi(Node* node, Truncation truncation, void VisitPhi(Node* node, Truncation truncation,
SimplifiedLowering* lowering) { SimplifiedLowering* lowering) {
MachineRepresentation output = MachineRepresentation output =
GetOutputInfoForPhi(node, TypeOf(node), truncation); GetOutputInfoForPhi(node, TypeOf(node), truncation);
// Only set the output representation if not running with type // Only set the output representation if not running with type
// feedback. (Feedback typing will set the representation.) // feedback. (Feedback typing will set the representation.)
SetOutput(node, output); SetOutput<T>(node, output);
int values = node->op()->ValueInputCount(); int values = node->op()->ValueInputCount();
if (lower()) { if (lower<T>()) {
// Update the phi operator. // Update the phi operator.
if (output != PhiRepresentationOf(node->op())) { if (output != PhiRepresentationOf(node->op())) {
NodeProperties::ChangeOp(node, lowering->common()->Phi(output, values)); NodeProperties::ChangeOp(node, lowering->common()->Phi(output, values));
...@@ -1073,7 +1017,7 @@ class RepresentationSelector { ...@@ -1073,7 +1017,7 @@ class RepresentationSelector {
// truncation along. // truncation along.
UseInfo input_use(output, truncation); UseInfo input_use(output, truncation);
for (int i = 0; i < node->InputCount(); i++) { for (int i = 0; i < node->InputCount(); i++) {
ProcessInput(node, i, i < values ? input_use : UseInfo::None()); ProcessInput<T>(node, i, i < values ? input_use : UseInfo::None());
} }
} }
...@@ -1082,12 +1026,12 @@ class RepresentationSelector { ...@@ -1082,12 +1026,12 @@ class RepresentationSelector {
Type const input_type = TypeOf(node->InputAt(0)); Type const input_type = TypeOf(node->InputAt(0));
if (input_type.Is(type)) { if (input_type.Is(type)) {
VisitUnop<T>(node, UseInfo::None(), MachineRepresentation::kBit); VisitUnop<T>(node, UseInfo::None(), MachineRepresentation::kBit);
if (lower()) { if (lower<T>()) {
DeferReplacement(node, lowering->jsgraph()->Int32Constant(1)); DeferReplacement(node, lowering->jsgraph()->Int32Constant(1));
} }
} else { } else {
VisitUnop<T>(node, UseInfo::AnyTagged(), MachineRepresentation::kBit); VisitUnop<T>(node, UseInfo::AnyTagged(), MachineRepresentation::kBit);
if (lower() && !input_type.Maybe(type)) { if (lower<T>() && !input_type.Maybe(type)) {
DeferReplacement(node, lowering->jsgraph()->Int32Constant(0)); DeferReplacement(node, lowering->jsgraph()->Int32Constant(0));
} }
} }
...@@ -1098,7 +1042,7 @@ class RepresentationSelector { ...@@ -1098,7 +1042,7 @@ class RepresentationSelector {
if (InputIs(node, type)) { if (InputIs(node, type)) {
VisitUnop<T>(node, UseInfo::AnyTagged(), VisitUnop<T>(node, UseInfo::AnyTagged(),
MachineRepresentation::kTaggedPointer); MachineRepresentation::kTaggedPointer);
if (lower()) DeferReplacement(node, node->InputAt(0)); if (lower<T>()) DeferReplacement(node, node->InputAt(0));
} else { } else {
VisitUnop<T>(node, VisitUnop<T>(node,
UseInfo::CheckedHeapObjectAsTaggedPointer(FeedbackSource()), UseInfo::CheckedHeapObjectAsTaggedPointer(FeedbackSource()),
...@@ -1178,8 +1122,9 @@ class RepresentationSelector { ...@@ -1178,8 +1122,9 @@ class RepresentationSelector {
return machine_type; return machine_type;
} }
template <Phase T>
void VisitStateValues(Node* node) { void VisitStateValues(Node* node) {
if (propagate()) { if (propagate<T>()) {
for (int i = 0; i < node->InputCount(); i++) { for (int i = 0; i < node->InputCount(); i++) {
// When lowering 64 bit BigInts to Word64 representation, we have to // When lowering 64 bit BigInts to Word64 representation, we have to
// make sure they are rematerialized before deoptimization. By // make sure they are rematerialized before deoptimization. By
...@@ -1188,12 +1133,12 @@ class RepresentationSelector { ...@@ -1188,12 +1133,12 @@ class RepresentationSelector {
// TODO(nicohartmann): Remove, once the deoptimizer can rematerialize // TODO(nicohartmann): Remove, once the deoptimizer can rematerialize
// truncated BigInts. // truncated BigInts.
if (TypeOf(node->InputAt(i)).Is(Type::BigInt())) { if (TypeOf(node->InputAt(i)).Is(Type::BigInt())) {
EnqueueInput(node, i, UseInfo::AnyTagged()); EnqueueInput<T>(node, i, UseInfo::AnyTagged());
} else { } else {
EnqueueInput(node, i, UseInfo::Any()); EnqueueInput<T>(node, i, UseInfo::Any());
} }
} }
} else if (lower()) { } else if (lower<T>()) {
Zone* zone = jsgraph_->zone(); Zone* zone = jsgraph_->zone();
ZoneVector<MachineType>* types = ZoneVector<MachineType>* types =
new (zone->New(sizeof(ZoneVector<MachineType>))) new (zone->New(sizeof(ZoneVector<MachineType>)))
...@@ -1213,29 +1158,30 @@ class RepresentationSelector { ...@@ -1213,29 +1158,30 @@ class RepresentationSelector {
NodeProperties::ChangeOp( NodeProperties::ChangeOp(
node, jsgraph_->common()->TypedStateValues(types, mask)); node, jsgraph_->common()->TypedStateValues(types, mask));
} }
SetOutput(node, MachineRepresentation::kTagged); SetOutput<T>(node, MachineRepresentation::kTagged);
} }
template <Phase T>
void VisitFrameState(Node* node) { void VisitFrameState(Node* node) {
DCHECK_EQ(5, node->op()->ValueInputCount()); DCHECK_EQ(5, node->op()->ValueInputCount());
DCHECK_EQ(1, OperatorProperties::GetFrameStateInputCount(node->op())); DCHECK_EQ(1, OperatorProperties::GetFrameStateInputCount(node->op()));
ProcessInput(node, 0, UseInfo::AnyTagged()); // Parameters. ProcessInput<T>(node, 0, UseInfo::AnyTagged()); // Parameters.
ProcessInput(node, 1, UseInfo::AnyTagged()); // Registers. ProcessInput<T>(node, 1, UseInfo::AnyTagged()); // Registers.
// Accumulator is a special flower - we need to remember its type in // Accumulator is a special flower - we need to remember its type in
// a singleton typed-state-values node (as if it was a singleton // a singleton typed-state-values node (as if it was a singleton
// state-values node). // state-values node).
Node* accumulator = node->InputAt(2); Node* accumulator = node->InputAt(2);
if (propagate()) { if (propagate<T>()) {
// TODO(nicohartmann): Remove, once the deoptimizer can rematerialize // TODO(nicohartmann): Remove, once the deoptimizer can rematerialize
// truncated BigInts. // truncated BigInts.
if (TypeOf(accumulator).Is(Type::BigInt())) { if (TypeOf(accumulator).Is(Type::BigInt())) {
EnqueueInput(node, 2, UseInfo::AnyTagged()); EnqueueInput<T>(node, 2, UseInfo::AnyTagged());
} else { } else {
EnqueueInput(node, 2, UseInfo::Any()); EnqueueInput<T>(node, 2, UseInfo::Any());
} }
} else if (lower()) { } else if (lower<T>()) {
// TODO(nicohartmann): Remove, once the deoptimizer can rematerialize // TODO(nicohartmann): Remove, once the deoptimizer can rematerialize
// truncated BigInts. // truncated BigInts.
if (TypeOf(accumulator).Is(Type::BigInt())) { if (TypeOf(accumulator).Is(Type::BigInt())) {
...@@ -1258,24 +1204,25 @@ class RepresentationSelector { ...@@ -1258,24 +1204,25 @@ class RepresentationSelector {
} }
} }
ProcessInput(node, 3, UseInfo::AnyTagged()); // Context. ProcessInput<T>(node, 3, UseInfo::AnyTagged()); // Context.
ProcessInput(node, 4, UseInfo::AnyTagged()); // Closure. ProcessInput<T>(node, 4, UseInfo::AnyTagged()); // Closure.
ProcessInput(node, 5, UseInfo::AnyTagged()); // Outer frame state. ProcessInput<T>(node, 5, UseInfo::AnyTagged()); // Outer frame state.
return SetOutput(node, MachineRepresentation::kTagged); return SetOutput<T>(node, MachineRepresentation::kTagged);
} }
template <Phase T>
void VisitObjectState(Node* node) { void VisitObjectState(Node* node) {
if (propagate()) { if (propagate<T>()) {
for (int i = 0; i < node->InputCount(); i++) { for (int i = 0; i < node->InputCount(); i++) {
// TODO(nicohartmann): Remove, once the deoptimizer can rematerialize // TODO(nicohartmann): Remove, once the deoptimizer can rematerialize
// truncated BigInts. // truncated BigInts.
if (TypeOf(node->InputAt(i)).Is(Type::BigInt())) { if (TypeOf(node->InputAt(i)).Is(Type::BigInt())) {
EnqueueInput(node, i, UseInfo::AnyTagged()); EnqueueInput<T>(node, i, UseInfo::AnyTagged());
} else { } else {
EnqueueInput(node, i, UseInfo::Any()); EnqueueInput<T>(node, i, UseInfo::Any());
} }
} }
} else if (lower()) { } else if (lower<T>()) {
Zone* zone = jsgraph_->zone(); Zone* zone = jsgraph_->zone();
ZoneVector<MachineType>* types = ZoneVector<MachineType>* types =
new (zone->New(sizeof(ZoneVector<MachineType>))) new (zone->New(sizeof(ZoneVector<MachineType>)))
...@@ -1293,7 +1240,7 @@ class RepresentationSelector { ...@@ -1293,7 +1240,7 @@ class RepresentationSelector {
NodeProperties::ChangeOp(node, jsgraph_->common()->TypedObjectState( NodeProperties::ChangeOp(node, jsgraph_->common()->TypedObjectState(
ObjectIdOf(node->op()), types)); ObjectIdOf(node->op()), types));
} }
SetOutput(node, MachineRepresentation::kTagged); SetOutput<T>(node, MachineRepresentation::kTagged);
} }
const Operator* Int32Op(Node* node) { const Operator* Int32Op(Node* node) {
...@@ -1432,7 +1379,7 @@ class RepresentationSelector { ...@@ -1432,7 +1379,7 @@ class RepresentationSelector {
truncation.IsUsedAsWord32()) { truncation.IsUsedAsWord32()) {
// => Int32Add/Sub // => Int32Add/Sub
VisitWord32TruncatingBinop<T>(node); VisitWord32TruncatingBinop<T>(node);
if (lower()) ChangeToPureOp(node, Int32Op(node)); if (lower<T>()) ChangeToPureOp(node, Int32Op(node));
return; return;
} }
} }
...@@ -1479,7 +1426,7 @@ class RepresentationSelector { ...@@ -1479,7 +1426,7 @@ class RepresentationSelector {
VisitBinop<T>(node, left_use, right_use, MachineRepresentation::kWord32, VisitBinop<T>(node, left_use, right_use, MachineRepresentation::kWord32,
Type::Signed32()); Type::Signed32());
} }
if (lower()) { if (lower<T>()) {
if (truncation.IsUsedAsWord32() || if (truncation.IsUsedAsWord32() ||
!CanOverflowSigned32(node->op(), left_feedback_type, !CanOverflowSigned32(node->op(), left_feedback_type,
right_feedback_type, graph_zone())) { right_feedback_type, graph_zone())) {
...@@ -1501,7 +1448,7 @@ class RepresentationSelector { ...@@ -1501,7 +1448,7 @@ class RepresentationSelector {
truncation.IsUsedAsWord32())) { truncation.IsUsedAsWord32())) {
// => Int32Add/Sub // => Int32Add/Sub
VisitWord32TruncatingBinop<T>(node); VisitWord32TruncatingBinop<T>(node);
if (lower()) ChangeToPureOp(node, Int32Op(node)); if (lower<T>()) ChangeToPureOp(node, Int32Op(node));
return; return;
} }
...@@ -1510,7 +1457,7 @@ class RepresentationSelector { ...@@ -1510,7 +1457,7 @@ class RepresentationSelector {
UseInfo::CheckedNumberOrOddballAsFloat64(kDistinguishZeros, UseInfo::CheckedNumberOrOddballAsFloat64(kDistinguishZeros,
FeedbackSource()), FeedbackSource()),
MachineRepresentation::kFloat64, Type::Number()); MachineRepresentation::kFloat64, Type::Number());
if (lower()) { if (lower<T>()) {
ChangeToPureOp(node, Float64Op(node)); ChangeToPureOp(node, Float64Op(node));
} }
return; return;
...@@ -1524,7 +1471,7 @@ class RepresentationSelector { ...@@ -1524,7 +1471,7 @@ class RepresentationSelector {
NodeProperties::GetType(node).Is(Type::Unsigned32()))) { NodeProperties::GetType(node).Is(Type::Unsigned32()))) {
// => unsigned Uint32Mod // => unsigned Uint32Mod
VisitWord32TruncatingBinop<T>(node); VisitWord32TruncatingBinop<T>(node);
if (lower()) DeferReplacement(node, lowering->Uint32Mod(node)); if (lower<T>()) DeferReplacement(node, lowering->Uint32Mod(node));
return; return;
} }
if (BothInputsAre(node, Type::Signed32OrMinusZeroOrNaN()) && if (BothInputsAre(node, Type::Signed32OrMinusZeroOrNaN()) &&
...@@ -1532,7 +1479,7 @@ class RepresentationSelector { ...@@ -1532,7 +1479,7 @@ class RepresentationSelector {
NodeProperties::GetType(node).Is(Type::Signed32()))) { NodeProperties::GetType(node).Is(Type::Signed32()))) {
// => signed Int32Mod // => signed Int32Mod
VisitWord32TruncatingBinop<T>(node); VisitWord32TruncatingBinop<T>(node);
if (lower()) DeferReplacement(node, lowering->Int32Mod(node)); if (lower<T>()) DeferReplacement(node, lowering->Int32Mod(node));
return; return;
} }
...@@ -1546,7 +1493,7 @@ class RepresentationSelector { ...@@ -1546,7 +1493,7 @@ class RepresentationSelector {
hint == NumberOperationHint::kSigned32) { hint == NumberOperationHint::kSigned32) {
VisitBinop<T>(node, UseInfo::TruncatingWord32(), VisitBinop<T>(node, UseInfo::TruncatingWord32(),
MachineRepresentation::kWord32, Type::Unsigned32()); MachineRepresentation::kWord32, Type::Unsigned32());
if (lower()) ChangeToUint32OverflowOp(node); if (lower<T>()) ChangeToUint32OverflowOp(node);
return; return;
} }
} }
...@@ -1559,7 +1506,7 @@ class RepresentationSelector { ...@@ -1559,7 +1506,7 @@ class RepresentationSelector {
hint == NumberOperationHint::kSigned32) { hint == NumberOperationHint::kSigned32) {
VisitBinop<T>(node, UseInfo::TruncatingWord32(), VisitBinop<T>(node, UseInfo::TruncatingWord32(),
MachineRepresentation::kWord32, Type::Signed32()); MachineRepresentation::kWord32, Type::Signed32());
if (lower()) ChangeToInt32OverflowOp(node); if (lower<T>()) ChangeToInt32OverflowOp(node);
return; return;
} }
} }
...@@ -1577,15 +1524,15 @@ class RepresentationSelector { ...@@ -1577,15 +1524,15 @@ class RepresentationSelector {
hint, FeedbackSource(), kIdentifyZeros); hint, FeedbackSource(), kIdentifyZeros);
if (truncation.IsUsedAsWord32()) { if (truncation.IsUsedAsWord32()) {
VisitBinop<T>(node, lhs_use, rhs_use, MachineRepresentation::kWord32); VisitBinop<T>(node, lhs_use, rhs_use, MachineRepresentation::kWord32);
if (lower()) DeferReplacement(node, lowering->Int32Mod(node)); if (lower<T>()) DeferReplacement(node, lowering->Int32Mod(node));
} else if (BothInputsAre(node, Type::Unsigned32OrMinusZeroOrNaN())) { } else if (BothInputsAre(node, Type::Unsigned32OrMinusZeroOrNaN())) {
VisitBinop<T>(node, lhs_use, rhs_use, MachineRepresentation::kWord32, VisitBinop<T>(node, lhs_use, rhs_use, MachineRepresentation::kWord32,
Type::Unsigned32()); Type::Unsigned32());
if (lower()) ChangeToUint32OverflowOp(node); if (lower<T>()) ChangeToUint32OverflowOp(node);
} else { } else {
VisitBinop<T>(node, lhs_use, rhs_use, MachineRepresentation::kWord32, VisitBinop<T>(node, lhs_use, rhs_use, MachineRepresentation::kWord32,
Type::Signed32()); Type::Signed32());
if (lower()) ChangeToInt32OverflowOp(node); if (lower<T>()) ChangeToInt32OverflowOp(node);
} }
return; return;
} }
...@@ -1596,7 +1543,7 @@ class RepresentationSelector { ...@@ -1596,7 +1543,7 @@ class RepresentationSelector {
NodeProperties::GetType(node).Is(Type::Unsigned32()))) { NodeProperties::GetType(node).Is(Type::Unsigned32()))) {
VisitBinop<T>(node, UseInfo::TruncatingWord32(), VisitBinop<T>(node, UseInfo::TruncatingWord32(),
MachineRepresentation::kWord32, Type::Number()); MachineRepresentation::kWord32, Type::Number());
if (lower()) DeferReplacement(node, lowering->Uint32Mod(node)); if (lower<T>()) DeferReplacement(node, lowering->Uint32Mod(node));
return; return;
} }
if (TypeOf(node->InputAt(0)).Is(Type::Signed32()) && if (TypeOf(node->InputAt(0)).Is(Type::Signed32()) &&
...@@ -1605,7 +1552,7 @@ class RepresentationSelector { ...@@ -1605,7 +1552,7 @@ class RepresentationSelector {
NodeProperties::GetType(node).Is(Type::Signed32()))) { NodeProperties::GetType(node).Is(Type::Signed32()))) {
VisitBinop<T>(node, UseInfo::TruncatingWord32(), VisitBinop<T>(node, UseInfo::TruncatingWord32(),
MachineRepresentation::kWord32, Type::Number()); MachineRepresentation::kWord32, Type::Number());
if (lower()) DeferReplacement(node, lowering->Int32Mod(node)); if (lower<T>()) DeferReplacement(node, lowering->Int32Mod(node));
return; return;
} }
...@@ -1620,42 +1567,16 @@ class RepresentationSelector { ...@@ -1620,42 +1567,16 @@ class RepresentationSelector {
kIdentifyZeros, FeedbackSource()); kIdentifyZeros, FeedbackSource());
VisitBinop<T>(node, lhs_use, rhs_use, MachineRepresentation::kFloat64, VisitBinop<T>(node, lhs_use, rhs_use, MachineRepresentation::kFloat64,
Type::Number()); Type::Number());
if (lower()) ChangeToPureOp(node, Float64Op(node)); if (lower<T>()) ChangeToPureOp(node, Float64Op(node));
return; return;
} }
// Just assert for Propagate and Retype. Lower specialized below.
template <Phase T>
void InsertUnreachableIfNecessary(Node* node) { void InsertUnreachableIfNecessary(Node* node) {
DCHECK(lower()); static_assert(propagate<T>() || retype<T>(),
// If the node is effectful and it produces an impossible value, then we "This version of InsertUnreachableIfNecessary has to be "
// insert Unreachable node after it. "called in the Propagate or Retype phase.");
if (node->op()->ValueOutputCount() > 0 &&
node->op()->EffectOutputCount() > 0 &&
node->opcode() != IrOpcode::kUnreachable && TypeOf(node).IsNone()) {
Node* control =
(node->op()->ControlOutputCount() == 0)
? NodeProperties::GetControlInput(node, 0)
: NodeProperties::FindSuccessfulControlProjection(node);
Node* unreachable =
graph()->NewNode(common()->Unreachable(), node, control);
// Insert unreachable node and replace all the effect uses of the {node}
// with the new unreachable node.
for (Edge edge : node->use_edges()) {
if (!NodeProperties::IsEffectEdge(edge)) continue;
// Make sure to not overwrite the unreachable node's input. That would
// create a cycle.
if (edge.from() == unreachable) continue;
// Avoid messing up the exceptional path.
if (edge.from()->opcode() == IrOpcode::kIfException) {
DCHECK(!node->op()->HasProperty(Operator::kNoThrow));
DCHECK_EQ(NodeProperties::GetControlInput(edge.from()), node);
continue;
}
edge.UpdateTo(unreachable);
}
}
} }
template <Phase T> template <Phase T>
...@@ -1671,7 +1592,7 @@ class RepresentationSelector { ...@@ -1671,7 +1592,7 @@ class RepresentationSelector {
// as well, because the {length_type} is limited to Unsigned31. // as well, because the {length_type} is limited to Unsigned31.
VisitBinop<T>(node, UseInfo::TruncatingWord32(), VisitBinop<T>(node, UseInfo::TruncatingWord32(),
MachineRepresentation::kWord32); MachineRepresentation::kWord32);
if (lower()) { if (lower<T>()) {
CheckBoundsParameters::Mode mode = p.mode(); CheckBoundsParameters::Mode mode = p.mode();
if (lowering->poisoning_level_ == if (lowering->poisoning_level_ ==
PoisoningMitigationLevel::kDontPoison && PoisoningMitigationLevel::kDontPoison &&
...@@ -1688,7 +1609,7 @@ class RepresentationSelector { ...@@ -1688,7 +1609,7 @@ class RepresentationSelector {
} else { } else {
VisitBinop<T>(node, UseInfo::CheckedTaggedAsArrayIndex(feedback), VisitBinop<T>(node, UseInfo::CheckedTaggedAsArrayIndex(feedback),
UseInfo::Word(), MachineType::PointerRepresentation()); UseInfo::Word(), MachineType::PointerRepresentation());
if (lower()) { if (lower<T>()) {
if (jsgraph_->machine()->Is64()) { if (jsgraph_->machine()->Is64()) {
NodeProperties::ChangeOp( NodeProperties::ChangeOp(
node, simplified()->CheckedUint64Bounds(feedback, p.mode())); node, simplified()->CheckedUint64Bounds(feedback, p.mode()));
...@@ -1703,7 +1624,7 @@ class RepresentationSelector { ...@@ -1703,7 +1624,7 @@ class RepresentationSelector {
VisitBinop<T>(node, VisitBinop<T>(node,
UseInfo::CheckedSigned64AsWord64(kIdentifyZeros, feedback), UseInfo::CheckedSigned64AsWord64(kIdentifyZeros, feedback),
UseInfo::Word64(), MachineRepresentation::kWord64); UseInfo::Word64(), MachineRepresentation::kWord64);
if (lower()) { if (lower<T>()) {
NodeProperties::ChangeOp( NodeProperties::ChangeOp(
node, simplified()->CheckedUint64Bounds(feedback, p.mode())); node, simplified()->CheckedUint64Bounds(feedback, p.mode()));
} }
...@@ -1762,6 +1683,7 @@ class RepresentationSelector { ...@@ -1762,6 +1683,7 @@ class RepresentationSelector {
static constexpr int kInitialArgumentsCount = 10; static constexpr int kInitialArgumentsCount = 10;
template <Phase T>
void VisitFastApiCall(Node* node) { void VisitFastApiCall(Node* node) {
FastApiCallParameters const& params = FastApiCallParametersOf(node->op()); FastApiCallParameters const& params = FastApiCallParametersOf(node->op());
const CFunctionInfo* c_signature = params.signature(); const CFunctionInfo* c_signature = params.signature();
...@@ -1772,19 +1694,19 @@ class RepresentationSelector { ...@@ -1772,19 +1694,19 @@ class RepresentationSelector {
base::SmallVector<UseInfo, kInitialArgumentsCount> arg_use_info( base::SmallVector<UseInfo, kInitialArgumentsCount> arg_use_info(
c_arg_count); c_arg_count);
ProcessInput(node, 0, UseInfo::Word()); ProcessInput<T>(node, 0, UseInfo::Word());
// Propagate representation information from TypeInfo. // Propagate representation information from TypeInfo.
for (int i = 0; i < c_arg_count; i++) { for (int i = 0; i < c_arg_count; i++) {
arg_use_info[i] = UseInfoForFastApiCallArgument( arg_use_info[i] = UseInfoForFastApiCallArgument(
c_signature->ArgumentInfo(i).GetType(), params.feedback()); c_signature->ArgumentInfo(i).GetType(), params.feedback());
ProcessInput(node, i + 1, arg_use_info[i]); ProcessInput<T>(node, i + 1, arg_use_info[i]);
} }
MachineType return_type = MachineType return_type =
MachineTypeFor(c_signature->ReturnInfo().GetType()); MachineTypeFor(c_signature->ReturnInfo().GetType());
SetOutput(node, return_type.representation()); SetOutput<T>(node, return_type.representation());
if (lower()) { if (lower<T>()) {
MachineSignature::Builder builder(graph()->zone(), 1, c_arg_count); MachineSignature::Builder builder(graph()->zone(), 1, c_arg_count);
builder.AddReturn(return_type); builder.AddReturn(return_type);
for (int i = 0; i < c_arg_count; ++i) { for (int i = 0; i < c_arg_count; ++i) {
...@@ -1827,7 +1749,7 @@ class RepresentationSelector { ...@@ -1827,7 +1749,7 @@ class RepresentationSelector {
return VisitUnused<T>(node); return VisitUnused<T>(node);
} }
if (lower()) InsertUnreachableIfNecessary(node); if (lower<T>()) InsertUnreachableIfNecessary<T>(node);
switch (node->opcode()) { switch (node->opcode()) {
//------------------------------------------------------------------ //------------------------------------------------------------------
...@@ -1837,37 +1759,37 @@ class RepresentationSelector { ...@@ -1837,37 +1759,37 @@ class RepresentationSelector {
// We use Start as a terminator for the frame state chain, so even // We use Start as a terminator for the frame state chain, so even
// tho Start doesn't really produce a value, we have to say Tagged // tho Start doesn't really produce a value, we have to say Tagged
// here, otherwise the input conversion will fail. // here, otherwise the input conversion will fail.
return VisitLeaf(node, MachineRepresentation::kTagged); return VisitLeaf<T>(node, MachineRepresentation::kTagged);
case IrOpcode::kParameter: case IrOpcode::kParameter:
// TODO(titzer): use representation from linkage. // TODO(titzer): use representation from linkage.
return VisitUnop<T>(node, UseInfo::None(), return VisitUnop<T>(node, UseInfo::None(),
MachineRepresentation::kTagged); MachineRepresentation::kTagged);
case IrOpcode::kInt32Constant: case IrOpcode::kInt32Constant:
return VisitLeaf(node, MachineRepresentation::kWord32); return VisitLeaf<T>(node, MachineRepresentation::kWord32);
case IrOpcode::kInt64Constant: case IrOpcode::kInt64Constant:
return VisitLeaf(node, MachineRepresentation::kWord64); return VisitLeaf<T>(node, MachineRepresentation::kWord64);
case IrOpcode::kExternalConstant: case IrOpcode::kExternalConstant:
return VisitLeaf(node, MachineType::PointerRepresentation()); return VisitLeaf<T>(node, MachineType::PointerRepresentation());
case IrOpcode::kNumberConstant: { case IrOpcode::kNumberConstant: {
double const value = OpParameter<double>(node->op()); double const value = OpParameter<double>(node->op());
int value_as_int; int value_as_int;
if (DoubleToSmiInteger(value, &value_as_int)) { if (DoubleToSmiInteger(value, &value_as_int)) {
VisitLeaf(node, MachineRepresentation::kTaggedSigned); VisitLeaf<T>(node, MachineRepresentation::kTaggedSigned);
if (lower()) { if (lower<T>()) {
intptr_t smi = bit_cast<intptr_t>(Smi::FromInt(value_as_int)); intptr_t smi = bit_cast<intptr_t>(Smi::FromInt(value_as_int));
DeferReplacement(node, lowering->jsgraph()->IntPtrConstant(smi)); DeferReplacement(node, lowering->jsgraph()->IntPtrConstant(smi));
} }
return; return;
} }
VisitLeaf(node, MachineRepresentation::kTagged); VisitLeaf<T>(node, MachineRepresentation::kTagged);
return; return;
} }
case IrOpcode::kHeapConstant: case IrOpcode::kHeapConstant:
case IrOpcode::kDelayedStringConstant: case IrOpcode::kDelayedStringConstant:
return VisitLeaf(node, MachineRepresentation::kTaggedPointer); return VisitLeaf<T>(node, MachineRepresentation::kTaggedPointer);
case IrOpcode::kPointerConstant: { case IrOpcode::kPointerConstant: {
VisitLeaf(node, MachineType::PointerRepresentation()); VisitLeaf<T>(node, MachineType::PointerRepresentation());
if (lower()) { if (lower<T>()) {
intptr_t const value = OpParameter<intptr_t>(node->op()); intptr_t const value = OpParameter<intptr_t>(node->op());
DeferReplacement(node, lowering->jsgraph()->IntPtrConstant(value)); DeferReplacement(node, lowering->jsgraph()->IntPtrConstant(value));
} }
...@@ -1885,9 +1807,9 @@ class RepresentationSelector { ...@@ -1885,9 +1807,9 @@ class RepresentationSelector {
EnqueueInput<T>(node, NodeProperties::FirstControlIndex(node)); EnqueueInput<T>(node, NodeProperties::FirstControlIndex(node));
return; return;
case IrOpcode::kSelect: case IrOpcode::kSelect:
return VisitSelect(node, truncation, lowering); return VisitSelect<T>(node, truncation, lowering);
case IrOpcode::kPhi: case IrOpcode::kPhi:
return VisitPhi(node, truncation, lowering); return VisitPhi<T>(node, truncation, lowering);
case IrOpcode::kCall: case IrOpcode::kCall:
return VisitCall<T>(node, lowering); return VisitCall<T>(node, lowering);
...@@ -1898,7 +1820,7 @@ class RepresentationSelector { ...@@ -1898,7 +1820,7 @@ class RepresentationSelector {
if (truncation.IsUsedAsBool()) { if (truncation.IsUsedAsBool()) {
ProcessInput<T>(node, 0, UseInfo::Bool()); ProcessInput<T>(node, 0, UseInfo::Bool());
SetOutput<T>(node, MachineRepresentation::kBit); SetOutput<T>(node, MachineRepresentation::kBit);
if (lower()) DeferReplacement(node, node->InputAt(0)); if (lower<T>()) DeferReplacement(node, node->InputAt(0));
} else { } else {
VisitInputs<T>(node); VisitInputs<T>(node);
SetOutput<T>(node, MachineRepresentation::kTaggedPointer); SetOutput<T>(node, MachineRepresentation::kTaggedPointer);
...@@ -1914,11 +1836,11 @@ class RepresentationSelector { ...@@ -1914,11 +1836,11 @@ class RepresentationSelector {
// TODO(bmeurer): Optimize somewhat based on input type? // TODO(bmeurer): Optimize somewhat based on input type?
if (truncation.IsUsedAsWord32()) { if (truncation.IsUsedAsWord32()) {
SetOutput<T>(node, MachineRepresentation::kWord32); SetOutput<T>(node, MachineRepresentation::kWord32);
if (lower()) if (lower<T>())
lowering->DoJSToNumberOrNumericTruncatesToWord32(node, this); lowering->DoJSToNumberOrNumericTruncatesToWord32(node, this);
} else if (truncation.TruncatesOddballAndBigIntToNumber()) { } else if (truncation.TruncatesOddballAndBigIntToNumber()) {
SetOutput<T>(node, MachineRepresentation::kFloat64); SetOutput<T>(node, MachineRepresentation::kFloat64);
if (lower()) if (lower<T>())
lowering->DoJSToNumberOrNumericTruncatesToFloat64(node, this); lowering->DoJSToNumberOrNumericTruncatesToFloat64(node, this);
} else { } else {
SetOutput<T>(node, MachineRepresentation::kTagged); SetOutput<T>(node, MachineRepresentation::kTagged);
...@@ -1930,7 +1852,7 @@ class RepresentationSelector { ...@@ -1930,7 +1852,7 @@ class RepresentationSelector {
// Simplified operators. // Simplified operators.
//------------------------------------------------------------------ //------------------------------------------------------------------
case IrOpcode::kBooleanNot: { case IrOpcode::kBooleanNot: {
if (lower()) { if (lower<T>()) {
NodeInfo* input_info = GetInfo(node->InputAt(0)); NodeInfo* input_info = GetInfo(node->InputAt(0));
if (input_info->representation() == MachineRepresentation::kBit) { if (input_info->representation() == MachineRepresentation::kBit) {
// BooleanNot(x: kRepBit) => Word32Equal(x, #0) // BooleanNot(x: kRepBit) => Word32Equal(x, #0)
...@@ -1967,7 +1889,7 @@ class RepresentationSelector { ...@@ -1967,7 +1889,7 @@ class RepresentationSelector {
// => unsigned Int32Cmp // => unsigned Int32Cmp
VisitBinop<T>(node, UseInfo::TruncatingWord32(), VisitBinop<T>(node, UseInfo::TruncatingWord32(),
MachineRepresentation::kBit); MachineRepresentation::kBit);
if (lower()) NodeProperties::ChangeOp(node, Uint32Op(node)); if (lower<T>()) NodeProperties::ChangeOp(node, Uint32Op(node));
return; return;
} }
if ((lhs_type.Is(Type::Signed32OrMinusZero()) && if ((lhs_type.Is(Type::Signed32OrMinusZero()) &&
...@@ -1978,13 +1900,13 @@ class RepresentationSelector { ...@@ -1978,13 +1900,13 @@ class RepresentationSelector {
// => signed Int32Cmp // => signed Int32Cmp
VisitBinop<T>(node, UseInfo::TruncatingWord32(), VisitBinop<T>(node, UseInfo::TruncatingWord32(),
MachineRepresentation::kBit); MachineRepresentation::kBit);
if (lower()) NodeProperties::ChangeOp(node, Int32Op(node)); if (lower<T>()) NodeProperties::ChangeOp(node, Int32Op(node));
return; return;
} }
// => Float64Cmp // => Float64Cmp
VisitBinop<T>(node, UseInfo::TruncatingFloat64(kIdentifyZeros), VisitBinop<T>(node, UseInfo::TruncatingFloat64(kIdentifyZeros),
MachineRepresentation::kBit); MachineRepresentation::kBit);
if (lower()) NodeProperties::ChangeOp(node, Float64Op(node)); if (lower<T>()) NodeProperties::ChangeOp(node, Float64Op(node));
return; return;
} }
case IrOpcode::kNumberLessThan: case IrOpcode::kNumberLessThan:
...@@ -1999,18 +1921,18 @@ class RepresentationSelector { ...@@ -1999,18 +1921,18 @@ class RepresentationSelector {
// => unsigned Int32Cmp // => unsigned Int32Cmp
VisitBinop<T>(node, UseInfo::TruncatingWord32(), VisitBinop<T>(node, UseInfo::TruncatingWord32(),
MachineRepresentation::kBit); MachineRepresentation::kBit);
if (lower()) NodeProperties::ChangeOp(node, Uint32Op(node)); if (lower<T>()) NodeProperties::ChangeOp(node, Uint32Op(node));
} else if (lhs_type.Is(Type::Signed32OrMinusZero()) && } else if (lhs_type.Is(Type::Signed32OrMinusZero()) &&
rhs_type.Is(Type::Signed32OrMinusZero())) { rhs_type.Is(Type::Signed32OrMinusZero())) {
// => signed Int32Cmp // => signed Int32Cmp
VisitBinop<T>(node, UseInfo::TruncatingWord32(), VisitBinop<T>(node, UseInfo::TruncatingWord32(),
MachineRepresentation::kBit); MachineRepresentation::kBit);
if (lower()) NodeProperties::ChangeOp(node, Int32Op(node)); if (lower<T>()) NodeProperties::ChangeOp(node, Int32Op(node));
} else { } else {
// => Float64Cmp // => Float64Cmp
VisitBinop<T>(node, UseInfo::TruncatingFloat64(kIdentifyZeros), VisitBinop<T>(node, UseInfo::TruncatingFloat64(kIdentifyZeros),
MachineRepresentation::kBit); MachineRepresentation::kBit);
if (lower()) NodeProperties::ChangeOp(node, Float64Op(node)); if (lower<T>()) NodeProperties::ChangeOp(node, Float64Op(node));
} }
return; return;
} }
...@@ -2036,14 +1958,14 @@ class RepresentationSelector { ...@@ -2036,14 +1958,14 @@ class RepresentationSelector {
// => unsigned Int32Cmp // => unsigned Int32Cmp
VisitBinop<T>(node, UseInfo::TruncatingWord32(), VisitBinop<T>(node, UseInfo::TruncatingWord32(),
MachineRepresentation::kBit); MachineRepresentation::kBit);
if (lower()) ChangeToPureOp(node, Uint32Op(node)); if (lower<T>()) ChangeToPureOp(node, Uint32Op(node));
return; return;
} else if (lhs_type.Is(Type::Signed32OrMinusZero()) && } else if (lhs_type.Is(Type::Signed32OrMinusZero()) &&
rhs_type.Is(Type::Signed32OrMinusZero())) { rhs_type.Is(Type::Signed32OrMinusZero())) {
// => signed Int32Cmp // => signed Int32Cmp
VisitBinop<T>(node, UseInfo::TruncatingWord32(), VisitBinop<T>(node, UseInfo::TruncatingWord32(),
MachineRepresentation::kBit); MachineRepresentation::kBit);
if (lower()) ChangeToPureOp(node, Int32Op(node)); if (lower<T>()) ChangeToPureOp(node, Int32Op(node));
return; return;
} }
// Try to use type feedback. // Try to use type feedback.
...@@ -2051,15 +1973,15 @@ class RepresentationSelector { ...@@ -2051,15 +1973,15 @@ class RepresentationSelector {
switch (hint) { switch (hint) {
case NumberOperationHint::kSigned32: case NumberOperationHint::kSigned32:
case NumberOperationHint::kSignedSmall: case NumberOperationHint::kSignedSmall:
if (propagate()) { if (propagate<T>()) {
VisitBinop<T>(node, VisitBinop<T>(node,
CheckedUseInfoAsWord32FromHint( CheckedUseInfoAsWord32FromHint(
hint, FeedbackSource(), kIdentifyZeros), hint, FeedbackSource(), kIdentifyZeros),
MachineRepresentation::kBit); MachineRepresentation::kBit);
} else if (retype()) { } else if (retype<T>()) {
SetOutput<T>(node, MachineRepresentation::kBit, Type::Any()); SetOutput<T>(node, MachineRepresentation::kBit, Type::Any());
} else { } else {
DCHECK(lower()); DCHECK(lower<T>());
Node* lhs = node->InputAt(0); Node* lhs = node->InputAt(0);
Node* rhs = node->InputAt(1); Node* rhs = node->InputAt(1);
if (IsNodeRepresentationTagged(lhs) && if (IsNodeRepresentationTagged(lhs) &&
...@@ -2094,7 +2016,7 @@ class RepresentationSelector { ...@@ -2094,7 +2016,7 @@ class RepresentationSelector {
CheckedUseInfoAsFloat64FromHint( CheckedUseInfoAsFloat64FromHint(
hint, FeedbackSource(), kIdentifyZeros), hint, FeedbackSource(), kIdentifyZeros),
MachineRepresentation::kBit); MachineRepresentation::kBit);
if (lower()) ChangeToPureOp(node, Float64Op(node)); if (lower<T>()) ChangeToPureOp(node, Float64Op(node));
return; return;
} }
UNREACHABLE(); UNREACHABLE();
...@@ -2112,17 +2034,17 @@ class RepresentationSelector { ...@@ -2112,17 +2034,17 @@ class RepresentationSelector {
truncation.IsUsedAsWord32())) { truncation.IsUsedAsWord32())) {
// => Int32Add/Sub // => Int32Add/Sub
VisitWord32TruncatingBinop<T>(node); VisitWord32TruncatingBinop<T>(node);
if (lower()) ChangeToPureOp(node, Int32Op(node)); if (lower<T>()) ChangeToPureOp(node, Int32Op(node));
} else if (jsgraph_->machine()->Is64() && } else if (jsgraph_->machine()->Is64() &&
BothInputsAre(node, type_cache_->kSafeInteger) && BothInputsAre(node, type_cache_->kSafeInteger) &&
GetUpperBound(node).Is(type_cache_->kSafeInteger)) { GetUpperBound(node).Is(type_cache_->kSafeInteger)) {
// => Int64Add/Sub // => Int64Add/Sub
VisitInt64Binop<T>(node); VisitInt64Binop<T>(node);
if (lower()) ChangeToPureOp(node, Int64Op(node)); if (lower<T>()) ChangeToPureOp(node, Int64Op(node));
} else { } else {
// => Float64Add/Sub // => Float64Add/Sub
VisitFloat64Binop<T>(node); VisitFloat64Binop<T>(node);
if (lower()) ChangeToPureOp(node, Float64Op(node)); if (lower<T>()) ChangeToPureOp(node, Float64Op(node));
} }
return; return;
} }
...@@ -2139,7 +2061,7 @@ class RepresentationSelector { ...@@ -2139,7 +2061,7 @@ class RepresentationSelector {
// (c) the uses are truncating and the result is in the safe // (c) the uses are truncating and the result is in the safe
// integer range. // integer range.
VisitWord32TruncatingBinop<T>(node); VisitWord32TruncatingBinop<T>(node);
if (lower()) ChangeToPureOp(node, Int32Op(node)); if (lower<T>()) ChangeToPureOp(node, Int32Op(node));
return; return;
} }
// Try to use type feedback. // Try to use type feedback.
...@@ -2155,7 +2077,7 @@ class RepresentationSelector { ...@@ -2155,7 +2077,7 @@ class RepresentationSelector {
hint == NumberOperationHint::kSigned32) { hint == NumberOperationHint::kSigned32) {
VisitBinop<T>(node, UseInfo::TruncatingWord32(), VisitBinop<T>(node, UseInfo::TruncatingWord32(),
MachineRepresentation::kWord32, Type::Signed32()); MachineRepresentation::kWord32, Type::Signed32());
if (lower()) { if (lower<T>()) {
LowerToCheckedInt32Mul(node, truncation, input0_type, LowerToCheckedInt32Mul(node, truncation, input0_type,
input1_type); input1_type);
} }
...@@ -2167,7 +2089,7 @@ class RepresentationSelector { ...@@ -2167,7 +2089,7 @@ class RepresentationSelector {
hint == NumberOperationHint::kSigned32) { hint == NumberOperationHint::kSigned32) {
VisitBinop<T>(node, CheckedUseInfoAsWord32FromHint(hint), VisitBinop<T>(node, CheckedUseInfoAsWord32FromHint(hint),
MachineRepresentation::kWord32, Type::Signed32()); MachineRepresentation::kWord32, Type::Signed32());
if (lower()) { if (lower<T>()) {
LowerToCheckedInt32Mul(node, truncation, input0_type, input1_type); LowerToCheckedInt32Mul(node, truncation, input0_type, input1_type);
} }
return; return;
...@@ -2178,7 +2100,7 @@ class RepresentationSelector { ...@@ -2178,7 +2100,7 @@ class RepresentationSelector {
UseInfo::CheckedNumberOrOddballAsFloat64( UseInfo::CheckedNumberOrOddballAsFloat64(
kDistinguishZeros, FeedbackSource()), kDistinguishZeros, FeedbackSource()),
MachineRepresentation::kFloat64, Type::Number()); MachineRepresentation::kFloat64, Type::Number());
if (lower()) ChangeToPureOp(node, Float64Op(node)); if (lower<T>()) ChangeToPureOp(node, Float64Op(node));
return; return;
} }
case IrOpcode::kNumberMultiply: { case IrOpcode::kNumberMultiply: {
...@@ -2194,32 +2116,32 @@ class RepresentationSelector { ...@@ -2194,32 +2116,32 @@ class RepresentationSelector {
// (c) the uses are truncating and the result is in the safe // (c) the uses are truncating and the result is in the safe
// integer range. // integer range.
VisitWord32TruncatingBinop<T>(node); VisitWord32TruncatingBinop<T>(node);
if (lower()) ChangeToPureOp(node, Int32Op(node)); if (lower<T>()) ChangeToPureOp(node, Int32Op(node));
return; return;
} }
// Number x Number => Float64Mul // Number x Number => Float64Mul
VisitFloat64Binop<T>(node); VisitFloat64Binop<T>(node);
if (lower()) ChangeToPureOp(node, Float64Op(node)); if (lower<T>()) ChangeToPureOp(node, Float64Op(node));
return; return;
} }
case IrOpcode::kSpeculativeNumberDivide: { case IrOpcode::kSpeculativeNumberDivide: {
if (BothInputsAreUnsigned32(node) && truncation.IsUsedAsWord32()) { if (BothInputsAreUnsigned32(node) && truncation.IsUsedAsWord32()) {
// => unsigned Uint32Div // => unsigned Uint32Div
VisitWord32TruncatingBinop<T>(node); VisitWord32TruncatingBinop<T>(node);
if (lower()) DeferReplacement(node, lowering->Uint32Div(node)); if (lower<T>()) DeferReplacement(node, lowering->Uint32Div(node));
return; return;
} }
if (BothInputsAreSigned32(node)) { if (BothInputsAreSigned32(node)) {
if (NodeProperties::GetType(node).Is(Type::Signed32())) { if (NodeProperties::GetType(node).Is(Type::Signed32())) {
// => signed Int32Div // => signed Int32Div
VisitWord32TruncatingBinop<T>(node); VisitWord32TruncatingBinop<T>(node);
if (lower()) DeferReplacement(node, lowering->Int32Div(node)); if (lower<T>()) DeferReplacement(node, lowering->Int32Div(node));
return; return;
} }
if (truncation.IsUsedAsWord32()) { if (truncation.IsUsedAsWord32()) {
// => signed Int32Div // => signed Int32Div
VisitWord32TruncatingBinop<T>(node); VisitWord32TruncatingBinop<T>(node);
if (lower()) DeferReplacement(node, lowering->Int32Div(node)); if (lower<T>()) DeferReplacement(node, lowering->Int32Div(node));
return; return;
} }
} }
...@@ -2234,7 +2156,7 @@ class RepresentationSelector { ...@@ -2234,7 +2156,7 @@ class RepresentationSelector {
hint == NumberOperationHint::kSigned32) { hint == NumberOperationHint::kSigned32) {
VisitBinop<T>(node, UseInfo::TruncatingWord32(), VisitBinop<T>(node, UseInfo::TruncatingWord32(),
MachineRepresentation::kWord32, Type::Unsigned32()); MachineRepresentation::kWord32, Type::Unsigned32());
if (lower()) ChangeToUint32OverflowOp(node); if (lower<T>()) ChangeToUint32OverflowOp(node);
return; return;
} }
} }
...@@ -2247,7 +2169,7 @@ class RepresentationSelector { ...@@ -2247,7 +2169,7 @@ class RepresentationSelector {
hint == NumberOperationHint::kSigned32) { hint == NumberOperationHint::kSigned32) {
VisitBinop<T>(node, UseInfo::TruncatingWord32(), VisitBinop<T>(node, UseInfo::TruncatingWord32(),
MachineRepresentation::kWord32, Type::Signed32()); MachineRepresentation::kWord32, Type::Signed32());
if (lower()) ChangeToInt32OverflowOp(node); if (lower<T>()) ChangeToInt32OverflowOp(node);
return; return;
} }
} }
...@@ -2259,12 +2181,12 @@ class RepresentationSelector { ...@@ -2259,12 +2181,12 @@ class RepresentationSelector {
if (truncation.IsUsedAsWord32()) { if (truncation.IsUsedAsWord32()) {
VisitBinop<T>(node, CheckedUseInfoAsWord32FromHint(hint), VisitBinop<T>(node, CheckedUseInfoAsWord32FromHint(hint),
MachineRepresentation::kWord32); MachineRepresentation::kWord32);
if (lower()) DeferReplacement(node, lowering->Int32Div(node)); if (lower<T>()) DeferReplacement(node, lowering->Int32Div(node));
return; return;
} else if (hint != NumberOperationHint::kSignedSmallInputs) { } else if (hint != NumberOperationHint::kSignedSmallInputs) {
VisitBinop<T>(node, CheckedUseInfoAsWord32FromHint(hint), VisitBinop<T>(node, CheckedUseInfoAsWord32FromHint(hint),
MachineRepresentation::kWord32, Type::Signed32()); MachineRepresentation::kWord32, Type::Signed32());
if (lower()) ChangeToInt32OverflowOp(node); if (lower<T>()) ChangeToInt32OverflowOp(node);
return; return;
} }
} }
...@@ -2274,7 +2196,7 @@ class RepresentationSelector { ...@@ -2274,7 +2196,7 @@ class RepresentationSelector {
UseInfo::CheckedNumberOrOddballAsFloat64( UseInfo::CheckedNumberOrOddballAsFloat64(
kDistinguishZeros, FeedbackSource()), kDistinguishZeros, FeedbackSource()),
MachineRepresentation::kFloat64, Type::Number()); MachineRepresentation::kFloat64, Type::Number());
if (lower()) ChangeToPureOp(node, Float64Op(node)); if (lower<T>()) ChangeToPureOp(node, Float64Op(node));
return; return;
} }
case IrOpcode::kNumberDivide: { case IrOpcode::kNumberDivide: {
...@@ -2284,7 +2206,7 @@ class RepresentationSelector { ...@@ -2284,7 +2206,7 @@ class RepresentationSelector {
TypeOf(node).Is(Type::Unsigned32()))) { TypeOf(node).Is(Type::Unsigned32()))) {
// => unsigned Uint32Div // => unsigned Uint32Div
VisitWord32TruncatingBinop<T>(node); VisitWord32TruncatingBinop<T>(node);
if (lower()) DeferReplacement(node, lowering->Uint32Div(node)); if (lower<T>()) DeferReplacement(node, lowering->Uint32Div(node));
return; return;
} }
if (TypeOf(node->InputAt(0)).Is(Type::Signed32()) && if (TypeOf(node->InputAt(0)).Is(Type::Signed32()) &&
...@@ -2293,12 +2215,12 @@ class RepresentationSelector { ...@@ -2293,12 +2215,12 @@ class RepresentationSelector {
TypeOf(node).Is(Type::Signed32()))) { TypeOf(node).Is(Type::Signed32()))) {
// => signed Int32Div // => signed Int32Div
VisitWord32TruncatingBinop<T>(node); VisitWord32TruncatingBinop<T>(node);
if (lower()) DeferReplacement(node, lowering->Int32Div(node)); if (lower<T>()) DeferReplacement(node, lowering->Int32Div(node));
return; return;
} }
// Number x Number => Float64Div // Number x Number => Float64Div
VisitFloat64Binop<T>(node); VisitFloat64Binop<T>(node);
if (lower()) ChangeToPureOp(node, Float64Op(node)); if (lower<T>()) ChangeToPureOp(node, Float64Op(node));
return; return;
} }
case IrOpcode::kSpeculativeNumberModulus: case IrOpcode::kSpeculativeNumberModulus:
...@@ -2312,7 +2234,7 @@ class RepresentationSelector { ...@@ -2312,7 +2234,7 @@ class RepresentationSelector {
TypeOf(node).Is(Type::Unsigned32()))) { TypeOf(node).Is(Type::Unsigned32()))) {
// => unsigned Uint32Mod // => unsigned Uint32Mod
VisitWord32TruncatingBinop<T>(node); VisitWord32TruncatingBinop<T>(node);
if (lower()) DeferReplacement(node, lowering->Uint32Mod(node)); if (lower<T>()) DeferReplacement(node, lowering->Uint32Mod(node));
return; return;
} }
if ((lhs_type.Is(Type::Signed32OrMinusZeroOrNaN()) && if ((lhs_type.Is(Type::Signed32OrMinusZeroOrNaN()) &&
...@@ -2322,7 +2244,7 @@ class RepresentationSelector { ...@@ -2322,7 +2244,7 @@ class RepresentationSelector {
TypeOf(node).Is(Type::Signed32OrMinusZero())))) { TypeOf(node).Is(Type::Signed32OrMinusZero())))) {
// => signed Int32Mod // => signed Int32Mod
VisitWord32TruncatingBinop<T>(node); VisitWord32TruncatingBinop<T>(node);
if (lower()) DeferReplacement(node, lowering->Int32Mod(node)); if (lower<T>()) DeferReplacement(node, lowering->Int32Mod(node));
return; return;
} }
// => Float64Mod // => Float64Mod
...@@ -2334,21 +2256,21 @@ class RepresentationSelector { ...@@ -2334,21 +2256,21 @@ class RepresentationSelector {
UseInfo::TruncatingFloat64(truncation.identify_zeros()); UseInfo::TruncatingFloat64(truncation.identify_zeros());
UseInfo const rhs_use = UseInfo::TruncatingFloat64(kIdentifyZeros); UseInfo const rhs_use = UseInfo::TruncatingFloat64(kIdentifyZeros);
VisitBinop<T>(node, lhs_use, rhs_use, MachineRepresentation::kFloat64); VisitBinop<T>(node, lhs_use, rhs_use, MachineRepresentation::kFloat64);
if (lower()) ChangeToPureOp(node, Float64Op(node)); if (lower<T>()) ChangeToPureOp(node, Float64Op(node));
return; return;
} }
case IrOpcode::kNumberBitwiseOr: case IrOpcode::kNumberBitwiseOr:
case IrOpcode::kNumberBitwiseXor: case IrOpcode::kNumberBitwiseXor:
case IrOpcode::kNumberBitwiseAnd: { case IrOpcode::kNumberBitwiseAnd: {
VisitWord32TruncatingBinop<T>(node); VisitWord32TruncatingBinop<T>(node);
if (lower()) NodeProperties::ChangeOp(node, Int32Op(node)); if (lower<T>()) NodeProperties::ChangeOp(node, Int32Op(node));
return; return;
} }
case IrOpcode::kSpeculativeNumberBitwiseOr: case IrOpcode::kSpeculativeNumberBitwiseOr:
case IrOpcode::kSpeculativeNumberBitwiseXor: case IrOpcode::kSpeculativeNumberBitwiseXor:
case IrOpcode::kSpeculativeNumberBitwiseAnd: case IrOpcode::kSpeculativeNumberBitwiseAnd:
VisitSpeculativeInt32Binop<T>(node); VisitSpeculativeInt32Binop<T>(node);
if (lower()) { if (lower<T>()) {
ChangeToPureOp(node, Int32Op(node)); ChangeToPureOp(node, Int32Op(node));
} }
return; return;
...@@ -2357,7 +2279,7 @@ class RepresentationSelector { ...@@ -2357,7 +2279,7 @@ class RepresentationSelector {
VisitBinop<T>(node, UseInfo::TruncatingWord32(), VisitBinop<T>(node, UseInfo::TruncatingWord32(),
UseInfo::TruncatingWord32(), UseInfo::TruncatingWord32(),
MachineRepresentation::kWord32); MachineRepresentation::kWord32);
if (lower()) { if (lower<T>()) {
MaskShiftOperand(node, rhs_type); MaskShiftOperand(node, rhs_type);
ChangeToPureOp(node, lowering->machine()->Word32Shl()); ChangeToPureOp(node, lowering->machine()->Word32Shl());
} }
...@@ -2369,7 +2291,7 @@ class RepresentationSelector { ...@@ -2369,7 +2291,7 @@ class RepresentationSelector {
VisitBinop<T>(node, UseInfo::TruncatingWord32(), VisitBinop<T>(node, UseInfo::TruncatingWord32(),
UseInfo::TruncatingWord32(), UseInfo::TruncatingWord32(),
MachineRepresentation::kWord32); MachineRepresentation::kWord32);
if (lower()) { if (lower<T>()) {
MaskShiftOperand(node, rhs_type); MaskShiftOperand(node, rhs_type);
ChangeToPureOp(node, lowering->machine()->Word32Shl()); ChangeToPureOp(node, lowering->machine()->Word32Shl());
} }
...@@ -2379,7 +2301,7 @@ class RepresentationSelector { ...@@ -2379,7 +2301,7 @@ class RepresentationSelector {
Type rhs_type = GetUpperBound(node->InputAt(1)); Type rhs_type = GetUpperBound(node->InputAt(1));
VisitBinop<T>(node, CheckedUseInfoAsWord32FromHint(hint), VisitBinop<T>(node, CheckedUseInfoAsWord32FromHint(hint),
MachineRepresentation::kWord32, Type::Signed32()); MachineRepresentation::kWord32, Type::Signed32());
if (lower()) { if (lower<T>()) {
MaskShiftOperand(node, rhs_type); MaskShiftOperand(node, rhs_type);
ChangeToPureOp(node, lowering->machine()->Word32Shl()); ChangeToPureOp(node, lowering->machine()->Word32Shl());
} }
...@@ -2390,7 +2312,7 @@ class RepresentationSelector { ...@@ -2390,7 +2312,7 @@ class RepresentationSelector {
VisitBinop<T>(node, UseInfo::TruncatingWord32(), VisitBinop<T>(node, UseInfo::TruncatingWord32(),
UseInfo::TruncatingWord32(), UseInfo::TruncatingWord32(),
MachineRepresentation::kWord32); MachineRepresentation::kWord32);
if (lower()) { if (lower<T>()) {
MaskShiftOperand(node, rhs_type); MaskShiftOperand(node, rhs_type);
ChangeToPureOp(node, lowering->machine()->Word32Sar()); ChangeToPureOp(node, lowering->machine()->Word32Sar());
} }
...@@ -2402,7 +2324,7 @@ class RepresentationSelector { ...@@ -2402,7 +2324,7 @@ class RepresentationSelector {
VisitBinop<T>(node, UseInfo::TruncatingWord32(), VisitBinop<T>(node, UseInfo::TruncatingWord32(),
UseInfo::TruncatingWord32(), UseInfo::TruncatingWord32(),
MachineRepresentation::kWord32); MachineRepresentation::kWord32);
if (lower()) { if (lower<T>()) {
MaskShiftOperand(node, rhs_type); MaskShiftOperand(node, rhs_type);
ChangeToPureOp(node, lowering->machine()->Word32Sar()); ChangeToPureOp(node, lowering->machine()->Word32Sar());
} }
...@@ -2412,7 +2334,7 @@ class RepresentationSelector { ...@@ -2412,7 +2334,7 @@ class RepresentationSelector {
Type rhs_type = GetUpperBound(node->InputAt(1)); Type rhs_type = GetUpperBound(node->InputAt(1));
VisitBinop<T>(node, CheckedUseInfoAsWord32FromHint(hint), VisitBinop<T>(node, CheckedUseInfoAsWord32FromHint(hint),
MachineRepresentation::kWord32, Type::Signed32()); MachineRepresentation::kWord32, Type::Signed32());
if (lower()) { if (lower<T>()) {
MaskShiftOperand(node, rhs_type); MaskShiftOperand(node, rhs_type);
ChangeToPureOp(node, lowering->machine()->Word32Sar()); ChangeToPureOp(node, lowering->machine()->Word32Sar());
} }
...@@ -2423,7 +2345,7 @@ class RepresentationSelector { ...@@ -2423,7 +2345,7 @@ class RepresentationSelector {
VisitBinop<T>(node, UseInfo::TruncatingWord32(), VisitBinop<T>(node, UseInfo::TruncatingWord32(),
UseInfo::TruncatingWord32(), UseInfo::TruncatingWord32(),
MachineRepresentation::kWord32); MachineRepresentation::kWord32);
if (lower()) { if (lower<T>()) {
MaskShiftOperand(node, rhs_type); MaskShiftOperand(node, rhs_type);
ChangeToPureOp(node, lowering->machine()->Word32Shr()); ChangeToPureOp(node, lowering->machine()->Word32Shr());
} }
...@@ -2442,7 +2364,7 @@ class RepresentationSelector { ...@@ -2442,7 +2364,7 @@ class RepresentationSelector {
// will just be the (converted) LHS. // will just be the (converted) LHS.
VisitBinop<T>(node, CheckedUseInfoAsWord32FromHint(hint), VisitBinop<T>(node, CheckedUseInfoAsWord32FromHint(hint),
MachineRepresentation::kWord32, Type::Unsigned31()); MachineRepresentation::kWord32, Type::Unsigned31());
if (lower()) { if (lower<T>()) {
node->RemoveInput(1); node->RemoveInput(1);
NodeProperties::ChangeOp( NodeProperties::ChangeOp(
node, simplified()->CheckedUint32ToInt32(FeedbackSource())); node, simplified()->CheckedUint32ToInt32(FeedbackSource()));
...@@ -2453,7 +2375,7 @@ class RepresentationSelector { ...@@ -2453,7 +2375,7 @@ class RepresentationSelector {
VisitBinop<T>(node, UseInfo::TruncatingWord32(), VisitBinop<T>(node, UseInfo::TruncatingWord32(),
UseInfo::TruncatingWord32(), UseInfo::TruncatingWord32(),
MachineRepresentation::kWord32); MachineRepresentation::kWord32);
if (lower()) { if (lower<T>()) {
MaskShiftOperand(node, rhs_type); MaskShiftOperand(node, rhs_type);
ChangeToPureOp(node, lowering->machine()->Word32Shr()); ChangeToPureOp(node, lowering->machine()->Word32Shr());
} }
...@@ -2461,7 +2383,7 @@ class RepresentationSelector { ...@@ -2461,7 +2383,7 @@ class RepresentationSelector {
} }
VisitBinop<T>(node, CheckedUseInfoAsWord32FromHint(hint), VisitBinop<T>(node, CheckedUseInfoAsWord32FromHint(hint),
MachineRepresentation::kWord32, Type::Unsigned32()); MachineRepresentation::kWord32, Type::Unsigned32());
if (lower()) { if (lower<T>()) {
MaskShiftOperand(node, rhs_type); MaskShiftOperand(node, rhs_type);
ChangeToPureOp(node, lowering->machine()->Word32Shr()); ChangeToPureOp(node, lowering->machine()->Word32Shr());
} }
...@@ -2475,39 +2397,39 @@ class RepresentationSelector { ...@@ -2475,39 +2397,39 @@ class RepresentationSelector {
if (input_type.Is(Type::Unsigned32OrMinusZero())) { if (input_type.Is(Type::Unsigned32OrMinusZero())) {
VisitUnop<T>(node, UseInfo::TruncatingWord32(), VisitUnop<T>(node, UseInfo::TruncatingWord32(),
MachineRepresentation::kWord32); MachineRepresentation::kWord32);
if (lower()) DeferReplacement(node, node->InputAt(0)); if (lower<T>()) DeferReplacement(node, node->InputAt(0));
} else if (input_type.Is(Type::Signed32OrMinusZero())) { } else if (input_type.Is(Type::Signed32OrMinusZero())) {
VisitUnop<T>(node, UseInfo::TruncatingWord32(), VisitUnop<T>(node, UseInfo::TruncatingWord32(),
MachineRepresentation::kWord32); MachineRepresentation::kWord32);
if (lower()) DeferReplacement(node, lowering->Int32Abs(node)); if (lower<T>()) DeferReplacement(node, lowering->Int32Abs(node));
} else if (input_type.Is(type_cache_->kPositiveIntegerOrNaN)) { } else if (input_type.Is(type_cache_->kPositiveIntegerOrNaN)) {
VisitUnop<T>(node, UseInfo::TruncatingFloat64(kIdentifyZeros), VisitUnop<T>(node, UseInfo::TruncatingFloat64(kIdentifyZeros),
MachineRepresentation::kFloat64); MachineRepresentation::kFloat64);
if (lower()) DeferReplacement(node, node->InputAt(0)); if (lower<T>()) DeferReplacement(node, node->InputAt(0));
} else { } else {
VisitUnop<T>(node, UseInfo::TruncatingFloat64(kIdentifyZeros), VisitUnop<T>(node, UseInfo::TruncatingFloat64(kIdentifyZeros),
MachineRepresentation::kFloat64); MachineRepresentation::kFloat64);
if (lower()) NodeProperties::ChangeOp(node, Float64Op(node)); if (lower<T>()) NodeProperties::ChangeOp(node, Float64Op(node));
} }
return; return;
} }
case IrOpcode::kNumberClz32: { case IrOpcode::kNumberClz32: {
VisitUnop<T>(node, UseInfo::TruncatingWord32(), VisitUnop<T>(node, UseInfo::TruncatingWord32(),
MachineRepresentation::kWord32); MachineRepresentation::kWord32);
if (lower()) NodeProperties::ChangeOp(node, Uint32Op(node)); if (lower<T>()) NodeProperties::ChangeOp(node, Uint32Op(node));
return; return;
} }
case IrOpcode::kNumberImul: { case IrOpcode::kNumberImul: {
VisitBinop<T>(node, UseInfo::TruncatingWord32(), VisitBinop<T>(node, UseInfo::TruncatingWord32(),
UseInfo::TruncatingWord32(), UseInfo::TruncatingWord32(),
MachineRepresentation::kWord32); MachineRepresentation::kWord32);
if (lower()) NodeProperties::ChangeOp(node, Uint32Op(node)); if (lower<T>()) NodeProperties::ChangeOp(node, Uint32Op(node));
return; return;
} }
case IrOpcode::kNumberFround: { case IrOpcode::kNumberFround: {
VisitUnop<T>(node, UseInfo::TruncatingFloat64(), VisitUnop<T>(node, UseInfo::TruncatingFloat64(),
MachineRepresentation::kFloat32); MachineRepresentation::kFloat32);
if (lower()) NodeProperties::ChangeOp(node, Float64Op(node)); if (lower<T>()) NodeProperties::ChangeOp(node, Float64Op(node));
return; return;
} }
case IrOpcode::kNumberMax: { case IrOpcode::kNumberMax: {
...@@ -2525,7 +2447,7 @@ class RepresentationSelector { ...@@ -2525,7 +2447,7 @@ class RepresentationSelector {
rhs_type.Is(Type::Unsigned32OrMinusZero()) && rhs_type.Is(Type::Unsigned32OrMinusZero()) &&
truncation.IdentifiesZeroAndMinusZero())) { truncation.IdentifiesZeroAndMinusZero())) {
VisitWord32TruncatingBinop<T>(node); VisitWord32TruncatingBinop<T>(node);
if (lower()) { if (lower<T>()) {
lowering->DoMax(node, lowering->machine()->Uint32LessThan(), lowering->DoMax(node, lowering->machine()->Uint32LessThan(),
MachineRepresentation::kWord32); MachineRepresentation::kWord32);
} }
...@@ -2535,7 +2457,7 @@ class RepresentationSelector { ...@@ -2535,7 +2457,7 @@ class RepresentationSelector {
rhs_type.Is(Type::Signed32OrMinusZero()) && rhs_type.Is(Type::Signed32OrMinusZero()) &&
truncation.IdentifiesZeroAndMinusZero())) { truncation.IdentifiesZeroAndMinusZero())) {
VisitWord32TruncatingBinop<T>(node); VisitWord32TruncatingBinop<T>(node);
if (lower()) { if (lower<T>()) {
lowering->DoMax(node, lowering->machine()->Int32LessThan(), lowering->DoMax(node, lowering->machine()->Int32LessThan(),
MachineRepresentation::kWord32); MachineRepresentation::kWord32);
} }
...@@ -2543,7 +2465,7 @@ class RepresentationSelector { ...@@ -2543,7 +2465,7 @@ class RepresentationSelector {
lhs_type.Is(type_cache_->kSafeInteger) && lhs_type.Is(type_cache_->kSafeInteger) &&
rhs_type.Is(type_cache_->kSafeInteger)) { rhs_type.Is(type_cache_->kSafeInteger)) {
VisitInt64Binop<T>(node); VisitInt64Binop<T>(node);
if (lower()) { if (lower<T>()) {
lowering->DoMax(node, lowering->machine()->Int64LessThan(), lowering->DoMax(node, lowering->machine()->Int64LessThan(),
MachineRepresentation::kWord64); MachineRepresentation::kWord64);
} }
...@@ -2551,7 +2473,7 @@ class RepresentationSelector { ...@@ -2551,7 +2473,7 @@ class RepresentationSelector {
VisitBinop<T>(node, VisitBinop<T>(node,
UseInfo::TruncatingFloat64(truncation.identify_zeros()), UseInfo::TruncatingFloat64(truncation.identify_zeros()),
MachineRepresentation::kFloat64); MachineRepresentation::kFloat64);
if (lower()) { if (lower<T>()) {
// If the right hand side is not NaN, and the left hand side // If the right hand side is not NaN, and the left hand side
// is not NaN (or -0 if the difference between the zeros is // is not NaN (or -0 if the difference between the zeros is
// observed), we can do a simple floating point comparison here. // observed), we can do a simple floating point comparison here.
...@@ -2583,7 +2505,7 @@ class RepresentationSelector { ...@@ -2583,7 +2505,7 @@ class RepresentationSelector {
rhs_type.Is(Type::Unsigned32OrMinusZero()) && rhs_type.Is(Type::Unsigned32OrMinusZero()) &&
truncation.IdentifiesZeroAndMinusZero())) { truncation.IdentifiesZeroAndMinusZero())) {
VisitWord32TruncatingBinop<T>(node); VisitWord32TruncatingBinop<T>(node);
if (lower()) { if (lower<T>()) {
lowering->DoMin(node, lowering->machine()->Uint32LessThan(), lowering->DoMin(node, lowering->machine()->Uint32LessThan(),
MachineRepresentation::kWord32); MachineRepresentation::kWord32);
} }
...@@ -2593,7 +2515,7 @@ class RepresentationSelector { ...@@ -2593,7 +2515,7 @@ class RepresentationSelector {
rhs_type.Is(Type::Signed32OrMinusZero()) && rhs_type.Is(Type::Signed32OrMinusZero()) &&
truncation.IdentifiesZeroAndMinusZero())) { truncation.IdentifiesZeroAndMinusZero())) {
VisitWord32TruncatingBinop<T>(node); VisitWord32TruncatingBinop<T>(node);
if (lower()) { if (lower<T>()) {
lowering->DoMin(node, lowering->machine()->Int32LessThan(), lowering->DoMin(node, lowering->machine()->Int32LessThan(),
MachineRepresentation::kWord32); MachineRepresentation::kWord32);
} }
...@@ -2601,7 +2523,7 @@ class RepresentationSelector { ...@@ -2601,7 +2523,7 @@ class RepresentationSelector {
lhs_type.Is(type_cache_->kSafeInteger) && lhs_type.Is(type_cache_->kSafeInteger) &&
rhs_type.Is(type_cache_->kSafeInteger)) { rhs_type.Is(type_cache_->kSafeInteger)) {
VisitInt64Binop<T>(node); VisitInt64Binop<T>(node);
if (lower()) { if (lower<T>()) {
lowering->DoMin(node, lowering->machine()->Int64LessThan(), lowering->DoMin(node, lowering->machine()->Int64LessThan(),
MachineRepresentation::kWord64); MachineRepresentation::kWord64);
} }
...@@ -2609,7 +2531,7 @@ class RepresentationSelector { ...@@ -2609,7 +2531,7 @@ class RepresentationSelector {
VisitBinop<T>(node, VisitBinop<T>(node,
UseInfo::TruncatingFloat64(truncation.identify_zeros()), UseInfo::TruncatingFloat64(truncation.identify_zeros()),
MachineRepresentation::kFloat64); MachineRepresentation::kFloat64);
if (lower()) { if (lower<T>()) {
// If the left hand side is not NaN, and the right hand side // If the left hand side is not NaN, and the right hand side
// is not NaN (or -0 if the difference between the zeros is // is not NaN (or -0 if the difference between the zeros is
// observed), we can do a simple floating point comparison here. // observed), we can do a simple floating point comparison here.
...@@ -2631,7 +2553,7 @@ class RepresentationSelector { ...@@ -2631,7 +2553,7 @@ class RepresentationSelector {
case IrOpcode::kNumberPow: { case IrOpcode::kNumberPow: {
VisitBinop<T>(node, UseInfo::TruncatingFloat64(), VisitBinop<T>(node, UseInfo::TruncatingFloat64(),
MachineRepresentation::kFloat64); MachineRepresentation::kFloat64);
if (lower()) NodeProperties::ChangeOp(node, Float64Op(node)); if (lower<T>()) NodeProperties::ChangeOp(node, Float64Op(node));
return; return;
} }
case IrOpcode::kNumberCeil: case IrOpcode::kNumberCeil:
...@@ -2646,7 +2568,7 @@ class RepresentationSelector { ...@@ -2646,7 +2568,7 @@ class RepresentationSelector {
VisitUnop<T>(node, VisitUnop<T>(node,
UseInfo::TruncatingFloat64(truncation.identify_zeros()), UseInfo::TruncatingFloat64(truncation.identify_zeros()),
MachineRepresentation::kFloat64); MachineRepresentation::kFloat64);
if (lower()) { if (lower<T>()) {
if (input_type.Is(type_cache_->kIntegerOrMinusZeroOrNaN)) { if (input_type.Is(type_cache_->kIntegerOrMinusZeroOrNaN)) {
DeferReplacement(node, node->InputAt(0)); DeferReplacement(node, node->InputAt(0));
} else if (node->opcode() == IrOpcode::kNumberRound) { } else if (node->opcode() == IrOpcode::kNumberRound) {
...@@ -2692,18 +2614,18 @@ class RepresentationSelector { ...@@ -2692,18 +2614,18 @@ class RepresentationSelector {
case IrOpcode::kNumberTanh: { case IrOpcode::kNumberTanh: {
VisitUnop<T>(node, UseInfo::TruncatingFloat64(), VisitUnop<T>(node, UseInfo::TruncatingFloat64(),
MachineRepresentation::kFloat64); MachineRepresentation::kFloat64);
if (lower()) NodeProperties::ChangeOp(node, Float64Op(node)); if (lower<T>()) NodeProperties::ChangeOp(node, Float64Op(node));
return; return;
} }
case IrOpcode::kNumberSign: { case IrOpcode::kNumberSign: {
if (InputIs(node, Type::Signed32())) { if (InputIs(node, Type::Signed32())) {
VisitUnop<T>(node, UseInfo::TruncatingWord32(), VisitUnop<T>(node, UseInfo::TruncatingWord32(),
MachineRepresentation::kWord32); MachineRepresentation::kWord32);
if (lower()) DeferReplacement(node, lowering->Int32Sign(node)); if (lower<T>()) DeferReplacement(node, lowering->Int32Sign(node));
} else { } else {
VisitUnop<T>(node, UseInfo::TruncatingFloat64(), VisitUnop<T>(node, UseInfo::TruncatingFloat64(),
MachineRepresentation::kFloat64); MachineRepresentation::kFloat64);
if (lower()) DeferReplacement(node, lowering->Float64Sign(node)); if (lower<T>()) DeferReplacement(node, lowering->Float64Sign(node));
} }
return; return;
} }
...@@ -2713,18 +2635,18 @@ class RepresentationSelector { ...@@ -2713,18 +2635,18 @@ class RepresentationSelector {
// No need to silence anything if the input cannot be NaN. // No need to silence anything if the input cannot be NaN.
VisitUnop<T>(node, UseInfo::TruncatingFloat64(), VisitUnop<T>(node, UseInfo::TruncatingFloat64(),
MachineRepresentation::kFloat64); MachineRepresentation::kFloat64);
if (lower()) DeferReplacement(node, node->InputAt(0)); if (lower<T>()) DeferReplacement(node, node->InputAt(0));
} else { } else {
VisitUnop<T>(node, UseInfo::TruncatingFloat64(), VisitUnop<T>(node, UseInfo::TruncatingFloat64(),
MachineRepresentation::kFloat64); MachineRepresentation::kFloat64);
if (lower()) NodeProperties::ChangeOp(node, Float64Op(node)); if (lower<T>()) NodeProperties::ChangeOp(node, Float64Op(node));
} }
return; return;
} }
case IrOpcode::kNumberSqrt: { case IrOpcode::kNumberSqrt: {
VisitUnop<T>(node, UseInfo::TruncatingFloat64(), VisitUnop<T>(node, UseInfo::TruncatingFloat64(),
MachineRepresentation::kFloat64); MachineRepresentation::kFloat64);
if (lower()) NodeProperties::ChangeOp(node, Float64Op(node)); if (lower<T>()) NodeProperties::ChangeOp(node, Float64Op(node));
return; return;
} }
case IrOpcode::kNumberToBoolean: { case IrOpcode::kNumberToBoolean: {
...@@ -2737,15 +2659,15 @@ class RepresentationSelector { ...@@ -2737,15 +2659,15 @@ class RepresentationSelector {
// all of them to zero here. // all of them to zero here.
VisitUnop<T>(node, UseInfo::TruncatingWord32(), VisitUnop<T>(node, UseInfo::TruncatingWord32(),
MachineRepresentation::kBit); MachineRepresentation::kBit);
if (lower()) lowering->DoIntegral32ToBit(node); if (lower<T>()) lowering->DoIntegral32ToBit(node);
} else if (input_type.Is(Type::OrderedNumber())) { } else if (input_type.Is(Type::OrderedNumber())) {
VisitUnop<T>(node, UseInfo::TruncatingFloat64(kIdentifyZeros), VisitUnop<T>(node, UseInfo::TruncatingFloat64(kIdentifyZeros),
MachineRepresentation::kBit); MachineRepresentation::kBit);
if (lower()) lowering->DoOrderedNumberToBit(node); if (lower<T>()) lowering->DoOrderedNumberToBit(node);
} else { } else {
VisitUnop<T>(node, UseInfo::TruncatingFloat64(kIdentifyZeros), VisitUnop<T>(node, UseInfo::TruncatingFloat64(kIdentifyZeros),
MachineRepresentation::kBit); MachineRepresentation::kBit);
if (lower()) lowering->DoNumberToBit(node); if (lower<T>()) lowering->DoNumberToBit(node);
} }
return; return;
} }
...@@ -2753,7 +2675,7 @@ class RepresentationSelector { ...@@ -2753,7 +2675,7 @@ class RepresentationSelector {
// Just change representation if necessary. // Just change representation if necessary.
VisitUnop<T>(node, UseInfo::TruncatingWord32(), VisitUnop<T>(node, UseInfo::TruncatingWord32(),
MachineRepresentation::kWord32); MachineRepresentation::kWord32);
if (lower()) DeferReplacement(node, node->InputAt(0)); if (lower<T>()) DeferReplacement(node, node->InputAt(0));
return; return;
} }
case IrOpcode::kNumberToString: { case IrOpcode::kNumberToString: {
...@@ -2765,7 +2687,7 @@ class RepresentationSelector { ...@@ -2765,7 +2687,7 @@ class RepresentationSelector {
// Just change representation if necessary. // Just change representation if necessary.
VisitUnop<T>(node, UseInfo::TruncatingWord32(), VisitUnop<T>(node, UseInfo::TruncatingWord32(),
MachineRepresentation::kWord32); MachineRepresentation::kWord32);
if (lower()) DeferReplacement(node, node->InputAt(0)); if (lower<T>()) DeferReplacement(node, node->InputAt(0));
return; return;
} }
case IrOpcode::kNumberToUint8Clamped: { case IrOpcode::kNumberToUint8Clamped: {
...@@ -2773,29 +2695,29 @@ class RepresentationSelector { ...@@ -2773,29 +2695,29 @@ class RepresentationSelector {
if (input_type.Is(type_cache_->kUint8OrMinusZeroOrNaN)) { if (input_type.Is(type_cache_->kUint8OrMinusZeroOrNaN)) {
VisitUnop<T>(node, UseInfo::TruncatingWord32(), VisitUnop<T>(node, UseInfo::TruncatingWord32(),
MachineRepresentation::kWord32); MachineRepresentation::kWord32);
if (lower()) DeferReplacement(node, node->InputAt(0)); if (lower<T>()) DeferReplacement(node, node->InputAt(0));
} else if (input_type.Is(Type::Unsigned32OrMinusZeroOrNaN())) { } else if (input_type.Is(Type::Unsigned32OrMinusZeroOrNaN())) {
VisitUnop<T>(node, UseInfo::TruncatingWord32(), VisitUnop<T>(node, UseInfo::TruncatingWord32(),
MachineRepresentation::kWord32); MachineRepresentation::kWord32);
if (lower()) lowering->DoUnsigned32ToUint8Clamped(node); if (lower<T>()) lowering->DoUnsigned32ToUint8Clamped(node);
} else if (input_type.Is(Type::Signed32OrMinusZeroOrNaN())) { } else if (input_type.Is(Type::Signed32OrMinusZeroOrNaN())) {
VisitUnop<T>(node, UseInfo::TruncatingWord32(), VisitUnop<T>(node, UseInfo::TruncatingWord32(),
MachineRepresentation::kWord32); MachineRepresentation::kWord32);
if (lower()) lowering->DoSigned32ToUint8Clamped(node); if (lower<T>()) lowering->DoSigned32ToUint8Clamped(node);
} else if (input_type.Is(type_cache_->kIntegerOrMinusZeroOrNaN)) { } else if (input_type.Is(type_cache_->kIntegerOrMinusZeroOrNaN)) {
VisitUnop<T>(node, UseInfo::TruncatingFloat64(), VisitUnop<T>(node, UseInfo::TruncatingFloat64(),
MachineRepresentation::kFloat64); MachineRepresentation::kFloat64);
if (lower()) lowering->DoIntegerToUint8Clamped(node); if (lower<T>()) lowering->DoIntegerToUint8Clamped(node);
} else { } else {
VisitUnop<T>(node, UseInfo::TruncatingFloat64(), VisitUnop<T>(node, UseInfo::TruncatingFloat64(),
MachineRepresentation::kFloat64); MachineRepresentation::kFloat64);
if (lower()) lowering->DoNumberToUint8Clamped(node); if (lower<T>()) lowering->DoNumberToUint8Clamped(node);
} }
return; return;
} }
case IrOpcode::kReferenceEqual: { case IrOpcode::kReferenceEqual: {
VisitBinop<T>(node, UseInfo::AnyTagged(), MachineRepresentation::kBit); VisitBinop<T>(node, UseInfo::AnyTagged(), MachineRepresentation::kBit);
if (lower()) { if (lower<T>()) {
if (COMPRESS_POINTERS_BOOL) { if (COMPRESS_POINTERS_BOOL) {
NodeProperties::ChangeOp(node, lowering->machine()->Word32Equal()); NodeProperties::ChangeOp(node, lowering->machine()->Word32Equal());
} else { } else {
...@@ -2814,7 +2736,7 @@ class RepresentationSelector { ...@@ -2814,7 +2736,7 @@ class RepresentationSelector {
if (BothInputsAre(node, Type::Number())) { if (BothInputsAre(node, Type::Number())) {
VisitBinop<T>(node, UseInfo::TruncatingFloat64(), VisitBinop<T>(node, UseInfo::TruncatingFloat64(),
MachineRepresentation::kBit); MachineRepresentation::kBit);
if (lower()) { if (lower<T>()) {
NodeProperties::ChangeOp(node, NodeProperties::ChangeOp(node,
lowering->simplified()->NumberSameValue()); lowering->simplified()->NumberSameValue());
} }
...@@ -2840,14 +2762,14 @@ class RepresentationSelector { ...@@ -2840,14 +2762,14 @@ class RepresentationSelector {
VisitBinop<T>( VisitBinop<T>(
node, UseInfo::CheckedBigIntTruncatingWord64(FeedbackSource{}), node, UseInfo::CheckedBigIntTruncatingWord64(FeedbackSource{}),
MachineRepresentation::kWord64); MachineRepresentation::kWord64);
if (lower()) { if (lower<T>()) {
ChangeToPureOp(node, lowering->machine()->Int64Add()); ChangeToPureOp(node, lowering->machine()->Int64Add());
} }
} else { } else {
VisitBinop<T>(node, VisitBinop<T>(node,
UseInfo::CheckedBigIntAsTaggedPointer(FeedbackSource{}), UseInfo::CheckedBigIntAsTaggedPointer(FeedbackSource{}),
MachineRepresentation::kTaggedPointer); MachineRepresentation::kTaggedPointer);
if (lower()) { if (lower<T>()) {
NodeProperties::ChangeOp(node, lowering->simplified()->BigIntAdd()); NodeProperties::ChangeOp(node, lowering->simplified()->BigIntAdd());
} }
} }
...@@ -2858,14 +2780,14 @@ class RepresentationSelector { ...@@ -2858,14 +2780,14 @@ class RepresentationSelector {
VisitBinop<T>( VisitBinop<T>(
node, UseInfo::CheckedBigIntTruncatingWord64(FeedbackSource{}), node, UseInfo::CheckedBigIntTruncatingWord64(FeedbackSource{}),
MachineRepresentation::kWord64); MachineRepresentation::kWord64);
if (lower()) { if (lower<T>()) {
ChangeToPureOp(node, lowering->machine()->Int64Sub()); ChangeToPureOp(node, lowering->machine()->Int64Sub());
} }
} else { } else {
VisitBinop<T>(node, VisitBinop<T>(node,
UseInfo::CheckedBigIntAsTaggedPointer(FeedbackSource{}), UseInfo::CheckedBigIntAsTaggedPointer(FeedbackSource{}),
MachineRepresentation::kTaggedPointer); MachineRepresentation::kTaggedPointer);
if (lower()) { if (lower<T>()) {
NodeProperties::ChangeOp(node, NodeProperties::ChangeOp(node,
lowering->simplified()->BigIntSubtract()); lowering->simplified()->BigIntSubtract());
} }
...@@ -2877,7 +2799,7 @@ class RepresentationSelector { ...@@ -2877,7 +2799,7 @@ class RepresentationSelector {
VisitUnop<T>(node, VisitUnop<T>(node,
UseInfo::CheckedBigIntTruncatingWord64(FeedbackSource{}), UseInfo::CheckedBigIntTruncatingWord64(FeedbackSource{}),
MachineRepresentation::kWord64); MachineRepresentation::kWord64);
if (lower()) { if (lower<T>()) {
ChangeUnaryToPureBinaryOp(node, lowering->machine()->Int64Sub(), 0, ChangeUnaryToPureBinaryOp(node, lowering->machine()->Int64Sub(), 0,
jsgraph_->Int64Constant(0)); jsgraph_->Int64Constant(0));
} }
...@@ -2885,7 +2807,7 @@ class RepresentationSelector { ...@@ -2885,7 +2807,7 @@ class RepresentationSelector {
VisitUnop<T>(node, VisitUnop<T>(node,
UseInfo::CheckedBigIntAsTaggedPointer(FeedbackSource{}), UseInfo::CheckedBigIntAsTaggedPointer(FeedbackSource{}),
MachineRepresentation::kTaggedPointer); MachineRepresentation::kTaggedPointer);
if (lower()) { if (lower<T>()) {
ChangeToPureOp(node, lowering->simplified()->BigIntNegate()); ChangeToPureOp(node, lowering->simplified()->BigIntNegate());
} }
} }
...@@ -2976,7 +2898,7 @@ class RepresentationSelector { ...@@ -2976,7 +2898,7 @@ class RepresentationSelector {
node, UseInfo::CheckedHeapObjectAsTaggedPointer(FeedbackSource()), node, UseInfo::CheckedHeapObjectAsTaggedPointer(FeedbackSource()),
MachineRepresentation::kTaggedPointer); MachineRepresentation::kTaggedPointer);
} }
if (lower()) DeferReplacement(node, node->InputAt(0)); if (lower<T>()) DeferReplacement(node, node->InputAt(0));
return; return;
} }
case IrOpcode::kCheckIf: { case IrOpcode::kCheckIf: {
...@@ -3020,7 +2942,7 @@ class RepresentationSelector { ...@@ -3020,7 +2942,7 @@ class RepresentationSelector {
UseInfo::CheckedSignedSmallAsTaggedSigned(params.feedback()), UseInfo::CheckedSignedSmallAsTaggedSigned(params.feedback()),
MachineRepresentation::kTaggedSigned); MachineRepresentation::kTaggedSigned);
} }
if (lower()) DeferReplacement(node, node->InputAt(0)); if (lower<T>()) DeferReplacement(node, node->InputAt(0));
return; return;
} }
case IrOpcode::kCheckString: { case IrOpcode::kCheckString: {
...@@ -3028,7 +2950,7 @@ class RepresentationSelector { ...@@ -3028,7 +2950,7 @@ class RepresentationSelector {
if (InputIs(node, Type::String())) { if (InputIs(node, Type::String())) {
VisitUnop<T>(node, UseInfo::AnyTagged(), VisitUnop<T>(node, UseInfo::AnyTagged(),
MachineRepresentation::kTaggedPointer); MachineRepresentation::kTaggedPointer);
if (lower()) DeferReplacement(node, node->InputAt(0)); if (lower<T>()) DeferReplacement(node, node->InputAt(0));
} else { } else {
VisitUnop<T>( VisitUnop<T>(
node, node,
...@@ -3095,7 +3017,7 @@ class RepresentationSelector { ...@@ -3095,7 +3017,7 @@ class RepresentationSelector {
node, 1, TruncatingUseInfoFromRepresentation(field_representation)); node, 1, TruncatingUseInfoFromRepresentation(field_representation));
ProcessRemainingInputs<T>(node, 2); ProcessRemainingInputs<T>(node, 2);
SetOutput<T>(node, MachineRepresentation::kNone); SetOutput<T>(node, MachineRepresentation::kNone);
if (lower()) { if (lower<T>()) {
if (write_barrier_kind < access.write_barrier_kind) { if (write_barrier_kind < access.write_barrier_kind) {
access.write_barrier_kind = write_barrier_kind; access.write_barrier_kind = write_barrier_kind;
NodeProperties::ChangeOp( NodeProperties::ChangeOp(
...@@ -3138,7 +3060,7 @@ class RepresentationSelector { ...@@ -3138,7 +3060,7 @@ class RepresentationSelector {
element_representation)); // value element_representation)); // value
ProcessRemainingInputs<T>(node, 3); ProcessRemainingInputs<T>(node, 3);
SetOutput<T>(node, MachineRepresentation::kNone); SetOutput<T>(node, MachineRepresentation::kNone);
if (lower()) { if (lower<T>()) {
if (write_barrier_kind < access.write_barrier_kind) { if (write_barrier_kind < access.write_barrier_kind) {
access.write_barrier_kind = write_barrier_kind; access.write_barrier_kind = write_barrier_kind;
NodeProperties::ChangeOp( NodeProperties::ChangeOp(
...@@ -3160,13 +3082,13 @@ class RepresentationSelector { ...@@ -3160,13 +3082,13 @@ class RepresentationSelector {
if (value_type.Is(Type::SignedSmall())) { if (value_type.Is(Type::SignedSmall())) {
ProcessInput<T>(node, 2, UseInfo::TruncatingWord32()); // value ProcessInput<T>(node, 2, UseInfo::TruncatingWord32()); // value
if (lower()) { if (lower<T>()) {
NodeProperties::ChangeOp(node, NodeProperties::ChangeOp(node,
simplified()->StoreSignedSmallElement()); simplified()->StoreSignedSmallElement());
} }
} else if (value_type.Is(Type::Number())) { } else if (value_type.Is(Type::Number())) {
ProcessInput<T>(node, 2, UseInfo::TruncatingFloat64()); // value ProcessInput<T>(node, 2, UseInfo::TruncatingFloat64()); // value
if (lower()) { if (lower<T>()) {
Handle<Map> double_map = DoubleMapParameterOf(node->op()); Handle<Map> double_map = DoubleMapParameterOf(node->op());
NodeProperties::ChangeOp( NodeProperties::ChangeOp(
node, node,
...@@ -3174,7 +3096,7 @@ class RepresentationSelector { ...@@ -3174,7 +3096,7 @@ class RepresentationSelector {
} }
} else if (value_type.Is(Type::NonNumber())) { } else if (value_type.Is(Type::NonNumber())) {
ProcessInput<T>(node, 2, UseInfo::AnyTagged()); // value ProcessInput<T>(node, 2, UseInfo::AnyTagged()); // value
if (lower()) { if (lower<T>()) {
Handle<Map> fast_map = FastMapParameterOf(node->op()); Handle<Map> fast_map = FastMapParameterOf(node->op());
NodeProperties::ChangeOp( NodeProperties::ChangeOp(
node, simplified()->TransitionAndStoreNonNumberElement( node, simplified()->TransitionAndStoreNonNumberElement(
...@@ -3240,7 +3162,7 @@ class RepresentationSelector { ...@@ -3240,7 +3162,7 @@ class RepresentationSelector {
Type input_type = TypeOf(node->InputAt(0)); Type input_type = TypeOf(node->InputAt(0));
VisitBinop<T>(node, UseInfo::AnyTagged(), VisitBinop<T>(node, UseInfo::AnyTagged(),
MachineRepresentation::kTaggedPointer); MachineRepresentation::kTaggedPointer);
if (lower()) { if (lower<T>()) {
// Try to optimize the {node} based on the input type. // Try to optimize the {node} based on the input type.
if (input_type.Is(Type::Receiver())) { if (input_type.Is(Type::Receiver())) {
DeferReplacement(node, node->InputAt(0)); DeferReplacement(node, node->InputAt(0));
...@@ -3257,22 +3179,22 @@ class RepresentationSelector { ...@@ -3257,22 +3179,22 @@ class RepresentationSelector {
case IrOpcode::kPlainPrimitiveToNumber: { case IrOpcode::kPlainPrimitiveToNumber: {
if (InputIs(node, Type::Boolean())) { if (InputIs(node, Type::Boolean())) {
VisitUnop<T>(node, UseInfo::Bool(), MachineRepresentation::kWord32); VisitUnop<T>(node, UseInfo::Bool(), MachineRepresentation::kWord32);
if (lower()) DeferReplacement(node, node->InputAt(0)); if (lower<T>()) DeferReplacement(node, node->InputAt(0));
} else if (InputIs(node, Type::String())) { } else if (InputIs(node, Type::String())) {
VisitUnop<T>(node, UseInfo::AnyTagged(), VisitUnop<T>(node, UseInfo::AnyTagged(),
MachineRepresentation::kTagged); MachineRepresentation::kTagged);
if (lower()) { if (lower<T>()) {
NodeProperties::ChangeOp(node, simplified()->StringToNumber()); NodeProperties::ChangeOp(node, simplified()->StringToNumber());
} }
} else if (truncation.IsUsedAsWord32()) { } else if (truncation.IsUsedAsWord32()) {
if (InputIs(node, Type::NumberOrOddball())) { if (InputIs(node, Type::NumberOrOddball())) {
VisitUnop<T>(node, UseInfo::TruncatingWord32(), VisitUnop<T>(node, UseInfo::TruncatingWord32(),
MachineRepresentation::kWord32); MachineRepresentation::kWord32);
if (lower()) DeferReplacement(node, node->InputAt(0)); if (lower<T>()) DeferReplacement(node, node->InputAt(0));
} else { } else {
VisitUnop<T>(node, UseInfo::AnyTagged(), VisitUnop<T>(node, UseInfo::AnyTagged(),
MachineRepresentation::kWord32); MachineRepresentation::kWord32);
if (lower()) { if (lower<T>()) {
NodeProperties::ChangeOp(node, NodeProperties::ChangeOp(node,
simplified()->PlainPrimitiveToWord32()); simplified()->PlainPrimitiveToWord32());
} }
...@@ -3281,11 +3203,11 @@ class RepresentationSelector { ...@@ -3281,11 +3203,11 @@ class RepresentationSelector {
if (InputIs(node, Type::NumberOrOddball())) { if (InputIs(node, Type::NumberOrOddball())) {
VisitUnop<T>(node, UseInfo::TruncatingFloat64(), VisitUnop<T>(node, UseInfo::TruncatingFloat64(),
MachineRepresentation::kFloat64); MachineRepresentation::kFloat64);
if (lower()) DeferReplacement(node, node->InputAt(0)); if (lower<T>()) DeferReplacement(node, node->InputAt(0));
} else { } else {
VisitUnop<T>(node, UseInfo::AnyTagged(), VisitUnop<T>(node, UseInfo::AnyTagged(),
MachineRepresentation::kFloat64); MachineRepresentation::kFloat64);
if (lower()) { if (lower<T>()) {
NodeProperties::ChangeOp(node, NodeProperties::ChangeOp(node,
simplified()->PlainPrimitiveToFloat64()); simplified()->PlainPrimitiveToFloat64());
} }
...@@ -3314,7 +3236,7 @@ class RepresentationSelector { ...@@ -3314,7 +3236,7 @@ class RepresentationSelector {
MachineRepresentation::kFloat64); MachineRepresentation::kFloat64);
break; break;
} }
if (lower()) DeferReplacement(node, node->InputAt(0)); if (lower<T>()) DeferReplacement(node, node->InputAt(0));
return; return;
} }
case IrOpcode::kObjectIsArrayBufferView: { case IrOpcode::kObjectIsArrayBufferView: {
...@@ -3343,18 +3265,18 @@ class RepresentationSelector { ...@@ -3343,18 +3265,18 @@ class RepresentationSelector {
Type const input_type = GetUpperBound(node->InputAt(0)); Type const input_type = GetUpperBound(node->InputAt(0));
if (input_type.Is(type_cache_->kSafeInteger)) { if (input_type.Is(type_cache_->kSafeInteger)) {
VisitUnop<T>(node, UseInfo::None(), MachineRepresentation::kBit); VisitUnop<T>(node, UseInfo::None(), MachineRepresentation::kBit);
if (lower()) { if (lower<T>()) {
DeferReplacement(node, lowering->jsgraph()->Int32Constant(1)); DeferReplacement(node, lowering->jsgraph()->Int32Constant(1));
} }
} else if (!input_type.Maybe(Type::Number())) { } else if (!input_type.Maybe(Type::Number())) {
VisitUnop<T>(node, UseInfo::Any(), MachineRepresentation::kBit); VisitUnop<T>(node, UseInfo::Any(), MachineRepresentation::kBit);
if (lower()) { if (lower<T>()) {
DeferReplacement(node, lowering->jsgraph()->Int32Constant(0)); DeferReplacement(node, lowering->jsgraph()->Int32Constant(0));
} }
} else if (input_type.Is(Type::Number())) { } else if (input_type.Is(Type::Number())) {
VisitUnop<T>(node, UseInfo::TruncatingFloat64(), VisitUnop<T>(node, UseInfo::TruncatingFloat64(),
MachineRepresentation::kBit); MachineRepresentation::kBit);
if (lower()) { if (lower<T>()) {
NodeProperties::ChangeOp(node, NodeProperties::ChangeOp(node,
lowering->simplified()->NumberIsFinite()); lowering->simplified()->NumberIsFinite());
} }
...@@ -3372,18 +3294,18 @@ class RepresentationSelector { ...@@ -3372,18 +3294,18 @@ class RepresentationSelector {
Type const input_type = GetUpperBound(node->InputAt(0)); Type const input_type = GetUpperBound(node->InputAt(0));
if (input_type.Is(type_cache_->kSafeInteger)) { if (input_type.Is(type_cache_->kSafeInteger)) {
VisitUnop<T>(node, UseInfo::None(), MachineRepresentation::kBit); VisitUnop<T>(node, UseInfo::None(), MachineRepresentation::kBit);
if (lower()) { if (lower<T>()) {
DeferReplacement(node, lowering->jsgraph()->Int32Constant(1)); DeferReplacement(node, lowering->jsgraph()->Int32Constant(1));
} }
} else if (!input_type.Maybe(Type::Number())) { } else if (!input_type.Maybe(Type::Number())) {
VisitUnop<T>(node, UseInfo::Any(), MachineRepresentation::kBit); VisitUnop<T>(node, UseInfo::Any(), MachineRepresentation::kBit);
if (lower()) { if (lower<T>()) {
DeferReplacement(node, lowering->jsgraph()->Int32Constant(0)); DeferReplacement(node, lowering->jsgraph()->Int32Constant(0));
} }
} else if (input_type.Is(Type::Number())) { } else if (input_type.Is(Type::Number())) {
VisitUnop<T>(node, UseInfo::TruncatingFloat64(), VisitUnop<T>(node, UseInfo::TruncatingFloat64(),
MachineRepresentation::kBit); MachineRepresentation::kBit);
if (lower()) { if (lower<T>()) {
NodeProperties::ChangeOp( NodeProperties::ChangeOp(
node, lowering->simplified()->NumberIsSafeInteger()); node, lowering->simplified()->NumberIsSafeInteger());
} }
...@@ -3399,18 +3321,18 @@ class RepresentationSelector { ...@@ -3399,18 +3321,18 @@ class RepresentationSelector {
Type const input_type = GetUpperBound(node->InputAt(0)); Type const input_type = GetUpperBound(node->InputAt(0));
if (input_type.Is(type_cache_->kSafeInteger)) { if (input_type.Is(type_cache_->kSafeInteger)) {
VisitUnop<T>(node, UseInfo::None(), MachineRepresentation::kBit); VisitUnop<T>(node, UseInfo::None(), MachineRepresentation::kBit);
if (lower()) { if (lower<T>()) {
DeferReplacement(node, lowering->jsgraph()->Int32Constant(1)); DeferReplacement(node, lowering->jsgraph()->Int32Constant(1));
} }
} else if (!input_type.Maybe(Type::Number())) { } else if (!input_type.Maybe(Type::Number())) {
VisitUnop<T>(node, UseInfo::Any(), MachineRepresentation::kBit); VisitUnop<T>(node, UseInfo::Any(), MachineRepresentation::kBit);
if (lower()) { if (lower<T>()) {
DeferReplacement(node, lowering->jsgraph()->Int32Constant(0)); DeferReplacement(node, lowering->jsgraph()->Int32Constant(0));
} }
} else if (input_type.Is(Type::Number())) { } else if (input_type.Is(Type::Number())) {
VisitUnop<T>(node, UseInfo::TruncatingFloat64(), VisitUnop<T>(node, UseInfo::TruncatingFloat64(),
MachineRepresentation::kBit); MachineRepresentation::kBit);
if (lower()) { if (lower<T>()) {
NodeProperties::ChangeOp(node, NodeProperties::ChangeOp(node,
lowering->simplified()->NumberIsInteger()); lowering->simplified()->NumberIsInteger());
} }
...@@ -3428,18 +3350,18 @@ class RepresentationSelector { ...@@ -3428,18 +3350,18 @@ class RepresentationSelector {
Type const input_type = GetUpperBound(node->InputAt(0)); Type const input_type = GetUpperBound(node->InputAt(0));
if (input_type.Is(Type::MinusZero())) { if (input_type.Is(Type::MinusZero())) {
VisitUnop<T>(node, UseInfo::None(), MachineRepresentation::kBit); VisitUnop<T>(node, UseInfo::None(), MachineRepresentation::kBit);
if (lower()) { if (lower<T>()) {
DeferReplacement(node, lowering->jsgraph()->Int32Constant(1)); DeferReplacement(node, lowering->jsgraph()->Int32Constant(1));
} }
} else if (!input_type.Maybe(Type::MinusZero())) { } else if (!input_type.Maybe(Type::MinusZero())) {
VisitUnop<T>(node, UseInfo::Any(), MachineRepresentation::kBit); VisitUnop<T>(node, UseInfo::Any(), MachineRepresentation::kBit);
if (lower()) { if (lower<T>()) {
DeferReplacement(node, lowering->jsgraph()->Int32Constant(0)); DeferReplacement(node, lowering->jsgraph()->Int32Constant(0));
} }
} else if (input_type.Is(Type::Number())) { } else if (input_type.Is(Type::Number())) {
VisitUnop<T>(node, UseInfo::TruncatingFloat64(), VisitUnop<T>(node, UseInfo::TruncatingFloat64(),
MachineRepresentation::kBit); MachineRepresentation::kBit);
if (lower()) { if (lower<T>()) {
NodeProperties::ChangeOp(node, simplified()->NumberIsMinusZero()); NodeProperties::ChangeOp(node, simplified()->NumberIsMinusZero());
} }
} else { } else {
...@@ -3451,18 +3373,18 @@ class RepresentationSelector { ...@@ -3451,18 +3373,18 @@ class RepresentationSelector {
Type const input_type = GetUpperBound(node->InputAt(0)); Type const input_type = GetUpperBound(node->InputAt(0));
if (input_type.Is(Type::NaN())) { if (input_type.Is(Type::NaN())) {
VisitUnop<T>(node, UseInfo::None(), MachineRepresentation::kBit); VisitUnop<T>(node, UseInfo::None(), MachineRepresentation::kBit);
if (lower()) { if (lower<T>()) {
DeferReplacement(node, lowering->jsgraph()->Int32Constant(1)); DeferReplacement(node, lowering->jsgraph()->Int32Constant(1));
} }
} else if (!input_type.Maybe(Type::NaN())) { } else if (!input_type.Maybe(Type::NaN())) {
VisitUnop<T>(node, UseInfo::Any(), MachineRepresentation::kBit); VisitUnop<T>(node, UseInfo::Any(), MachineRepresentation::kBit);
if (lower()) { if (lower<T>()) {
DeferReplacement(node, lowering->jsgraph()->Int32Constant(0)); DeferReplacement(node, lowering->jsgraph()->Int32Constant(0));
} }
} else if (input_type.Is(Type::Number())) { } else if (input_type.Is(Type::Number())) {
VisitUnop<T>(node, UseInfo::TruncatingFloat64(), VisitUnop<T>(node, UseInfo::TruncatingFloat64(),
MachineRepresentation::kBit); MachineRepresentation::kBit);
if (lower()) { if (lower<T>()) {
NodeProperties::ChangeOp(node, simplified()->NumberIsNaN()); NodeProperties::ChangeOp(node, simplified()->NumberIsNaN());
} }
} else { } else {
...@@ -3536,14 +3458,14 @@ class RepresentationSelector { ...@@ -3536,14 +3458,14 @@ class RepresentationSelector {
if (truncation.TruncatesOddballAndBigIntToNumber()) { if (truncation.TruncatesOddballAndBigIntToNumber()) {
VisitUnop<T>(node, UseInfo::TruncatingFloat64(), VisitUnop<T>(node, UseInfo::TruncatingFloat64(),
MachineRepresentation::kFloat64); MachineRepresentation::kFloat64);
if (lower()) DeferReplacement(node, node->InputAt(0)); if (lower<T>()) DeferReplacement(node, node->InputAt(0));
return; return;
} }
} }
VisitUnop<T>( VisitUnop<T>(
node, UseInfo(MachineRepresentation::kFloat64, Truncation::Any()), node, UseInfo(MachineRepresentation::kFloat64, Truncation::Any()),
MachineRepresentation::kFloat64, Type::Number()); MachineRepresentation::kFloat64, Type::Number());
if (lower() && input_type.Is(Type::Number())) { if (lower<T>() && input_type.Is(Type::Number())) {
DeferReplacement(node, node->InputAt(0)); DeferReplacement(node, node->InputAt(0));
} }
return; return;
...@@ -3565,17 +3487,17 @@ class RepresentationSelector { ...@@ -3565,17 +3487,17 @@ class RepresentationSelector {
// Propagate the Word32 truncation. // Propagate the Word32 truncation.
VisitUnop<T>(node, UseInfo::TruncatingWord32(), VisitUnop<T>(node, UseInfo::TruncatingWord32(),
MachineRepresentation::kWord32); MachineRepresentation::kWord32);
if (lower()) DeferReplacement(node, node->InputAt(0)); if (lower<T>()) DeferReplacement(node, node->InputAt(0));
} else if (InputIs(node, Type::NumberOrOddball()) && } else if (InputIs(node, Type::NumberOrOddball()) &&
truncation.TruncatesOddballAndBigIntToNumber()) { truncation.TruncatesOddballAndBigIntToNumber()) {
// Propagate the Float64 truncation. // Propagate the Float64 truncation.
VisitUnop<T>(node, UseInfo::TruncatingFloat64(), VisitUnop<T>(node, UseInfo::TruncatingFloat64(),
MachineRepresentation::kFloat64); MachineRepresentation::kFloat64);
if (lower()) DeferReplacement(node, node->InputAt(0)); if (lower<T>()) DeferReplacement(node, node->InputAt(0));
} else if (InputIs(node, Type::NonInternal())) { } else if (InputIs(node, Type::NonInternal())) {
VisitUnop<T>(node, UseInfo::AnyTagged(), VisitUnop<T>(node, UseInfo::AnyTagged(),
MachineRepresentation::kTagged); MachineRepresentation::kTagged);
if (lower()) DeferReplacement(node, node->InputAt(0)); if (lower<T>()) DeferReplacement(node, node->InputAt(0));
} else { } else {
// TODO(turbofan): Add a (Tagged) truncation that identifies hole // TODO(turbofan): Add a (Tagged) truncation that identifies hole
// and undefined, i.e. for a[i] === obj cases. // and undefined, i.e. for a[i] === obj cases.
...@@ -3623,11 +3545,11 @@ class RepresentationSelector { ...@@ -3623,11 +3545,11 @@ class RepresentationSelector {
VisitInputs<T>(node); VisitInputs<T>(node);
return SetOutput<T>(node, MachineRepresentation::kTaggedPointer); return SetOutput<T>(node, MachineRepresentation::kTaggedPointer);
case IrOpcode::kFrameState: case IrOpcode::kFrameState:
return VisitFrameState(node); return VisitFrameState<T>(node);
case IrOpcode::kStateValues: case IrOpcode::kStateValues:
return VisitStateValues(node); return VisitStateValues<T>(node);
case IrOpcode::kObjectState: case IrOpcode::kObjectState:
return VisitObjectState(node); return VisitObjectState<T>(node);
case IrOpcode::kObjectId: case IrOpcode::kObjectId:
return SetOutput<T>(node, MachineRepresentation::kTaggedPointer); return SetOutput<T>(node, MachineRepresentation::kTaggedPointer);
...@@ -3641,9 +3563,9 @@ class RepresentationSelector { ...@@ -3641,9 +3563,9 @@ class RepresentationSelector {
// Here we pretend that the input has the sigma's type for the // Here we pretend that the input has the sigma's type for the
// conversion. // conversion.
UseInfo use(representation, truncation); UseInfo use(representation, truncation);
if (propagate()) { if (propagate<T>()) {
EnqueueInput<T>(node, 0, use); EnqueueInput<T>(node, 0, use);
} else if (lower()) { } else if (lower<T>()) {
ConvertInput(node, 0, use, type); ConvertInput(node, 0, use, type);
} }
ProcessRemainingInputs<T>(node, 1); ProcessRemainingInputs<T>(node, 1);
...@@ -3661,7 +3583,7 @@ class RepresentationSelector { ...@@ -3661,7 +3583,7 @@ class RepresentationSelector {
return SetOutput<T>(node, MachineRepresentation::kTaggedPointer); return SetOutput<T>(node, MachineRepresentation::kTaggedPointer);
case IrOpcode::kReturn: case IrOpcode::kReturn:
VisitReturn(node); VisitReturn<T>(node);
// Assume the output is tagged. // Assume the output is tagged.
return SetOutput<T>(node, MachineRepresentation::kTagged); return SetOutput<T>(node, MachineRepresentation::kTagged);
...@@ -3670,7 +3592,7 @@ class RepresentationSelector { ...@@ -3670,7 +3592,7 @@ class RepresentationSelector {
if (key_type.Is(Type::Signed32OrMinusZero())) { if (key_type.Is(Type::Signed32OrMinusZero())) {
VisitBinop<T>(node, UseInfo::AnyTagged(), UseInfo::TruncatingWord32(), VisitBinop<T>(node, UseInfo::AnyTagged(), UseInfo::TruncatingWord32(),
MachineType::PointerRepresentation()); MachineType::PointerRepresentation());
if (lower()) { if (lower<T>()) {
NodeProperties::ChangeOp( NodeProperties::ChangeOp(
node, node,
lowering->simplified()->FindOrderedHashMapEntryForInt32Key()); lowering->simplified()->FindOrderedHashMapEntryForInt32Key());
...@@ -3683,7 +3605,7 @@ class RepresentationSelector { ...@@ -3683,7 +3605,7 @@ class RepresentationSelector {
} }
case IrOpcode::kFastApiCall: { case IrOpcode::kFastApiCall: {
VisitFastApiCall(node); VisitFastApiCall<T>(node);
return; return;
} }
...@@ -3823,7 +3745,6 @@ class RepresentationSelector { ...@@ -3823,7 +3745,6 @@ class RepresentationSelector {
#endif // DEBUG #endif // DEBUG
NodeVector nodes_; // collected nodes NodeVector nodes_; // collected nodes
NodeVector replacements_; // replacements to be done after lowering NodeVector replacements_; // replacements to be done after lowering
Phase phase_; // current phase of algorithm
RepresentationChanger* changer_; // for inserting representation changes RepresentationChanger* changer_; // for inserting representation changes
ZoneQueue<Node*> queue_; // queue for traversing the graph ZoneQueue<Node*> queue_; // queue for traversing the graph
...@@ -3924,7 +3845,7 @@ void RepresentationSelector::ProcessInput<PROPAGATE>(Node* node, int index, ...@@ -3924,7 +3845,7 @@ void RepresentationSelector::ProcessInput<PROPAGATE>(Node* node, int index,
DCHECK_IMPLIES(use.type_check() != TypeCheckKind::kNone, DCHECK_IMPLIES(use.type_check() != TypeCheckKind::kNone,
!node->op()->HasProperty(Operator::kNoDeopt) && !node->op()->HasProperty(Operator::kNoDeopt) &&
node->op()->EffectInputCount() > 0); node->op()->EffectInputCount() > 0);
EnqueueInput(node, index, use); EnqueueInput<PROPAGATE>(node, index, use);
} }
template <> template <>
...@@ -3944,24 +3865,6 @@ void RepresentationSelector::ProcessInput<LOWER>(Node* node, int index, ...@@ -3944,24 +3865,6 @@ void RepresentationSelector::ProcessInput<LOWER>(Node* node, int index,
ConvertInput(node, index, use); ConvertInput(node, index, use);
} }
// TODO(solanes): Remove when all uses are templated.
void RepresentationSelector::ProcessInput(Node* node, int index, UseInfo use) {
DCHECK_IMPLIES(use.type_check() != TypeCheckKind::kNone,
!node->op()->HasProperty(Operator::kNoDeopt) &&
node->op()->EffectInputCount() > 0);
switch (phase_) {
case PROPAGATE:
EnqueueInput<PROPAGATE>(node, index, use);
break;
case RETYPE:
break;
case LOWER:
ConvertInput(node, index, use);
break;
}
}
template <> template <>
void RepresentationSelector::ProcessRemainingInputs<PROPAGATE>(Node* node, void RepresentationSelector::ProcessRemainingInputs<PROPAGATE>(Node* node,
int index) { int index) {
...@@ -3969,11 +3872,11 @@ void RepresentationSelector::ProcessRemainingInputs<PROPAGATE>(Node* node, ...@@ -3969,11 +3872,11 @@ void RepresentationSelector::ProcessRemainingInputs<PROPAGATE>(Node* node,
DCHECK_GE(index, NodeProperties::PastContextIndex(node)); DCHECK_GE(index, NodeProperties::PastContextIndex(node));
for (int i = std::max(index, NodeProperties::FirstEffectIndex(node)); for (int i = std::max(index, NodeProperties::FirstEffectIndex(node));
i < NodeProperties::PastEffectIndex(node); ++i) { i < NodeProperties::PastEffectIndex(node); ++i) {
EnqueueInput(node, i); // Effect inputs: just visit EnqueueInput<PROPAGATE>(node, i); // Effect inputs: just visit
} }
for (int i = std::max(index, NodeProperties::FirstControlIndex(node)); for (int i = std::max(index, NodeProperties::FirstControlIndex(node));
i < NodeProperties::PastControlIndex(node); ++i) { i < NodeProperties::PastControlIndex(node); ++i) {
EnqueueInput(node, i); // Control inputs: just visit EnqueueInput<PROPAGATE>(node, i); // Control inputs: just visit
} }
} }
...@@ -4007,6 +3910,39 @@ void RepresentationSelector::VisitInputs<LOWER>(Node* node) { ...@@ -4007,6 +3910,39 @@ void RepresentationSelector::VisitInputs<LOWER>(Node* node) {
} }
} }
template <>
void RepresentationSelector::InsertUnreachableIfNecessary<LOWER>(Node* node) {
// If the node is effectful and it produces an impossible value, then we
// insert Unreachable node after it.
if (node->op()->ValueOutputCount() > 0 &&
node->op()->EffectOutputCount() > 0 &&
node->opcode() != IrOpcode::kUnreachable && TypeOf(node).IsNone()) {
Node* control = (node->op()->ControlOutputCount() == 0)
? NodeProperties::GetControlInput(node, 0)
: NodeProperties::FindSuccessfulControlProjection(node);
Node* unreachable =
graph()->NewNode(common()->Unreachable(), node, control);
// Insert unreachable node and replace all the effect uses of the {node}
// with the new unreachable node.
for (Edge edge : node->use_edges()) {
if (!NodeProperties::IsEffectEdge(edge)) continue;
// Make sure to not overwrite the unreachable node's input. That would
// create a cycle.
if (edge.from() == unreachable) continue;
// Avoid messing up the exceptional path.
if (edge.from()->opcode() == IrOpcode::kIfException) {
DCHECK(!node->op()->HasProperty(Operator::kNoThrow));
DCHECK_EQ(NodeProperties::GetControlInput(edge.from()), node);
continue;
}
edge.UpdateTo(unreachable);
}
}
}
SimplifiedLowering::SimplifiedLowering(JSGraph* jsgraph, JSHeapBroker* broker, SimplifiedLowering::SimplifiedLowering(JSGraph* jsgraph, JSHeapBroker* broker,
Zone* zone, Zone* zone,
SourcePositionTable* source_positions, SourcePositionTable* source_positions,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment