8284681: compiler/c2/aarch64/TestFarJump.java fails with "RuntimeExce…

…ption: for CodeHeap < 250MB the far jump is expected to be encoded with a single branch instruction" Backport-of: 21de4e55b8fa2ba138338ec82c159897ab3d4233
openjdk · Oct 12, 2022 · 4a49294 · 4a49294
1 parent d4d2e34
commit 4a49294
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/test/hotspot/jtreg/compiler/c2/aarch64/TestFarJump.java b/test/hotspot/jtreg/compiler/c2/aarch64/TestFarJump.java
@@ -74,9 +74,9 @@ static boolean containsADRP(String input) {
             }
             int dump = (int)Long.parseLong(match, 16);
             int encoding = Integer.reverseBytes(dump);
-            if (isADRP(encoding)) {
-                return true;
-            }
+            // Check the first instruction only. The raw pointer can be confused with the encoded adrp instruction:
+            // emit_exception_handler() = far_call() + should_not_reach_here() = ADRP + ADD + BLR + DCPS1 + raw_pointer
+            return isADRP(encoding);
         }
         return false;
     }