From f6be7fdf22eede767a0ac29b4f1cb770cfdc0b0f Mon Sep 17 00:00:00 2001 From: Naoto Sato Date: Fri, 1 Dec 2023 17:43:28 +0000 Subject: [PATCH] 8321059: Unneeded array assignments in MergeCollation and CompactByteArray Reviewed-by: jlu, bpb, rriggs --- src/java.base/share/classes/java/text/MergeCollation.java | 4 +--- src/java.base/share/classes/sun/text/CompactByteArray.java | 7 ++++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/java.base/share/classes/java/text/MergeCollation.java b/src/java.base/share/classes/java/text/MergeCollation.java index 9bc983c203f..1db779e003f 100644 --- a/src/java.base/share/classes/java/text/MergeCollation.java +++ b/src/java.base/share/classes/java/text/MergeCollation.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2023, 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 @@ -68,8 +68,6 @@ final class MergeCollation { */ public MergeCollation(String pattern) throws ParseException { - for (int i = 0; i < statusArray.length; i++) - statusArray[i] = 0; setPattern(pattern); } diff --git a/src/java.base/share/classes/sun/text/CompactByteArray.java b/src/java.base/share/classes/sun/text/CompactByteArray.java index b4aa0237d16..7024d47eab0 100644 --- a/src/java.base/share/classes/sun/text/CompactByteArray.java +++ b/src/java.base/share/classes/sun/text/CompactByteArray.java @@ -39,6 +39,8 @@ package sun.text; +import java.util.Arrays; + /** * class CompactATypeArray : use only on primitive data types * Provides a compact way to store information that is indexed by Unicode @@ -77,12 +79,11 @@ public final class CompactByteArray implements Cloneable { values = new byte[UNICODECOUNT]; indices = new short[INDEXCOUNT]; hashes = new int[INDEXCOUNT]; - for (i = 0; i < UNICODECOUNT; ++i) { - values[i] = defaultValue; + if (defaultValue != (byte)0) { + Arrays.fill(values, defaultValue); } for (i = 0; i < INDEXCOUNT; ++i) { indices[i] = (short)(i<