diff options
| -rw-r--r-- | compiler/optimizing/code_generator_riscv64.cc | 2 | ||||
| -rw-r--r-- | runtime/base/gc_visited_arena_pool.cc | 2 | ||||
| -rw-r--r-- | runtime/base/gc_visited_arena_pool.h | 2 | ||||
| -rw-r--r-- | runtime/gc/space/image_space_test.cc | 2 | ||||
| -rw-r--r-- | runtime/oat_file.cc | 2 | ||||
| -rw-r--r-- | runtime/oat_file_assistant.cc | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/compiler/optimizing/code_generator_riscv64.cc b/compiler/optimizing/code_generator_riscv64.cc index 370d048b4e..865921cc7a 100644 --- a/compiler/optimizing/code_generator_riscv64.cc +++ b/compiler/optimizing/code_generator_riscv64.cc @@ -2955,7 +2955,7 @@ void InstructionCodeGeneratorRISCV64::VisitArraySet(HArraySet* instruction) { if (instruction->GetWriteBarrierKind() != WriteBarrierKind::kDontEmit) { DCHECK_EQ(instruction->GetWriteBarrierKind(), WriteBarrierKind::kEmitNoNullCheck) << " Already null checked so we shouldn't do it again."; - codegen_->MarkGCCard(array, value.AsRegister<XRegister>(), /* emit_null_check= */ false); + codegen_->MarkGCCard(array, value.AsRegister<XRegister>(), /* value_can_be_null= */ false); } if (can_value_be_null) { diff --git a/runtime/base/gc_visited_arena_pool.cc b/runtime/base/gc_visited_arena_pool.cc index 77cc7ae32d..b92185f143 100644 --- a/runtime/base/gc_visited_arena_pool.cc +++ b/runtime/base/gc_visited_arena_pool.cc @@ -178,7 +178,7 @@ uint8_t* GcVisitedArenaPool::AllocSingleObjArena(size_t size) { new TrackedArena(begin, size, /*pre_zygote_fork=*/true, /*single_obj_arena=*/true)); arena = *insert_result.first; } else { - arena = AllocArena(size, /*single_obj_arena=*/true); + arena = AllocArena(size, /*need_first_obj_arr=*/true); } return arena->Begin(); } diff --git a/runtime/base/gc_visited_arena_pool.h b/runtime/base/gc_visited_arena_pool.h index 390da55c43..208b7d5868 100644 --- a/runtime/base/gc_visited_arena_pool.h +++ b/runtime/base/gc_visited_arena_pool.h @@ -150,7 +150,7 @@ class GcVisitedArenaPool final : public ArenaPool { // Use by arena allocator. Arena* AllocArena(size_t size) override REQUIRES(!lock_) { WriterMutexLock wmu(Thread::Current(), lock_); - return AllocArena(size, /*single_obj_arena=*/false); + return AllocArena(size, /*need_first_obj_arr=*/false); } void FreeArenaChain(Arena* first) override REQUIRES(!lock_); size_t GetBytesAllocated() const override REQUIRES(!lock_); diff --git a/runtime/gc/space/image_space_test.cc b/runtime/gc/space/image_space_test.cc index 7e74015e12..8fb39e849b 100644 --- a/runtime/gc/space/image_space_test.cc +++ b/runtime/gc/space/image_space_test.cc @@ -255,7 +255,7 @@ TEST_F(DexoptTest, ValidateOatFile) { /*executable=*/false, /*low_4gb=*/false, ArrayRef<const std::string>(dex_filenames), - /*dex_fds=*/{}, + /*dex_files=*/{}, /*reservation=*/nullptr, &error_msg)); ASSERT_TRUE(oat2 != nullptr) << error_msg; diff --git a/runtime/oat_file.cc b/runtime/oat_file.cc index a518b3416c..015851224e 100644 --- a/runtime/oat_file.cc +++ b/runtime/oat_file.cc @@ -1657,7 +1657,7 @@ bool ElfOatFile::InitializeFromElfFile(int zip_fd, SetBegin(elf_file->Begin() + offset); SetEnd(elf_file->Begin() + size + offset); // Ignore the optional .bss section when opening non-executable. - return Setup(zip_fd, dex_filenames, /*dex_fds=*/{}, error_msg); + return Setup(zip_fd, dex_filenames, /*dex_files=*/{}, error_msg); } bool ElfOatFile::Load(const std::string& elf_filename, diff --git a/runtime/oat_file_assistant.cc b/runtime/oat_file_assistant.cc index 01a9727326..812fbbe604 100644 --- a/runtime/oat_file_assistant.cc +++ b/runtime/oat_file_assistant.cc @@ -1079,7 +1079,7 @@ const OatFile* OatFileAssistant::OatFileInfo::GetFile() { executable, /*low_4gb=*/false, dex_locations, - /*dex_fds=*/{}, + /*dex_files=*/{}, /*reservation=*/nullptr, &error_msg)); } |