hotspot: fix intrinsic String.indexOfChar

Author: duanyangjing

src/hotspot/share/opto/library_call.cpp

@@ -1006,6 +1006,7 @@ Node* LibraryCallKit::make_string_method_node(int opcode, Node* str1_start, Node
                              str1_start, cnt1, str2_start, cnt2, ae);
 #endif
     break;
+  // corresponds to inline_string_equals, which is not enabled
   case Op_StrEquals:
     // We already know that cnt1 == cnt2 here (checked in 'inline_string_equals').
     // Use the constant length if there is one because optimized match rule may exist.
@@ -1396,7 +1397,11 @@ bool LibraryCallKit::inline_string_indexOfChar(StrIntrinsicNode::ArgEnc ae) {
   RegionNode* region = new RegionNode(3);
   Node* phi = new PhiNode(region, TypeInt::INT);
 
+#if HOTSPOT_TARGET_CLASSLIB == 8
+  Node* result = new StrIndexOfCharNode(control(), memory(TypeAryPtr::CHARS), src_start, src_count, int_ch, ae);
+#else
   Node* result = new StrIndexOfCharNode(control(), memory(TypeAryPtr::BYTES), src_start, src_count, int_ch, ae);
+#endif
   C->set_has_split_ifs(true); // Has chance for split-if optimization
   _gvn.transform(result);