diff options
| author | 2018-09-21 08:13:46 +0000 | |
|---|---|---|
| committer | 2018-09-21 08:13:46 +0000 | |
| commit | eb53b688331b8059beafcbd468e0061c2c1ca605 (patch) | |
| tree | da0d17243bc24953f1043a5f52430ad4dba8778e | |
| parent | 6c4f8e82a82dff90e7f72deaae2fe62de9017810 (diff) | |
| parent | 258774298aa0ee03510876137fd915e23bbc7cd1 (diff) | |
Merge "ART: Fix incorrect dispatch"
| -rw-r--r-- | compiler/optimizing/intrinsics_arm_vixl.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/compiler/optimizing/intrinsics_arm_vixl.cc b/compiler/optimizing/intrinsics_arm_vixl.cc index bc59fcf50c..38e4c8968a 100644 --- a/compiler/optimizing/intrinsics_arm_vixl.cc +++ b/compiler/optimizing/intrinsics_arm_vixl.cc @@ -1092,7 +1092,8 @@ static void GenCas(HInvoke* invoke, DataType::Type type, CodeGeneratorARMVIXL* c assembler->MaybeUnpoisonHeapReference(tmp); } __ Subs(tmp, tmp, expected); - __ B(ne, failure, (failure == loop_exit) ? kNear : kBranchWithoutHint); + static_cast<vixl32::MacroAssembler*>(assembler->GetVIXLAssembler())-> + B(ne, failure, /* hint= */ (failure == loop_exit) ? kNear : kBranchWithoutHint); if (type == DataType::Type::kReference) { assembler->MaybePoisonHeapReference(value); } |