Skip to content

Commit f0ceda6

Browse files
committed
Unwind String.indexOf intrinsic on AArch64. Fix TTSP test.
1 parent 16f15de commit f0ceda6

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

src/stackFrame_aarch64.cpp

+7
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,13 @@ bool StackFrame::unwindStub(instruction_t* entry, const char* name, uintptr_t& p
114114
pc = ((uintptr_t*)sp)[-1];
115115
return true;
116116
}
117+
} else if (strncmp(name, "indexof_linear_", 15) == 0 &&
118+
entry != NULL && entry[0] == 0xa9be57f4 && entry[1] == 0xa9015ff6) {
119+
// JDK-8189103: String.indexOf intrinsic.
120+
// Entry and exit are covered by the very first 'if', in all other cases SP is 4 words off.
121+
sp += 32;
122+
pc = link();
123+
return true;
117124
}
118125
return false;
119126
}

0 commit comments

Comments
 (0)