darlinghq/darling-openjdk
1
0
Fork 0
mirror of https://github.com/darlinghq/darling-openjdk.git synced 2024-11-26 22:00:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

8239787: AArch64: String.indexOf may incorrectly handle empty strings

Browse Source 
Reviewed-by: aph, lmesnik, yan
This commit is contained in:
Alexey Bakhtin 2020-03-03 13:06:50 +03:00 committed by Andrew Brygin
parent b533c9df32
commit 57ceb1bc5e
2 changed files with 43 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
View File

@ -4839,6 +4839,8 @@ void MacroAssembler::string_indexof_char(Register str1, Register cnt1,
Register ch1 = rscratch1;
Register result_tmp = rscratch2;
cbz(cnt1, NOMATCH);
cmp(cnt1, (u1)4);
br(LT, DO1_SHORT);

41
test/hotspot/jtreg/runtime/StringIntrinsic/StringIndexOfChar.java Normal file
View File

@ -0,0 +1,41 @@
/*
* Copyright (c) 2020, Azul Systems, Inc. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/* @test
* @bug 8239787
* @summary String.indexOf(char) for empty string must give -1
* @run main/othervm -XX:-CompactStrings StringIndexOfChar
*/
public class StringIndexOfChar {
public static void main(String[] args) throws Exception {
String emptyString = "";
for (int i = 0; i < 100; i++) {
for(int c = 0; c < 0xFFFF; c++) {
int result = emptyString.indexOf((char)c, -1);
if (result != -1) {
throw new Exception("new String(\"\").indexOf(char, -1) must be -1, but got " + result);
}
}
}
}
}