8271869: AArch64: build errors with GCC11 in frame::saved_oop_result

Reviewed-by: ngasson, aph
openjdk · Aug 10, 2021 · 1f88134 · 1f88134 · openjdk-notifier · Aug 10, 2021
1 parent 089e83b
commit 1f88134
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/src/hotspot/cpu/aarch64/frame_aarch64.inline.hpp b/src/hotspot/cpu/aarch64/frame_aarch64.inline.hpp
@@ -236,14 +236,20 @@ inline JavaCallWrapper** frame::entry_frame_call_wrapper_addr() const {
 // Compiled frames
 
 inline oop frame::saved_oop_result(RegisterMap* map) const {
+  PRAGMA_DIAG_PUSH
+  PRAGMA_NONNULL_IGNORED
   oop* result_adr = (oop *)map->location(r0->as_VMReg());
+  PRAGMA_DIAG_POP
   guarantee(result_adr != NULL, "bad register save location");
 
   return (*result_adr);
 }
 
 inline void frame::set_saved_oop_result(RegisterMap* map, oop obj) {
+  PRAGMA_DIAG_PUSH
+  PRAGMA_NONNULL_IGNORED
   oop* result_adr = (oop *)map->location(r0->as_VMReg());
+  PRAGMA_DIAG_POP
   guarantee(result_adr != NULL, "bad register save location");
 
   *result_adr = obj;