Skip to content

Commit

Permalink
8254790: SIGSEGV in string_indexof_char and stringL_indexof_char intr…
Browse files Browse the repository at this point in the history
…insics

Reviewed-by: kvn, thartmann
  • Loading branch information
Sandhya Viswanathan committed Oct 21, 2020
1 parent f813a28 commit 365f19c
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp
Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion src/hotspot/share/opto/c2compiler.cpp
Expand Up @@ -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:
Expand Down

1 comment on commit 365f19c

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented on 365f19c Oct 21, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.