8254790: SIGSEGV in string_indexof_char and stringL_indexof_char intrinsics

Sandhya Viswanathan · Sandhya Viswanathan · commit 365f19c8e183 · 2020-10-21T16:24:30.000Z
Reviewed-by: kvn, thartmann
diff --git a/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp b/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp
@@ -2717,7 +2717,7 @@ void C2_MacroAssembler::string_indexof_char(Register str1, Register cnt1, Regist
     pmovmskb(tmp, vec3);
   }
   bsfl(ch, tmp);
-  addl(result, ch);
+  addptr(result, ch);
 
   bind(FOUND_SEQ_CHAR);
   subptr(result, str1);
@@ -2811,7 +2811,7 @@ void C2_MacroAssembler::stringL_indexof_char(Register str1, Register cnt1, Regis
     pmovmskb(tmp, vec3);
   }
   bsfl(ch, tmp);
-  addl(result, ch);
+  addptr(result, ch);
 
   bind(FOUND_SEQ_CHAR);
   subptr(result, str1);
diff --git a/src/hotspot/share/opto/c2compiler.cpp b/src/hotspot/share/opto/c2compiler.cpp
@@ -495,7 +495,7 @@ bool C2Compiler::is_intrinsic_supported(const methodHandle& method, bool is_virt
   case vmIntrinsics::_indexOfIU:
   case vmIntrinsics::_indexOfIUL:
   case vmIntrinsics::_indexOfU_char:
-  // case vmIntrinsics::_indexOfL_char: // Disable it until found issues are fixed
+  case vmIntrinsics::_indexOfL_char:
   case vmIntrinsics::_toBytesStringU:
   case vmIntrinsics::_getCharsStringU:
   case vmIntrinsics::_getCharStringU:
