diff options
| author | 2017-01-13 09:28:47 +0000 | |
|---|---|---|
| committer | 2017-01-13 09:28:47 +0000 | |
| commit | cfd61675288894d82ece63d537f60493080335c2 (patch) | |
| tree | bbc10e9b27cb703ffe427b5d40bdd8581c2d4b3f /compiler/optimizing/instruction_builder.cc | |
| parent | 1efdddeaec6dfc1b55286b3714eef6b112afb7a7 (diff) | |
| parent | 0d3998b5ff619364acf47bec0b541e7a49bd6fe7 (diff) | |
Merge "Revert "Revert "Make object allocation entrypoints only take a class."""
Diffstat (limited to 'compiler/optimizing/instruction_builder.cc')
| -rw-r--r-- | compiler/optimizing/instruction_builder.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/compiler/optimizing/instruction_builder.cc b/compiler/optimizing/instruction_builder.cc index 768b1d80a1..009d549547 100644 --- a/compiler/optimizing/instruction_builder.cc +++ b/compiler/optimizing/instruction_builder.cc @@ -917,11 +917,11 @@ bool HInstructionBuilder::BuildNewInstance(dex::TypeIndex type_index, uint32_t d bool finalizable; bool needs_access_check = NeedsAccessCheck(type_index, dex_cache, &finalizable); - // Only the non-resolved entrypoint handles the finalizable class case. If we + // Only the access check entrypoint handles the finalizable class case. If we // need access checks, then we haven't resolved the method and the class may // again be finalizable. QuickEntrypointEnum entrypoint = (finalizable || needs_access_check) - ? kQuickAllocObject + ? kQuickAllocObjectWithChecks : kQuickAllocObjectInitialized; if (outer_dex_cache.Get() != dex_cache.Get()) { @@ -946,7 +946,6 @@ bool HInstructionBuilder::BuildNewInstance(dex::TypeIndex type_index, uint32_t d AppendInstruction(new (arena_) HNewInstance( cls, - graph_->GetCurrentMethod(), dex_pc, type_index, *dex_compilation_unit_->GetDexFile(), |