Index: src/compiler/js-intrinsic-lowering.cc |
diff --git a/src/compiler/js-intrinsic-lowering.cc b/src/compiler/js-intrinsic-lowering.cc |
index 37bb11562d8d0ee769ecb082680b279f32bab00e..4e80d79869b5a336dd618d121cfa18a1e3b68597 100644 |
--- a/src/compiler/js-intrinsic-lowering.cc |
+++ b/src/compiler/js-intrinsic-lowering.cc |
@@ -243,43 +243,46 @@ Reduction JSIntrinsicLowering::ReduceIsInstanceType( |
Reduction JSIntrinsicLowering::ReduceIsJSReceiver(Node* node) { |
- // if (%_IsSmi(value)) { |
- // return false; |
- // } else { |
- // return FIRST_JS_RECEIVER_TYPE <= %_GetInstanceType(%_GetMap(value)) |
- // } |
- STATIC_ASSERT(LAST_TYPE == LAST_JS_RECEIVER_TYPE); |
- MachineType const type = static_cast<MachineType>(kTypeBool | kRepTagged); |
- |
Node* value = NodeProperties::GetValueInput(node, 0); |
+ Type* value_type = NodeProperties::GetType(value); |
Node* effect = NodeProperties::GetEffectInput(node); |
Node* control = NodeProperties::GetControlInput(node); |
- |
- Node* check = graph()->NewNode(simplified()->ObjectIsSmi(), value); |
- Node* branch = graph()->NewNode(common()->Branch(), check, control); |
- |
- Node* if_true = graph()->NewNode(common()->IfTrue(), branch); |
- Node* etrue = effect; |
- Node* vtrue = jsgraph()->FalseConstant(); |
- |
- Node* if_false = graph()->NewNode(common()->IfFalse(), branch); |
- Node* efalse = graph()->NewNode( |
- simplified()->LoadField(AccessBuilder::ForMapInstanceType()), |
- graph()->NewNode(simplified()->LoadField(AccessBuilder::ForMap()), value, |
- effect, if_false), |
- effect, if_false); |
- Node* vfalse = graph()->NewNode( |
- machine()->Uint32LessThanOrEqual(), |
- jsgraph()->Int32Constant(FIRST_JS_RECEIVER_TYPE), efalse); |
- |
- control = graph()->NewNode(common()->Merge(2), if_true, if_false); |
- |
- // Replace all effect uses of {node} with the {ephi}. |
- effect = graph()->NewNode(common()->EffectPhi(2), etrue, efalse, control); |
+ if (value_type->Is(Type::Receiver())) { |
+ value = jsgraph()->TrueConstant(); |
+ } else if (!value_type->Maybe(Type::Receiver())) { |
+ value = jsgraph()->FalseConstant(); |
+ } else { |
+ // if (%_IsSmi(value)) { |
+ // return false; |
+ // } else { |
+ // return FIRST_JS_RECEIVER_TYPE <= %_GetInstanceType(%_GetMap(value)) |
+ // } |
+ STATIC_ASSERT(LAST_TYPE == LAST_JS_RECEIVER_TYPE); |
+ |
+ Node* check = graph()->NewNode(simplified()->ObjectIsSmi(), value); |
+ Node* branch = graph()->NewNode(common()->Branch(), check, control); |
+ |
+ Node* if_true = graph()->NewNode(common()->IfTrue(), branch); |
+ Node* etrue = effect; |
+ Node* vtrue = jsgraph()->FalseConstant(); |
+ |
+ Node* if_false = graph()->NewNode(common()->IfFalse(), branch); |
+ Node* efalse = graph()->NewNode( |
+ simplified()->LoadField(AccessBuilder::ForMapInstanceType()), |
+ graph()->NewNode(simplified()->LoadField(AccessBuilder::ForMap()), |
+ value, effect, if_false), |
+ effect, if_false); |
+ Node* vfalse = graph()->NewNode( |
+ machine()->Uint32LessThanOrEqual(), |
+ jsgraph()->Int32Constant(FIRST_JS_RECEIVER_TYPE), efalse); |
+ |
+ control = graph()->NewNode(common()->Merge(2), if_true, if_false); |
+ effect = graph()->NewNode(common()->EffectPhi(2), etrue, efalse, control); |
+ value = graph()->NewNode(common()->Phi(kMachAnyTagged, 2), vtrue, vfalse, |
+ control); |
+ } |
ReplaceWithValue(node, node, effect, control); |
- |
- // Turn the {node} into a Phi. |
- return Change(node, common()->Phi(type, 2), vtrue, vfalse, control); |
+ return Replace(value); |
} |