Index: src/compiler/instruction-selector.cc |
diff --git a/src/compiler/instruction-selector.cc b/src/compiler/instruction-selector.cc |
index e7ca5e2532c531d48de6fc9309edc283c6c72fb5..6ab063e5165275775c9fdce384941f9e7086884c 100644 |
--- a/src/compiler/instruction-selector.cc |
+++ b/src/compiler/instruction-selector.cc |
@@ -336,8 +336,7 @@ void InstructionSelector::InitializeCallBuffer(Node* call, CallBuffer* buffer, |
case CallDescriptor::kCallAddress: |
buffer->instruction_args.push_back( |
(call_address_immediate && |
- (callee->opcode() == IrOpcode::kInt32Constant || |
- callee->opcode() == IrOpcode::kInt64Constant)) |
+ callee->opcode() == IrOpcode::kExternalConstant) |
? g.UseImmediate(callee) |
: g.UseRegister(callee)); |
break; |
@@ -373,7 +372,7 @@ void InstructionSelector::InitializeCallBuffer(Node* call, CallBuffer* buffer, |
// not appear as arguments to the call. Everything else ends up |
// as an InstructionOperand argument to the call. |
auto iter(call->inputs().begin()); |
- int pushed_count = 0; |
+ size_t pushed_count = 0; |
for (size_t index = 0; index < input_count; ++iter, ++index) { |
DCHECK(iter != call->inputs().end()); |
DCHECK((*iter)->op()->opcode() != IrOpcode::kFrameState); |
@@ -393,10 +392,8 @@ void InstructionSelector::InitializeCallBuffer(Node* call, CallBuffer* buffer, |
buffer->instruction_args.push_back(op); |
} |
} |
- CHECK_EQ(pushed_count, static_cast<int>(buffer->pushed_nodes.size())); |
- DCHECK(static_cast<size_t>(input_count) == |
- (buffer->instruction_args.size() + buffer->pushed_nodes.size() - |
- buffer->frame_state_value_count())); |
+ DCHECK_EQ(input_count, buffer->instruction_args.size() + pushed_count - |
+ buffer->frame_state_value_count()); |
} |