diff options
| author | 2021-10-29 10:43:18 +0000 | |
|---|---|---|
| committer | 2021-10-29 12:43:58 +0000 | |
| commit | 3693b2ae3bac182f1e483738bae2cd80cad5dc3d (patch) | |
| tree | 074107df43dc9cd519ff1f1ef2c2ca8bfb457232 /compiler/optimizing/intrinsics_arm_vixl.cc | |
| parent | 5b9086818b520306d64cd9736c6d2302b08a8e8d (diff) | |
Revert^2 "x86_64: Implement VarHandle.get{,Acquire,Opaque,Volatile} for byte array views."
This reverts commit 6620caa89a4691bc5cbdbc5af7599b17fd8896f5.
Reason for revert: Relanding original change after fixing linker error:
ld.lld: error: undefined symbol: art::ObjPtr<art::mirror::Class>
art::GetClassRoot<(art::ReadBarrierOption)0>(art::ClassRoot)
The error was caused by a missing header which contained an `inline`
definition of the above function. The error may or may not happen
depending on the compiler: it may choose to not inline, and then there
is no linker error.
Bug: 71781600
Test: Manually marked the function as always inline and ensured that the
error can be reproduced and is fixed by including the header.
Change-Id: Ibcea2c3fc81ea75b8e6e6517d9ce872e79eda0d6
Diffstat (limited to 'compiler/optimizing/intrinsics_arm_vixl.cc')
| -rw-r--r-- | compiler/optimizing/intrinsics_arm_vixl.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/optimizing/intrinsics_arm_vixl.cc b/compiler/optimizing/intrinsics_arm_vixl.cc index 53e388669e..a3ad409fc7 100644 --- a/compiler/optimizing/intrinsics_arm_vixl.cc +++ b/compiler/optimizing/intrinsics_arm_vixl.cc @@ -4217,7 +4217,7 @@ static void GenerateVarHandleArrayChecks(HInvoke* invoke, codegen->GetCompilerOptions().IsBootImage() || !Runtime::Current()->GetHeap()->GetBootImageSpaces().empty(); DCHECK(boot_image_available || codegen->GetCompilerOptions().IsJitCompiler()); - size_t can_be_view = + bool can_be_view = ((value_type != DataType::Type::kReference) && (DataType::Size(value_type) != 1u)) && boot_image_available; vixl32::Label* slow_path_label = |