Enable indexOf intrincics

rkennke · rkennke · commit 7001783e8c11 · 2024-09-26T13:33:37.000+02:00
diff --git a/src/hotspot/cpu/x86/stubGenerator_x86_64.cpp b/src/hotspot/cpu/x86/stubGenerator_x86_64.cpp
@@ -4004,7 +4004,7 @@ void StubGenerator::generate_compiler_stubs() {
   generate_chacha_stubs();
 
 #ifdef COMPILER2
-  if ((UseAVX == 2) && EnableX86ECoreOpts && !UseCompactObjectHeaders) {
+  if ((UseAVX == 2) && EnableX86ECoreOpts) {
     generate_string_indexof(StubRoutines::_string_indexof_array);
   }
 #endif
diff --git a/src/hotspot/share/opto/library_call.cpp b/src/hotspot/share/opto/library_call.cpp
@@ -1280,7 +1280,6 @@ bool LibraryCallKit::inline_string_indexOfI(StrIntrinsicNode::ArgEnc ae) {
   bool call_opt_stub = (StubRoutines::_string_indexof_array[ae] != nullptr);
 
   if (call_opt_stub) {
-    assert(arrayOopDesc::base_offset_in_bytes(T_BYTE) >= 16, "Needed for indexOf");
     Node* call = make_runtime_call(RC_LEAF, OptoRuntime::string_IndexOf_Type(),
                                    StubRoutines::_string_indexof_array[ae],
                                    "stringIndexOf", TypePtr::BOTTOM, src_start,

Original file line number	Diff line number	Diff line change
`@@ -4004,7 +4004,7 @@ void StubGenerator::generate_compiler_stubs() {`
`4004`	`4004`	`generate_chacha_stubs();`
`4005`	`4005`
`4006`	`4006`	`#ifdef COMPILER2`
`4007`		`- if ((UseAVX == 2) && EnableX86ECoreOpts && !UseCompactObjectHeaders) {`
	`4007`	`+ if ((UseAVX == 2) && EnableX86ECoreOpts) {`
`4008`	`4008`	`generate_string_indexof(StubRoutines::_string_indexof_array);`
`4009`	`4009`	`}`
`4010`	`4010`	`#endif`