From 69134ec75ca1affdae0682015ace4efca4e2cae9 Mon Sep 17 00:00:00 2001 From: Ryan Macnak Date: Tue, 26 Jan 2021 20:06:09 +0000 Subject: [PATCH] [vm, arm64] Fix CallPattern assertion. TEST=vm/cc/Call Bug: https://github.com/dart-lang/sdk/issues/44623 Change-Id: I22197a345a7971353f59856efed5aa45af7d22ca Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/181061 Reviewed-by: Liam Appelbe Commit-Queue: Ryan Macnak --- runtime/vm/instructions_arm64.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/runtime/vm/instructions_arm64.cc b/runtime/vm/instructions_arm64.cc index 210fca324bf..e7a0d24153b 100644 --- a/runtime/vm/instructions_arm64.cc +++ b/runtime/vm/instructions_arm64.cc @@ -20,8 +20,8 @@ CallPattern::CallPattern(uword pc, const Code& code) : object_pool_(ObjectPool::Handle(code.GetObjectPool())), target_code_pool_index_(-1) { ASSERT(code.ContainsInstructionAt(pc)); - // Last instruction: blr ip0. - ASSERT(*(reinterpret_cast(pc) - 1) == 0xd63f0200); + // Last instruction: blr lr. + ASSERT(*(reinterpret_cast(pc) - 1) == 0xd63f03c0); Register reg; InstructionPattern::DecodeLoadWordFromPool(pc - 2 * Instr::kInstrSize, ®,