diff options
| author | 2024-09-25 07:13:59 +0000 | |
|---|---|---|
| committer | 2024-09-25 11:32:19 +0000 | |
| commit | 8567fcdf972ade85785b689a15e3593a7d3bff9d (patch) | |
| tree | 305b43a087f1616de1d64dcf2f5d5aa66bdbde0b /compiler/optimizing/instruction_builder.cc | |
| parent | 3c4f9761bca89108b75b4d132bcb243c9a7e7f43 (diff) | |
Revert "Add VarHandle implementations for void getAndUpdate methods"
This reverts commit 9ff2b617341bfe574e2d8706553f0cd65a1a2fc8.
Reason for revert: failed ART test 712-varhandle-invocations on riscv64
`F dex2oat64: intrinsics_riscv64.cc:4821 Check failed: locations->GetTempCount() == 2u (locations->GetTempCount()=3, 2u=2)`
Change-Id: I68a3830ccd730afa66e9cff277fe2a06829ddabe
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 09d7c23fed..a679f88a58 100644 --- a/compiler/optimizing/instruction_builder.cc +++ b/compiler/optimizing/instruction_builder.cc @@ -26,8 +26,8 @@ #include "data_type-inl.h" #include "dex/bytecode_utils.h" #include "dex/dex_instruction-inl.h" -#include "driver/compiler_options.h" #include "driver/dex_compilation_unit.h" +#include "driver/compiler_options.h" #include "entrypoints/entrypoint_utils-inl.h" #include "imtable-inl.h" #include "intrinsics.h" @@ -36,7 +36,6 @@ #include "jit/profiling_info.h" #include "mirror/dex_cache.h" #include "oat/oat_file.h" -#include "optimizing/data_type.h" #include "optimizing_compiler_stats.h" #include "reflective_handle_scope-inl.h" #include "scoped_thread_state_change-inl.h" @@ -1358,7 +1357,7 @@ static void DecideVarHandleIntrinsic(HInvoke* invoke) { optimizations.SetDoNotIntrinsify(); return; } - if (value_type != return_type && return_type != DataType::Type::kVoid) { + if (value_type != return_type) { optimizations.SetDoNotIntrinsify(); return; } |