openjdk · jddarcy · Apr 21, 2021 · Apr 29, 2021 · Apr 30, 2021 · May 1, 2021
diff --git a/src/java.base/share/classes/java/lang/FdLibm.java b/src/java.base/share/classes/java/lang/FdLibm.java
@@ -120,7 +120,7 @@ private Cbrt() {
             throw new UnsupportedOperationException();
         }
 
-        public static strictfp double compute(double x) {
+        public static double compute(double x) {
             double  t = 0.0;
             double sign;
 
@@ -203,7 +203,7 @@ private Hypot() {
             throw new UnsupportedOperationException();
         }
 
-        public static strictfp double compute(double x, double y) {
+        public static double compute(double x, double y) {
             double a = Math.abs(x);
             double b = Math.abs(y);
 
@@ -343,7 +343,7 @@ private Pow() {
             throw new UnsupportedOperationException();
         }
 
-        public static strictfp double compute(final double x, final double y) {
+        public static double compute(final double x, final double y) {
             double z;
             double r, s, t, u, v, w;
             int i, j, k, n;
@@ -680,8 +680,7 @@ private Exp() {
             throw new UnsupportedOperationException();
         }
 
-        // should be able to forgo strictfp due to controlled over/underflow
-        public static strictfp double compute(double x) {
+        public static double compute(double x) {
             double y;
             double hi = 0.0;
             double lo = 0.0;

diff --git a/src/java.base/share/classes/java/lang/StrictMath.java b/src/java.base/share/classes/java/lang/StrictMath.java
@@ -86,7 +86,6 @@
  * @author  Joseph D. Darcy
  * @since   1.3
  */
-
 public final class StrictMath {
 
     /**
@@ -207,10 +206,8 @@ private StrictMath() {}
      * @return  the measurement of the angle {@code angdeg}
      *          in radians.
      */
-    public static strictfp double toRadians(double angdeg) {
-        // Do not delegate to Math.toRadians(angdeg) because
-        // this method has the strictfp modifier.
-        return angdeg * DEGREES_TO_RADIANS;
+    public static double toRadians(double angdeg) {
+        return Math.toRadians(angdeg);
     }
 
     /**
@@ -224,10 +221,8 @@ public static strictfp double toRadians(double angdeg) {
      * @return  the measurement of the angle {@code angrad}
      *          in degrees.
      */
-    public static strictfp double toDegrees(double angrad) {
-        // Do not delegate to Math.toDegrees(angrad) because
-        // this method has the strictfp modifier.
-        return angrad * RADIANS_TO_DEGREES;
+    public static double toDegrees(double angrad) {
+        return Math.toDegrees(angrad);
     }
 
     /**

diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Lint.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Lint.java
@@ -118,6 +118,9 @@ protected Lint(Context context) {
             if (source.compareTo(Source.JDK9) >= 0) {
                 values.add(LintCategory.DEP_ANN);
             }
+            if (source.compareTo(Source.JDK17) >= 0) {
+                values.add(LintCategory.STRICTFP);
+            }
             values.add(LintCategory.REQUIRES_TRANSITIVE_AUTOMATIC);
             values.add(LintCategory.OPENS);
             values.add(LintCategory.MODULE);
@@ -283,6 +286,11 @@ public enum LintCategory {
          */
         STATIC("static"),
 
+        /**
+         * Warning about unnecessary uses of the strictfp modifier
+         */
+        STRICTFP("strictfp"),
+
         /**
          * Warn about synchronization attempts on instances of @ValueBased classes.
          */

diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Source.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Source.java
@@ -224,6 +224,8 @@ public enum Feature {
         REIFIABLE_TYPES_INSTANCEOF(JDK16, Fragments.FeatureReifiableTypesInstanceof, DiagKind.PLURAL),
         RECORDS(JDK16, Fragments.FeatureRecords, DiagKind.PLURAL),
         SEALED_CLASSES(JDK17, Fragments.FeatureSealedClasses, DiagKind.PLURAL),
+        // todo: will need to supplement/replace with target feature for writing out classes
+        REDUNDANT_STRICTFP(JDK17),
         ;
 
         enum DiagKind {

diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java
@@ -1212,6 +1212,9 @@ else if ((sym.owner.flags_field & INTERFACE) != 0)
             } else {
                 mask = MethodFlags;
             }
+            if ((flags & STRICTFP) != 0) {
+                warnOnExplicitStrictfp(pos, tree);
+            }
             // Imply STRICTFP if owner has STRICTFP set.
             if (((flags|implicit) & Flags.ABSTRACT) == 0 ||
                 ((flags) & Flags.DEFAULT) != 0)
@@ -1253,6 +1256,9 @@ else if ((sym.owner.flags_field & INTERFACE) != 0)
                 mask &= ~ABSTRACT;
                 implicit |= FINAL;
             }
+            if ((flags & STRICTFP) != 0) {
+                warnOnExplicitStrictfp(pos, tree);
+            }
             // Imply STRICTFP if owner has STRICTFP set.
             implicit |= sym.owner.flags_field & STRICTFP;
             break;
@@ -1315,6 +1321,19 @@ && checkDisjoint(pos, flags,
         return flags & (mask | ~ExtendedStandardFlags) | implicit;
     }
 
+    private void warnOnExplicitStrictfp(DiagnosticPosition pos, JCTree tree) {
+        DiagnosticPosition prevLintPos = deferredLintHandler.setPos(tree.pos());
+        try {
+            deferredLintHandler.report(() -> {
+                                           if (lint.isEnabled(LintCategory.STRICTFP)) {
+                                               log.warning(LintCategory.STRICTFP,
+                                                           pos, Warnings.Strictfp); }
+                                       });
+        } finally {
+            deferredLintHandler.setPos(prevLintPos);
+        }
+    }
+
 
     /** Determine if this enum should be implicitly final.
      *

diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/ConstFold.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/ConstFold.java
@@ -41,6 +41,7 @@
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
+@SuppressWarnings("strictfp")
 strictfp class ConstFold {
     protected static final Context.Key<ConstFold> constFoldKey = new Context.Key<>();
 

diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassWriter.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassWriter.java
@@ -40,6 +40,7 @@
 import com.sun.tools.javac.code.*;
 import com.sun.tools.javac.code.Attribute.RetentionPolicy;
 import com.sun.tools.javac.code.Directive.*;
+import com.sun.tools.javac.code.Source.Feature;
 import com.sun.tools.javac.code.Symbol.*;
 import com.sun.tools.javac.code.Type.*;
 import com.sun.tools.javac.code.Types.SignatureGenerator.InvalidSignatureException;
@@ -1697,6 +1698,10 @@ protected int writeExtraAttributes(Symbol sym) {
     int adjustFlags(final long flags) {
         int result = (int)flags;
 
+        // Elide strictfp bit in class files
+        if (Feature.REDUNDANT_STRICTFP.allowedInSource(source))
+            result = result & ~STRICTFP;
+
         if ((flags & BRIDGE) != 0)
             result |= ACC_BRIDGE;
         if ((flags & VARARGS) != 0)

diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
@@ -1764,6 +1764,9 @@ compiler.warn.dir.path.element.not.directory=\
 compiler.warn.missing-explicit-ctor=\
     class {0} in exported package {1} declares no explicit constructors, thereby exposing a default constructor to clients of module {2}
 
+compiler.warn.strictfp=\
+    as of release 17, all floating-point expressions are evaluated strictly and ''strictfp'' is not required
+
 compiler.warn.finally.cannot.complete=\
     finally clause cannot complete normally
 

diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac.properties b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac.properties
@@ -246,6 +246,9 @@ javac.opt.Xlint.desc.serial=\
 javac.opt.Xlint.desc.static=\
     Warn about accessing a static member using an instance.
 
+javac.opt.Xlint.desc.strictfp=\
+    Warn about unnecessary use of the strictfp modifier.
+
 javac.opt.Xlint.desc.text-blocks=\
     Warn about inconsistent white space characters in text block indentation.
 

diff --git a/src/jdk.jshell/share/classes/jdk/jshell/TaskFactory.java b/src/jdk.jshell/share/classes/jdk/jshell/TaskFactory.java
@@ -167,7 +167,7 @@ public <Z> Z analyze(Collection<OuterWrap> wraps,
         List<String> allOptions = new ArrayList<>();
 
         allOptions.add("--should-stop=at=FLOW");
-        allOptions.add("-Xlint:unchecked");
+        allOptions.add("-Xlint:unchecked,-strictfp");
         allOptions.add("-proc:none");
         allOptions.addAll(extraArgs);
 
@@ -184,7 +184,7 @@ public <Z> Z compile(Collection<OuterWrap> wraps,
 
         return runTask(wraps.stream(),
                        sh,
-                       List.of("-Xlint:unchecked", "-proc:none", "-parameters"),
+                       List.of("-Xlint:unchecked,-strictfp", "-proc:none", "-parameters"),
                        (jti, diagnostics) -> new CompileTask(sh, jti, diagnostics),
                        worker);
     }

diff --git a/test/langtools/tools/javac/7166455/CheckACC_STRICTFlagOnclinitTest.java b/test/langtools/tools/javac/7166455/CheckACC_STRICTFlagOnclinitTest.java
@@ -26,6 +26,7 @@
  * @bug 7166455
  * @summary javac doesn't set ACC_STRICT bit on <clinit> for strictfp class
  * @modules jdk.jdeps/com.sun.tools.classfile
+ * @compile -source 16 CheckACC_STRICTFlagOnclinitTest.java
  * @run main CheckACC_STRICTFlagOnclinitTest
  */
 

diff --git a/test/langtools/tools/javac/8005931/CheckACC_STRICTFlagOnPkgAccessClassTest.java b/test/langtools/tools/javac/8005931/CheckACC_STRICTFlagOnPkgAccessClassTest.java
@@ -81,7 +81,8 @@ private void run(JavaCompiler comp)
     }
 
     private void compile(JavaCompiler comp) {
-        JavacTask ct = (JavacTask)comp.getTask(null, null, null, null, null,
+        JavacTask ct = (JavacTask)comp.getTask(null, null, null,
+                                               List.of("--release", "16"), null,
                 Arrays.asList(source));
         try {
             if (!ct.call()) {

diff --git a/test/langtools/tools/javac/FloatingPointChanges/BadConstructorModifiers.java b/test/langtools/tools/javac/FloatingPointChanges/BadConstructorModifiers.java
@@ -1,10 +1,11 @@
 /*
  * @test  /nodynamiccopyright/
- * @bug 4153038 4785453
+ * @bug 4153038 4785453 8244146
  * @summary strictfp may not be used with constructors
  * @author David Stoutamire (dps)
  *
- * @compile/fail/ref=BadConstructorModifiers.out -XDrawDiagnostics BadConstructorModifiers.java
+ * @compile/fail/ref=BadConstructorModifiers.out -XDrawDiagnostics --release 16     BadConstructorModifiers.java
+ * @compile/fail/ref=BadConstructorModifiers.out -XDrawDiagnostics -Xlint:-strictfp BadConstructorModifiers.java
  */
 
 public class BadConstructorModifiers {

diff --git a/test/langtools/tools/javac/FloatingPointChanges/BadConstructorModifiers.out b/test/langtools/tools/javac/FloatingPointChanges/BadConstructorModifiers.out
@@ -1,2 +1,2 @@
-BadConstructorModifiers.java:12:14: compiler.err.mod.not.allowed.here: strictfp
+BadConstructorModifiers.java:13:14: compiler.err.mod.not.allowed.here: strictfp
 1 error
diff --git a/test/langtools/tools/javac/T6397044.java b/test/langtools/tools/javac/T6397044.java
@@ -49,7 +49,7 @@ public static void main(String[] args) throws Exception {
         try (StandardJavaFileManager fm = tool.getStandardFileManager(null, null, null)) {
             Iterable<? extends JavaFileObject> files
                 = fm.getJavaFileObjectsFromFiles(Arrays.asList(new File(srcDir, self + ".java")));
-            JavacTask task = tool.getTask(null, fm, null, null, null, files);
+            JavacTask task = tool.getTask(null, fm, null, List.of("--release", "16"), null, files);
             Iterable<? extends CompilationUnitTree> trees = task.parse();
             Checker checker = new Checker();
             for (CompilationUnitTree tree: trees)

diff --git a/test/langtools/tools/javac/annotations/AnnotationTypeElementModifiers.java b/test/langtools/tools/javac/annotations/AnnotationTypeElementModifiers.java
@@ -1,8 +1,9 @@
 /*
  * @test /nodynamiccopyright/
- * @bug 8028428
+ * @bug 8028428 8244146
  * @summary Test that only 'public' and 'abstract' elements compile
- * @compile/fail/ref=AnnotationTypeElementModifiers.out -XDrawDiagnostics AnnotationTypeElementModifiers.java
+ * @compile/fail/ref=AnnotationTypeElementModifiers.out -XDrawDiagnostics --release 16 AnnotationTypeElementModifiers.java
+ * @compile/fail/ref=AnnotationTypeElementModifiers.out -XDrawDiagnostics -Xlint:-strictfp AnnotationTypeElementModifiers.java
  */
 
 public @interface AnnotationTypeElementModifiers {

diff --git a/test/langtools/tools/javac/annotations/AnnotationTypeElementModifiers.out b/test/langtools/tools/javac/annotations/AnnotationTypeElementModifiers.out
@@ -1,21 +1,21 @@
-AnnotationTypeElementModifiers.java:17:17: compiler.err.mod.not.allowed.here: private
 AnnotationTypeElementModifiers.java:18:17: compiler.err.mod.not.allowed.here: private
-AnnotationTypeElementModifiers.java:20:19: compiler.err.mod.not.allowed.here: protected
+AnnotationTypeElementModifiers.java:19:17: compiler.err.mod.not.allowed.here: private
 AnnotationTypeElementModifiers.java:21:19: compiler.err.mod.not.allowed.here: protected
-AnnotationTypeElementModifiers.java:23:16: compiler.err.mod.not.allowed.here: static
+AnnotationTypeElementModifiers.java:22:19: compiler.err.mod.not.allowed.here: protected
 AnnotationTypeElementModifiers.java:24:16: compiler.err.mod.not.allowed.here: static
-AnnotationTypeElementModifiers.java:26:15: compiler.err.mod.not.allowed.here: final
+AnnotationTypeElementModifiers.java:25:16: compiler.err.mod.not.allowed.here: static
 AnnotationTypeElementModifiers.java:27:15: compiler.err.mod.not.allowed.here: final
-AnnotationTypeElementModifiers.java:29:22: compiler.err.mod.not.allowed.here: synchronized
+AnnotationTypeElementModifiers.java:28:15: compiler.err.mod.not.allowed.here: final
 AnnotationTypeElementModifiers.java:30:22: compiler.err.mod.not.allowed.here: synchronized
-AnnotationTypeElementModifiers.java:32:18: compiler.err.mod.not.allowed.here: volatile
+AnnotationTypeElementModifiers.java:31:22: compiler.err.mod.not.allowed.here: synchronized
 AnnotationTypeElementModifiers.java:33:18: compiler.err.mod.not.allowed.here: volatile
-AnnotationTypeElementModifiers.java:35:19: compiler.err.mod.not.allowed.here: transient
+AnnotationTypeElementModifiers.java:34:18: compiler.err.mod.not.allowed.here: volatile
 AnnotationTypeElementModifiers.java:36:19: compiler.err.mod.not.allowed.here: transient
-AnnotationTypeElementModifiers.java:38:16: compiler.err.mod.not.allowed.here: native
+AnnotationTypeElementModifiers.java:37:19: compiler.err.mod.not.allowed.here: transient
 AnnotationTypeElementModifiers.java:39:16: compiler.err.mod.not.allowed.here: native
-AnnotationTypeElementModifiers.java:41:20: compiler.err.mod.not.allowed.here: strictfp
+AnnotationTypeElementModifiers.java:40:16: compiler.err.mod.not.allowed.here: native
 AnnotationTypeElementModifiers.java:42:20: compiler.err.mod.not.allowed.here: strictfp
-AnnotationTypeElementModifiers.java:44:17: compiler.err.mod.not.allowed.here: default
+AnnotationTypeElementModifiers.java:43:20: compiler.err.mod.not.allowed.here: strictfp
 AnnotationTypeElementModifiers.java:45:17: compiler.err.mod.not.allowed.here: default
+AnnotationTypeElementModifiers.java:46:17: compiler.err.mod.not.allowed.here: default
 20 errors
diff --git a/.../langtools/tools/javac/annotations/typeAnnotations/classfile/NestedLambdasCastedTest.java b/.../langtools/tools/javac/annotations/typeAnnotations/classfile/NestedLambdasCastedTest.java
@@ -30,7 +30,7 @@
  *          jdk.compiler/com.sun.tools.javac.main
  *          jdk.jdeps/com.sun.tools.javap
  * @build toolbox.ToolBox toolbox.JavapTask
- * @run compile -g NestedLambdasCastedTest.java
+ * @run compile -source 16 -g NestedLambdasCastedTest.java
  * @run main NestedLambdasCastedTest
  */
 

diff --git a/test/langtools/tools/javac/defaultMethods/CheckACC_STRICTFlagOnDefaultMethodTest.java b/test/langtools/tools/javac/defaultMethods/CheckACC_STRICTFlagOnDefaultMethodTest.java
@@ -26,6 +26,7 @@
  * @bug 8012723
  * @summary strictfp interface misses strictfp modifer on default method
  * @modules jdk.jdeps/com.sun.tools.classfile
+ * @compile -source 16 CheckACC_STRICTFlagOnDefaultMethodTest.java
  * @run main CheckACC_STRICTFlagOnDefaultMethodTest
  */
 

diff --git a/test/langtools/tools/javac/diags/examples/UnneededStrictfpWarning.java b/test/langtools/tools/javac/diags/examples/UnneededStrictfpWarning.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2021, 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.
+ */
+
+// key: compiler.warn.strictfp
+// options: -Xlint:strictfp
+
+strictfp class UnneededStrictfpWarning {
+}
diff --git a/test/langtools/tools/javac/lambda/LambdaTestStrictFPFlag.java b/test/langtools/tools/javac/lambda/LambdaTestStrictFPFlag.java
@@ -26,6 +26,8 @@
  * @bug 8046060
  * @summary Different results of floating point multiplication for lambda code block
  * @modules jdk.jdeps/com.sun.tools.classfile
+ * @compile -source 16 LambdaTestStrictFPFlag.java
+ * @run main LambdaTestStrictFPFlag
  */
 
 import java.io.*;