diff options
| -rw-r--r-- | compiler/optimizing/intrinsics_riscv64.cc | 4 | ||||
| -rw-r--r-- | dexopt_chroot_setup/dexopt_chroot_setup_test.cc | 2 | ||||
| -rw-r--r-- | libnativeloader/native_loader.cpp | 4 | ||||
| -rw-r--r-- | libprofile/profile/profile_compilation_info_test.cc | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/compiler/optimizing/intrinsics_riscv64.cc b/compiler/optimizing/intrinsics_riscv64.cc index 9aa4b9415b..6717ec463b 100644 --- a/compiler/optimizing/intrinsics_riscv64.cc +++ b/compiler/optimizing/intrinsics_riscv64.cc @@ -767,8 +767,8 @@ void IntrinsicCodeGeneratorRISCV64::VisitReferenceGetReferent(HInvoke* invoke) { out, obj.AsRegister<XRegister>(), referent_offset, - /*maybe_temp=*/ locations->GetTemp(0), - /*needs_null_check=*/ false); + /*temp=*/locations->GetTemp(0), + /*needs_null_check=*/false); } else { codegen_->GetInstructionVisitor()->Load( out, obj.AsRegister<XRegister>(), referent_offset, DataType::Type::kReference); diff --git a/dexopt_chroot_setup/dexopt_chroot_setup_test.cc b/dexopt_chroot_setup/dexopt_chroot_setup_test.cc index 9ee33dfece..bfa38e0aa0 100644 --- a/dexopt_chroot_setup/dexopt_chroot_setup_test.cc +++ b/dexopt_chroot_setup/dexopt_chroot_setup_test.cc @@ -74,7 +74,7 @@ class DexoptChrootSetupTest : public CommonArtTest { GTEST_SKIP() << "A real Pre-reboot Dexopt is running"; } - ASSERT_TRUE(WaitForProperty("dev.bootcomplete", "1", /*timeout=*/std::chrono::minutes(3))); + ASSERT_TRUE(WaitForProperty("dev.bootcomplete", "1", /*relative_timeout=*/std::chrono::minutes(3))); test_skipped = false; diff --git a/libnativeloader/native_loader.cpp b/libnativeloader/native_loader.cpp index ea06b2041f..13a4c2a482 100644 --- a/libnativeloader/native_loader.cpp +++ b/libnativeloader/native_loader.cpp @@ -420,8 +420,8 @@ void* OpenNativeLibrary(JNIEnv* env, /*is_shared=*/false, empty_dex_path, library_path_j, - /*permitted_path=*/nullptr, - /*uses_library_list=*/nullptr); + /*permitted_path_j=*/nullptr, + /*uses_library_list_j=*/nullptr); if (!isolated_ns.ok()) { ALOGD("Failed to create isolated ns for %s (caller=%s)", path, diff --git a/libprofile/profile/profile_compilation_info_test.cc b/libprofile/profile/profile_compilation_info_test.cc index 25c560b78e..f2df896c70 100644 --- a/libprofile/profile/profile_compilation_info_test.cc +++ b/libprofile/profile/profile_compilation_info_test.cc @@ -1498,7 +1498,7 @@ TEST_F(ProfileCompilationInfoTest, AddMethodsProfileMethodInfoInlineCaches) { // Add inline caches with the methods. The profile should record only the one for the hot method. std::vector<TypeReference> types = {}; - ProfileMethodInfo::ProfileInlineCache ic(/*dex_pc=*/ 0, /*missing_types=*/ true, types); + ProfileMethodInfo::ProfileInlineCache ic(/*pc=*/0, /*missing_types=*/true, types); std::vector<ProfileMethodInfo::ProfileInlineCache> inline_caches = {ic}; info.AddMethod(ProfileMethodInfo(hot, inline_caches), Hotness::kFlagHot, |