From 08400f18badb23ea3d00282e8b71e76844398a67 Mon Sep 17 00:00:00 2001
From: Zhuojun Miao <zmiao@openjdk.org>
Date: Wed, 15 Jun 2022 05:57:55 +0000
Subject: [PATCH] 8287349: AArch64: Merge LDR instructions to improve C1 OSR
 performance

Reviewed-by: aph, ngasson, thartmann
---
 src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.cpp
index ab0d031d2b8..48a8a2bbbd5 100644
--- a/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.cpp
@@ -282,10 +282,9 @@ void LIR_Assembler::osr_entry() {
         __ bind(L);
       }
 #endif
-      __ ldr(r19, Address(OSR_buf, slot_offset + 0));
+      __ ldp(r19, r20, Address(OSR_buf, slot_offset));
       __ str(r19, frame_map()->address_for_monitor_lock(i));
-      __ ldr(r19, Address(OSR_buf, slot_offset + 1*BytesPerWord));
-      __ str(r19, frame_map()->address_for_monitor_object(i));
+      __ str(r20, frame_map()->address_for_monitor_object(i));
     }
   }
 }