summaryrefslogtreecommitdiff
path: root/compiler/optimizing/instruction_builder.cc
diff options
context:
space:
mode:
Diffstat (limited to 'compiler/optimizing/instruction_builder.cc')
-rw-r--r--compiler/optimizing/instruction_builder.cc8
1 files changed, 8 insertions, 0 deletions
diff --git a/compiler/optimizing/instruction_builder.cc b/compiler/optimizing/instruction_builder.cc
index 5b762d69fa..332fc4ff17 100644
--- a/compiler/optimizing/instruction_builder.cc
+++ b/compiler/optimizing/instruction_builder.cc
@@ -502,6 +502,7 @@ void HInstructionBuilder::BuildIntrinsic(ArtMethod* method) {
HInvokeStaticOrDirect* invoke = new (allocator_) HInvokeStaticOrDirect(
allocator_,
number_of_arguments,
+ /* number_of_out_vregs= */ in_vregs,
return_type_,
kNoDexPc,
target_method,
@@ -1067,6 +1068,7 @@ bool HInstructionBuilder::BuildInvoke(const Instruction& instruction,
MethodCompilationStat::kUnresolvedMethod);
HInvoke* invoke = new (allocator_) HInvokeUnresolved(allocator_,
number_of_arguments,
+ operands.GetNumberOfOperands(),
return_type,
dex_pc,
method_reference,
@@ -1087,6 +1089,7 @@ bool HInstructionBuilder::BuildInvoke(const Instruction& instruction,
HInvoke* invoke = new (allocator_) HInvokeStaticOrDirect(
allocator_,
number_of_arguments - 1,
+ operands.GetNumberOfOperands() - 1,
/* return_type= */ DataType::Type::kReference,
dex_pc,
method_reference,
@@ -1152,6 +1155,7 @@ bool HInstructionBuilder::BuildInvoke(const Instruction& instruction,
}
invoke = new (allocator_) HInvokeStaticOrDirect(allocator_,
number_of_arguments,
+ operands.GetNumberOfOperands(),
return_type,
dex_pc,
method_reference,
@@ -1171,6 +1175,7 @@ bool HInstructionBuilder::BuildInvoke(const Instruction& instruction,
} else if (invoke_type == kVirtual) {
invoke = new (allocator_) HInvokeVirtual(allocator_,
number_of_arguments,
+ operands.GetNumberOfOperands(),
return_type,
dex_pc,
method_reference,
@@ -1192,6 +1197,7 @@ bool HInstructionBuilder::BuildInvoke(const Instruction& instruction,
.method_load_kind;
invoke = new (allocator_) HInvokeInterface(allocator_,
number_of_arguments,
+ operands.GetNumberOfOperands(),
return_type,
dex_pc,
method_reference,
@@ -1403,6 +1409,7 @@ bool HInstructionBuilder::BuildInvokePolymorphic(uint32_t dex_pc,
HInvoke* invoke = new (allocator_) HInvokePolymorphic(allocator_,
number_of_arguments,
+ operands.GetNumberOfOperands(),
number_of_other_inputs,
return_type,
dex_pc,
@@ -1447,6 +1454,7 @@ bool HInstructionBuilder::BuildInvokeCustom(uint32_t dex_pc,
MethodReference method_reference(&graph_->GetDexFile(), dex::kDexNoIndex);
HInvoke* invoke = new (allocator_) HInvokeCustom(allocator_,
number_of_arguments,
+ operands.GetNumberOfOperands(),
call_site_idx,
return_type,
dex_pc,