Roll back Objects.rNN for now

Author: liach

src/java.base/share/classes/java/util/Objects.java

@@ -25,11 +25,8 @@
 
 package java.util;
 
-import jdk.internal.access.SharedSecrets;
 import jdk.internal.util.Preconditions;
-import jdk.internal.vm.annotation.DontInline;
 import jdk.internal.vm.annotation.ForceInline;
-import jdk.internal.vm.annotation.Hidden;
 
 import java.util.function.Supplier;
 
@@ -220,18 +217,10 @@ public static <T> int compare(T a, T b, Comparator<? super T> c) {
     @ForceInline
     public static <T> T requireNonNull(T obj) {
         if (obj == null)
-            throw extendedNullPointerException();
+            throw new NullPointerException();
         return obj;
     }
 
-    /// Squeeze code here to avoid blowing up ForceInline above with two calls
-    @Hidden
-    @DontInline
-    private static NullPointerException extendedNullPointerException() {
-        // 1 offset for explicit requireNonNull, 0 slot for incoming argument
-        return SharedSecrets.getJavaLangAccess().extendedNullPointerException(1, 0);
-    }
-
     /**
      * Checks that the specified object reference is not {@code null} and
      * throws a customized {@link NullPointerException} if it is. This method

test/hotspot/jtreg/runtime/exceptionMsgs/NullPointerException/MethodParametersTest.java

@@ -26,6 +26,7 @@
  * @summary Test the MethodParameters-based NPE messages.
  * @bug 8233268
  * @library /test/lib
+ * @modules java.base/jdk.internal.access
  * @clean MethodParametersTest InnerClass
  * @compile -parameters -g:none MethodParametersTest.java
  * @run junit/othervm -XX:+ShowCodeDetailsInExceptionMessages MethodParametersTest
@@ -34,14 +35,26 @@
 import java.lang.reflect.InvocationTargetException;
 import java.util.Objects;
 
+import jdk.internal.access.JavaLangAccess;
+import jdk.internal.access.SharedSecrets;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.*;
 
 public class MethodParametersTest {
+    private static final JavaLangAccess JLA = SharedSecrets.getJavaLangAccess();
+
+    // An arbitrary null-checking API
+    static void nullCheck(Object arg) {
+        if (arg == null) {
+            throw JLA.extendedNullPointerException(1, 0);
+        }
+    }
 
     class InnerClass {}
 
+    @Disabled("Requires javac's API support")
     @Test
     void testOuterThis() {
         var npe = assertThrows(NullPointerException.class, () -> {
@@ -54,10 +67,10 @@ void testOuterThis() {
         assertEquals("\"this$0\" is null", npe.getMessage());
     }
 
-    // Random slot to param index mappings, both raw and requireNonNull NPEs
+    // Random slot to param index mappings, both raw and null-check API NPEs
     // 0, 1, 3, 5
     static void myMethod(String firstArg, long l1, double l2, int[] lastArg) {
-        Objects.requireNonNull(firstArg);
+        nullCheck(firstArg);
         System.out.println(lastArg.length);
         Object a = l1 > 100 ? null : ""; // 6
         a.toString();

test/hotspot/jtreg/runtime/exceptionMsgs/NullPointerException/RequireNonNullTest.java renamed to test/hotspot/jtreg/runtime/exceptionMsgs/NullPointerException/NullCheckAPITest.java

@@ -23,24 +23,48 @@
 
 /*
  * @test
- * @summary Test the messages for 1-arg requireNonNull.
+ * @summary Test the messages for arbitrary null-check APIs.
  * @bug 8233268
  * @library /test/lib
- * @compile -g RequireNonNullTest.java
- * @run junit/othervm -XX:+ShowCodeDetailsInExceptionMessages RequireNonNullTest
+ * @modules java.base/jdk.internal.access
+ * @compile -g NullCheckAPITest.java
+ * @run junit/othervm -DnullCheckAPI.nestedThrow=true -XX:+ShowCodeDetailsInExceptionMessages NullCheckAPITest
+ * @run junit/othervm -DnullCheckAPI.nestedThrow=false -XX:+ShowCodeDetailsInExceptionMessages NullCheckAPITest
  */
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.ParameterizedType;
-import java.util.Objects;
 
+import jdk.internal.access.JavaLangAccess;
+import jdk.internal.access.SharedSecrets;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.function.Executable;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public class RequireNonNullTest {
+public class NullCheckAPITest {
+
+    private static final JavaLangAccess JLA = SharedSecrets.getJavaLangAccess();
+    private static final boolean NESTED_THROW = Boolean.getBoolean("nullCheckAPI.nestedThrow");
+
+    // An arbitrary null-checking API
+    static void nullCheck(Object arg) {
+        if (arg == null) {
+            if (NESTED_THROW) {
+                // 2 offset: nullCheck, throwNpe;
+                throwNpe();
+            } else {
+                // 1 offset: nullCheck
+                throw JLA.extendedNullPointerException(1, 0);
+            }
+        }
+    }
+
+    static void throwNpe() {
+        throw JLA.extendedNullPointerException(2, 0);
+    }
 
     /// A simple NPE message for an expression
     static String simpleMessage(String cause) {
@@ -64,32 +88,38 @@ static void checkInvocationMessage(Executable action, String cause) {
 
     class Dummy { Object field; }
 
+    @Test
+    void test() {
+        checkSimpleMessage(() -> generateVariableNpe(null), "myA");
+        checkSimpleMessage(() -> generateVariableNpe(new Dummy()), "myA.field");
+
+        checkInvocationMessage(() -> nullCheck(int.class.getSuperclass()), "java.lang.Class.getSuperclass()");
+    }
+
     static class One extends Dummy {
-        One(RequireNonNullTest rnnt) {
+        One(NullCheckAPITest rnnt) {
             rnnt.super();
         }
     }
 
     @Test
-    void test() {
-        checkSimpleMessage(() -> generateVariableNpe(null), "myA");
-        checkSimpleMessage(() -> generateVariableNpe(new Dummy()), "myA.field");
+    @Disabled("Requires javac's API support")
+    void testRequireNonNull() {
         checkSimpleMessage(() -> {
-            RequireNonNullTest t = null;
+            NullCheckAPITest t = null;
             t.new Dummy();
         }, "t");
         checkSimpleMessage(() -> new One(null), "rnnt");
 
         var npe = assertThrows(NullPointerException.class, () -> {
             try {
-                Dummy.class.getDeclaredConstructor(RequireNonNullTest.class).newInstance((Object) null);
+                Dummy.class.getDeclaredConstructor(NullCheckAPITest.class).newInstance((Object) null);
             } catch (InvocationTargetException ex) {
                 throw ex.getCause();
             }
         });
         assertEquals("\"this$0\" is null", npe.getMessage());
 
-        checkInvocationMessage(() -> Objects.requireNonNull(int.class.getSuperclass()), "java.lang.Class.getSuperclass()");
         checkInvocationMessage(() -> {
             switch (int.class.getGenericSuperclass()) {
                 case ParameterizedType pt -> {}
@@ -101,7 +131,7 @@ void test() {
 
     // A method that generate NPE from variables
     static void generateVariableNpe(Dummy myA) {
-        Objects.requireNonNull(myA);
-        Objects.requireNonNull(myA.field);
+        nullCheck(myA);
+        nullCheck(myA.field);
     }
 }

test/jdk/java/util/Objects/BasicObjectsTest.java

@@ -208,7 +208,7 @@ private static int testRequireNonNull() {
         errors += testRNN_NonNull(rnn2, RNN_2);
         errors += testRNN_NonNull(rnn3, RNN_3);
 
-        // No message constraint for 1-arg
+        errors += testRNN_Null(rnn1, RNN_1, null);
         errors += testRNN_Null(rnn2, RNN_2, "trousers");
         errors += testRNN_Null(rnn3, RNN_3, "trousers");
         return errors;