Unwind String.indexOf intrinsic on AArch64. Fix TTSP test.

roy-soumadipta · Dec 9, 2024 · f0ceda6 · f0ceda6
1 parent 16f15de
commit f0ceda6
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/src/stackFrame_aarch64.cpp b/src/stackFrame_aarch64.cpp
@@ -114,6 +114,13 @@ bool StackFrame::unwindStub(instruction_t* entry, const char* name, uintptr_t& p
             pc = ((uintptr_t*)sp)[-1];
             return true;
         }
+    } else if (strncmp(name, "indexof_linear_", 15) == 0 &&
+               entry != NULL && entry[0] == 0xa9be57f4 && entry[1] == 0xa9015ff6) {
+        // JDK-8189103: String.indexOf intrinsic.
+        // Entry and exit are covered by the very first 'if', in all other cases SP is 4 words off.
+        sp += 32;
+        pc = link();
+        return true;
     }
     return false;
 }