| Index: runtime/vm/assembler_arm.cc
|
| diff --git a/runtime/vm/assembler_arm.cc b/runtime/vm/assembler_arm.cc
|
| index 71a960831e0aff959f3d0d7829966d4a7599e2c9..e1198a3279afe48e8e55786f6a1fed72e5b7aba2 100644
|
| --- a/runtime/vm/assembler_arm.cc
|
| +++ b/runtime/vm/assembler_arm.cc
|
| @@ -2708,7 +2708,7 @@ void Assembler::BranchLink(const ExternalLabel* label, Patchability patchable) {
|
| // use 'blx ip' in a non-patchable sequence (see other BranchLink flavors).
|
| const int32_t offset = ObjectPool::element_offset(
|
| object_pool_wrapper_.FindExternalLabel(label, patchable));
|
| - LoadWordFromPoolOffset(LR, offset - kHeapObjectTag);
|
| + LoadWordFromPoolOffset(LR, offset - kHeapObjectTag, AL);
|
| blx(LR); // Use blx instruction so that the return branch prediction works.
|
| }
|
|
|
| @@ -2761,7 +2761,7 @@ void Assembler::LoadDecodableImmediate(
|
| if ((version == ARMv5TE) || (version == ARMv6)) {
|
| if (constant_pool_allowed()) {
|
| const int32_t offset = Array::element_offset(FindImmediate(value));
|
| - LoadWordFromPoolOffset(rd, offset - kHeapObjectTag);
|
| + LoadWordFromPoolOffset(rd, offset - kHeapObjectTag, cond);
|
| } else {
|
| LoadPatchableImmediate(rd, value, cond);
|
| }
|
|
|