8286378: Address possibly lossy conversions in java.base

Reviewed-by: naoto, xuelei, bpb, alanb
openjdk · May 12, 2022 · 17c5278 · 17c5278 · openjdk-notifier · May 12, 2022
1 parent 0a6832b
commit 17c5278
Show file tree

Hide file tree

Showing 32 changed files with 68 additions and 71 deletions.
diff --git a/src/java.base/linux/classes/sun/nio/ch/EPollSelectorImpl.java b/src/java.base/linux/classes/sun/nio/ch/EPollSelectorImpl.java
@@ -125,7 +125,7 @@ protected int doSelect(Consumer<SelectionKey> action, long timeout)
                 if (numEntries == IOStatus.INTERRUPTED && timedPoll) {
                     // timed poll interrupted so need to adjust timeout
                     long adjust = System.nanoTime() - startTime;
-                    to -= TimeUnit.MILLISECONDS.convert(adjust, TimeUnit.NANOSECONDS);
+                    to =- (int) TimeUnit.NANOSECONDS.toMillis(adjust);
                     if (to <= 0) {
                         // timeout expired so no retry
                         numEntries = 0;

diff --git a/src/java.base/share/classes/com/sun/crypto/provider/AESCrypt.java b/src/java.base/share/classes/com/sun/crypto/provider/AESCrypt.java
@@ -217,7 +217,7 @@ private static final int[] expandToSubKey(int[][] kr, boolean decrypting) {
             for (t = 0; t < 8; t++) {
                 cox[i][t] = B[t];
                 for (j = 0; j < 8; j++) {
-                    cox[i][t] ^= A[t][j] * box[i][j];
+                    cox[i][t] ^= (byte)(A[t][j] * box[i][j]);
                 }
             }
         }
@@ -227,7 +227,7 @@ private static final int[] expandToSubKey(int[][] kr, boolean decrypting) {
         for (i = 0; i < 256; i++) {
             S[i] = (byte)(cox[i][0] << 7);
             for (t = 1; t < 8; t++) {
-                    S[i] ^= cox[i][t] << (7-t);
+                    S[i] ^= (byte)(cox[i][t] << (7-t));
             }
             Si[S[i] & 0xFF] = (byte) i;
         }
@@ -276,7 +276,7 @@ private static final int[] expandToSubKey(int[][] kr, boolean decrypting) {
             for (t = 0; t < 4; t++) {
                 if (i != t) {
                     for (j = i+1; j < 8; j++) {
-                        AA[t][j] ^= mul(AA[i][j], AA[t][i]);
+                        AA[t][j] ^= (byte)(mul(AA[i][j], AA[t][i]));
                     }
                     AA[t][i] = 0;
                 }

diff --git a/src/java.base/share/classes/com/sun/crypto/provider/Poly1305.java b/src/java.base/share/classes/com/sun/crypto/provider/Poly1305.java
@@ -246,9 +246,9 @@ private void setRSVals() {
         keyBytes[7] &= 15;
         keyBytes[11] &= 15;
         keyBytes[15] &= 15;
-        keyBytes[4] &= 252;
-        keyBytes[8] &= 252;
-        keyBytes[12] &= 252;
+        keyBytes[4] &= (byte)252;
+        keyBytes[8] &= (byte)252;
+        keyBytes[12] &= (byte)252;
 
         // Create IntegerModuloP elements from the r and s values
         r = ipl1305.getElement(keyBytes, 0, RS_LENGTH, (byte)0);

diff --git a/src/java.base/share/classes/java/io/BufferedInputStream.java b/src/java.base/share/classes/java/io/BufferedInputStream.java
@@ -436,7 +436,7 @@ private long implSkip(long n) throws IOException {
         }
 
         long skipped = (avail < n) ? avail : n;
-        pos += skipped;
+        pos += (int)skipped;
         return skipped;
     }
 

diff --git a/src/java.base/share/classes/java/io/BufferedReader.java b/src/java.base/share/classes/java/io/BufferedReader.java
@@ -475,7 +475,7 @@ private long implSkip(long n) throws IOException {
             }
             long d = nChars - nextChar;
             if (r <= d) {
-                nextChar += r;
+                nextChar += (int)r;
                 r = 0;
                 break;
             }

diff --git a/src/java.base/share/classes/java/io/ByteArrayInputStream.java b/src/java.base/share/classes/java/io/ByteArrayInputStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1994, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 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
@@ -228,7 +228,7 @@ public synchronized long skip(long n) {
             k = n < 0 ? 0 : n;
         }
 
-        pos += k;
+        pos += (int) k;
         return k;
     }
 

diff --git a/src/java.base/share/classes/java/io/CharArrayReader.java b/src/java.base/share/classes/java/io/CharArrayReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 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
@@ -196,7 +196,7 @@ public long skip(long n) throws IOException {
             if (n < 0) {
                 return 0;
             }
-            pos += n;
+            pos += (int) n;
             return n;
         }
     }

diff --git a/src/java.base/share/classes/java/io/PushbackInputStream.java b/src/java.base/share/classes/java/io/PushbackInputStream.java
@@ -323,7 +323,7 @@ public long skip(long n) throws IOException {
             if (n < pskip) {
                 pskip = n;
             }
-            pos += pskip;
+            pos += (int) pskip;
             n -= pskip;
         }
         if (n > 0) {

diff --git a/src/java.base/share/classes/java/io/PushbackReader.java b/src/java.base/share/classes/java/io/PushbackReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 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
@@ -251,7 +251,7 @@ public long skip(long n) throws IOException {
             int avail = buf.length - pos;
             if (avail > 0) {
                 if (n <= avail) {
-                    pos += n;
+                    pos += (int)n;
                     return n;
                 } else {
                     pos = buf.length;

diff --git a/src/java.base/share/classes/java/io/StringBufferInputStream.java b/src/java.base/share/classes/java/io/StringBufferInputStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 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
@@ -145,7 +145,7 @@ public synchronized long skip(long n) {
         if (n > count - pos) {
             n = count - pos;
         }
-        pos += n;
+        pos += (int) n;
         return n;
     }
 

diff --git a/src/java.base/share/classes/java/io/StringReader.java b/src/java.base/share/classes/java/io/StringReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 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
@@ -136,7 +136,7 @@ public long skip(long n) throws IOException {
             // Bound skip by beginning and end of the source
             long r = Math.min(length - next, n);
             r = Math.max(-next, r);
-            next += r;
+            next += (int)r;
             return r;
         }
     }

diff --git a/src/java.base/share/classes/java/math/BigInteger.java b/src/java.base/share/classes/java/math/BigInteger.java
@@ -720,7 +720,7 @@ private static byte[] randomBits(int numBits, Random rnd) {
         if (numBytes > 0) {
             rnd.nextBytes(randomBits);
             int excessBits = 8*numBytes - numBits;
-            randomBits[0] &= (1 << (8-excessBits)) - 1;
+            randomBits[0] &= (byte)((1 << (8-excessBits)) - 1);
         }
         return randomBits;
     }
@@ -3389,7 +3389,7 @@ private BigInteger mod2(int p) {
 
         // Mask out any excess bits
         int excessBits = (numInts << 5) - p;
-        mag[0] &= (1L << (32-excessBits)) - 1;
+        mag[0] &= (int)((1L << (32-excessBits)) - 1);
 
         return (mag[0] == 0 ? new BigInteger(1, mag) : new BigInteger(mag, 1));
     }

diff --git a/src/java.base/share/classes/java/net/URLPermission.java b/src/java.base/share/classes/java/net/URLPermission.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -418,7 +418,7 @@ private List<String> normalizeMethods(String methods) {
                     "White space not allowed in methods: \"" + methods + "\"");
             } else {
                 if (c >= 'a' && c <= 'z') {
-                    c += 'A' - 'a';
+                    c += (char) ('A' - 'a');
                 }
                 b.append(c);
             }
@@ -437,7 +437,7 @@ private List<String> normalizeHeaders(String headers) {
             char c = headers.charAt(i);
             if (c >= 'a' && c <= 'z') {
                 if (capitalizeNext) {
-                    c += 'A' - 'a';
+                    c += (char) ('A' - 'a');
                     capitalizeNext = false;
                 }
                 b.append(c);

diff --git a/src/java.base/share/classes/java/text/DecimalFormat.java b/src/java.base/share/classes/java/text/DecimalFormat.java
@@ -1532,7 +1532,7 @@ private void localizeDigits(char[] digitsBuffer) {
              cursor--) {
             if (digitsCounter != 0) {
                 // This is a digit char, we must localize it.
-                digitsBuffer[cursor] += fastPathData.zeroDelta;
+                digitsBuffer[cursor] += (char)fastPathData.zeroDelta;
                 digitsCounter--;
             } else {
                 // Decimal separator or grouping char. Reinit counter only.

diff --git a/src/java.base/share/classes/java/time/Duration.java b/src/java.base/share/classes/java/time/Duration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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
@@ -283,7 +283,7 @@ public static Duration ofNanos(long nanos) {
         long secs = nanos / NANOS_PER_SECOND;
         int nos = (int) (nanos % NANOS_PER_SECOND);
         if (nos < 0) {
-            nos += NANOS_PER_SECOND;
+            nos += (int) NANOS_PER_SECOND;
             secs--;
         }
         return create(secs, nos);

diff --git a/src/java.base/share/classes/java/time/temporal/TemporalAdjusters.java b/src/java.base/share/classes/java/time/temporal/TemporalAdjusters.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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
@@ -351,7 +351,7 @@ public static TemporalAdjuster dayOfWeekInMonth(int ordinal, DayOfWeek dayOfWeek
                 Temporal temp = temporal.with(DAY_OF_MONTH, 1);
                 int curDow = temp.get(DAY_OF_WEEK);
                 int dowDiff = (dowValue - curDow + 7) % 7;
-                dowDiff += (ordinal - 1L) * 7L;  // safe from overflow
+                dowDiff += (int) ((ordinal - 1L) * 7L);  // safe from overflow
                 return temp.plus(dowDiff, DAYS);
             };
         } else {
@@ -360,7 +360,7 @@ public static TemporalAdjuster dayOfWeekInMonth(int ordinal, DayOfWeek dayOfWeek
                 int curDow = temp.get(DAY_OF_WEEK);
                 int daysDiff = dowValue - curDow;
                 daysDiff = (daysDiff == 0 ? 0 : (daysDiff > 0 ? daysDiff - 7 : daysDiff));
-                daysDiff -= (-ordinal - 1L) * 7L;  // safe from overflow
+                daysDiff -= (int) ((-ordinal - 1L) * 7L);  // safe from overflow
                 return temp.plus(daysDiff, DAYS);
             };
         }

diff --git a/src/java.base/share/classes/java/util/GregorianCalendar.java b/src/java.base/share/classes/java/util/GregorianCalendar.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 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
@@ -2323,11 +2323,11 @@ private int computeFields(int fieldMask, int tzMask) {
         fixedDate += time / ONE_DAY;
         timeOfDay += (int) (time % ONE_DAY);
         if (timeOfDay >= ONE_DAY) {
-            timeOfDay -= ONE_DAY;
+            timeOfDay -= (int)ONE_DAY;
             ++fixedDate;
         } else {
             while (timeOfDay < 0) {
-                timeOfDay += ONE_DAY;
+                timeOfDay += (int)ONE_DAY;
                 --fixedDate;
             }
         }

diff --git a/src/java.base/share/classes/java/util/JapaneseImperialCalendar.java b/src/java.base/share/classes/java/util/JapaneseImperialCalendar.java
@@ -1607,11 +1607,11 @@ private int computeFields(int fieldMask, int tzMask) {
         fixedDate += time / ONE_DAY;
         timeOfDay += (int) (time % ONE_DAY);
         if (timeOfDay >= ONE_DAY) {
-            timeOfDay -= ONE_DAY;
+            timeOfDay -= (int) ONE_DAY;
             ++fixedDate;
         } else {
             while (timeOfDay < 0) {
-                timeOfDay += ONE_DAY;
+                timeOfDay += (int) ONE_DAY;
                 --fixedDate;
             }
         }

diff --git a/src/java.base/share/classes/java/util/UUID.java b/src/java.base/share/classes/java/util/UUID.java
@@ -152,7 +152,7 @@ public static UUID randomUUID() {
         randomBytes[6]  &= 0x0f;  /* clear version        */
         randomBytes[6]  |= 0x40;  /* set to version 4     */
         randomBytes[8]  &= 0x3f;  /* clear variant        */
-        randomBytes[8]  |= 0x80;  /* set to IETF variant  */
+        randomBytes[8]  |= (byte) 0x80;  /* set to IETF variant  */
         return new UUID(randomBytes);
     }
 
@@ -176,7 +176,7 @@ public static UUID nameUUIDFromBytes(byte[] name) {
         md5Bytes[6]  &= 0x0f;  /* clear version        */
         md5Bytes[6]  |= 0x30;  /* set to version 3     */
         md5Bytes[8]  &= 0x3f;  /* clear variant        */
-        md5Bytes[8]  |= 0x80;  /* set to IETF variant  */
+        md5Bytes[8]  |= (byte) 0x80;  /* set to IETF variant  */
         return new UUID(md5Bytes);
     }
 

diff --git a/src/java.base/share/classes/java/util/jar/Manifest.java b/src/java.base/share/classes/java/util/jar/Manifest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -533,7 +533,7 @@ public long skip(long n) throws IOException {
             if (n > avail) {
                 n = avail;
             }
-            pos += n;
+            pos += (int) n;
             return n;
         }
 

diff --git a/src/java.base/share/classes/java/util/stream/Nodes.java b/src/java.base/share/classes/java/util/stream/Nodes.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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
@@ -2055,14 +2055,14 @@ public void compute() {
                 else {
                     task.setPendingCount(task.node.getChildCount() - 1);
 
-                    int size = 0;
+                    long size = 0;
                     int i = 0;
                     for (;i < task.node.getChildCount() - 1; i++) {
-                        K leftTask = task.makeChild(i, task.offset + size);
+                        K leftTask = task.makeChild(i, (int) (task.offset + size));
                         size += leftTask.node.count();
                         leftTask.fork();
                     }
-                    task = task.makeChild(i, task.offset + size);
+                    task = task.makeChild(i, (int) (task.offset + size));
                 }
             }
         }

diff --git a/src/java.base/share/classes/javax/crypto/CipherInputStream.java b/src/java.base/share/classes/javax/crypto/CipherInputStream.java
@@ -297,7 +297,7 @@ public long skip(long n) throws IOException {
         if (n < 0) {
             return 0;
         }
-        ostart += n;
+        ostart += (int) n;
         return n;
     }
 

diff --git a/src/java.base/share/classes/jdk/internal/math/FloatingDecimal.java b/src/java.base/share/classes/jdk/internal/math/FloatingDecimal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 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
@@ -834,7 +834,7 @@ static int estimateDecExp(long fractBits, int binExp) {
             }
         }
 
-        private static int insignificantDigits(int insignificant) {
+        private static int insignificantDigits(long insignificant) {
             int i;
             for ( i = 0; insignificant >= 10L; i++ ) {
                 insignificant /= 10L;

diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Frame.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Frame.java
@@ -611,11 +611,11 @@ private int pop() {
       */
     private void pop(final int elements) {
         if (outputStackTop >= elements) {
-            outputStackTop -= elements;
+            outputStackTop -= (short) elements;
         } else {
             // If the number of elements to be popped is greater than the number of elements in the output
             // stack, clear it, and pop the remaining elements from the input stack.
-            outputStackStart -= elements - outputStackTop;
+            outputStackStart -= (short) (elements - outputStackTop);
             outputStackTop = 0;
         }
     }
@@ -1503,4 +1503,3 @@ static void putAbstractType(
         }
     }
 }
-