Skip to content

Commit

Permalink
8297561: Redundant index check in String.offsetByCodePoints()
Browse files Browse the repository at this point in the history
Reviewed-by: aturbanov, rriggs, redestad
  • Loading branch information
Sergey Tsypanov authored and Andrey Turbanov committed Dec 1, 2022
1 parent eec24aa commit c6156f9
Show file tree
Hide file tree
Showing 2 changed files with 48 additions and 4 deletions.
5 changes: 1 addition & 4 deletions src/java.base/share/classes/java/lang/String.java
Original file line number Diff line number Diff line change
Expand Up @@ -1641,7 +1641,7 @@ public int codePointCount(int beginIndex, int endIndex) {
* @param codePointOffset the offset in code points
* @return the index within this {@code String}
* @throws IndexOutOfBoundsException if {@code index}
* is negative or larger then the length of this
* is negative or larger than the length of this
* {@code String}, or if {@code codePointOffset} is positive
* and the substring starting with {@code index} has fewer
* than {@code codePointOffset} code points,
Expand All @@ -1651,9 +1651,6 @@ public int codePointCount(int beginIndex, int endIndex) {
* @since 1.5
*/
public int offsetByCodePoints(int index, int codePointOffset) {
if (index < 0 || index > length()) {
throw new IndexOutOfBoundsException();
}
return Character.offsetByCodePoints(this, index, codePointOffset);
}

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
/*
* Copyright (c) 2022, Oracle and/or its affiliates. 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.
*/
package org.openjdk.bench.java.lang;

import org.openjdk.jmh.annotations.*;

import java.util.concurrent.TimeUnit;

@Fork(3)
@BenchmarkMode(Mode.AverageTime)
@OutputTimeUnit(TimeUnit.NANOSECONDS)
@Warmup(iterations = 5, time = 1, timeUnit = TimeUnit.SECONDS)
@Measurement(iterations = 5, time = 1, timeUnit = TimeUnit.SECONDS)
public class StringOffsetByCodePoints {

@Benchmark
public int offsetByCodePoints(Data data) {
return data.value.offsetByCodePoints(data.index, data.offset);
}

@State(Scope.Thread)
public static class Data {
String value = "abc";
int index = 0;
int offset = 1;
}
}

1 comment on commit c6156f9

@openjdk-notifier
Copy link

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.