diff options
| author | Nicolas Geoffray <ngeoffray@google.com> | 2015-03-26 10:45:51 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-03-26 10:45:52 +0000 |
| commit | c8924c6ea9e83ba3832dd5551df38ab06f4aaca9 (patch) | |
| tree | 94d7d6016c5a58d6c5f31d8350330c8025baa014 /compiler/optimizing/builder.cc | |
| parent | 9ed05c4cf76aaeee48a1eb5bbae659b0acbabe67 (diff) | |
| parent | 790412959a6413a585f45fc5f77fe7106311a00c (diff) | |
| download | art-c8924c6ea9e83ba3832dd5551df38ab06f4aaca9.tar.gz art-c8924c6ea9e83ba3832dd5551df38ab06f4aaca9.tar.bz2 art-c8924c6ea9e83ba3832dd5551df38ab06f4aaca9.zip | |
Merge "Use the original invoke type when inlining."
Diffstat (limited to 'compiler/optimizing/builder.cc')
| -rw-r--r-- | compiler/optimizing/builder.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/optimizing/builder.cc b/compiler/optimizing/builder.cc index 8786ed419..f81935a7c 100644 --- a/compiler/optimizing/builder.cc +++ b/compiler/optimizing/builder.cc @@ -620,7 +620,7 @@ bool HGraphBuilder::BuildInvoke(const Instruction& instruction, DCHECK(!is_recursive || (target_method.dex_file == dex_compilation_unit_->GetDexFile())); invoke = new (arena_) HInvokeStaticOrDirect( arena_, number_of_arguments, return_type, dex_pc, target_method.dex_method_index, - is_recursive, optimized_invoke_type); + is_recursive, invoke_type, optimized_invoke_type); } size_t start_index = 0; |