diff options
| author | Roland Levillain <rpl@google.com> | 2015-04-28 10:31:38 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-04-28 10:31:38 +0000 |
| commit | 80613ffd5699e6207d6b1264d600a0fc168074ce (patch) | |
| tree | dbe8971e367e2529586821f3caa223fd22c28ce3 /compiler/optimizing/builder.cc | |
| parent | a94fb1f99ee3390bca9531b2512f8fc65f13ceee (diff) | |
| parent | 3e3d73349a2de81d14e2279f60ffbd9ab3f3ac28 (diff) | |
| download | art-80613ffd5699e6207d6b1264d600a0fc168074ce.tar.gz art-80613ffd5699e6207d6b1264d600a0fc168074ce.tar.bz2 art-80613ffd5699e6207d6b1264d600a0fc168074ce.zip | |
Merge "Have HInvoke instructions know their number of actual arguments."
Diffstat (limited to 'compiler/optimizing/builder.cc')
| -rw-r--r-- | compiler/optimizing/builder.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/compiler/optimizing/builder.cc b/compiler/optimizing/builder.cc index a883bd0149..0f44af07b8 100644 --- a/compiler/optimizing/builder.cc +++ b/compiler/optimizing/builder.cc @@ -702,7 +702,6 @@ bool HGraphBuilder::BuildInvoke(const Instruction& instruction, current_block_->AddInstruction(load_class); clinit_check = new (arena_) HClinitCheck(load_class, dex_pc); current_block_->AddInstruction(clinit_check); - ++number_of_arguments; } } } @@ -745,14 +744,14 @@ bool HGraphBuilder::BuildInvoke(const Instruction& instruction, i++; } } + DCHECK_EQ(argument_index, number_of_arguments); if (clinit_check_requirement == HInvokeStaticOrDirect::ClinitCheckRequirement::kExplicit) { // Add the class initialization check as last input of `invoke`. DCHECK(clinit_check != nullptr); - invoke->SetArgumentAt(argument_index++, clinit_check); + invoke->SetArgumentAt(argument_index, clinit_check); } - DCHECK_EQ(argument_index, number_of_arguments); current_block_->AddInstruction(invoke); latest_result_ = invoke; |