8301806: TestNulls does not cover all API classes

Reviewed-by: mcimadamore

Author: JornVernee

src/java.base/share/classes/java/lang/foreign/Linker.java

@@ -35,6 +35,7 @@
 
 import java.lang.foreign.ValueLayout.OfAddress;
 import java.lang.invoke.MethodHandle;
+import java.util.Objects;
 import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -338,7 +339,8 @@ static Option firstVariadicArg(int index) {
          * @see #captureStateLayout()
          */
         static Option captureCallState(String... capturedState) {
-            Set<CapturableState> set = Stream.of(capturedState)
+            Set<CapturableState> set = Stream.of(Objects.requireNonNull(capturedState))
+                    .map(Objects::requireNonNull)
                     .map(CapturableState::forName)
                     .collect(Collectors.toSet());
             return new LinkerOptions.CaptureCallState(set);
@@ -380,7 +382,7 @@ static Option isTrivial() {
          * @param handler the handler
          */
         static Option uncaughtExceptionHandler(Thread.UncaughtExceptionHandler handler) {
-            return new LinkerOptions.UncaughtExceptionHandler(handler);
+            return new LinkerOptions.UncaughtExceptionHandler(Objects.requireNonNull(handler));
         }
     }
 }

test/jdk/java/foreign/TestNulls.java

@@ -95,8 +95,12 @@ public class TestNulls {
             ValueLayout.OfLong.class,
             ValueLayout.OfDouble.class,
             ValueLayout.OfAddress.class,
+            PaddingLayout.class,
             GroupLayout.class,
+            StructLayout.class,
+            UnionLayout.class,
             Linker.class,
+            Linker.Option.class,
             FunctionDescriptor.class,
             SegmentAllocator.class,
             MemorySegment.Scope.class,
@@ -156,7 +160,10 @@ static <Z> void addDefaultMapping(Class<Z> carrier, Z value) {
         addDefaultMapping(ValueLayout.OfFloat.class, ValueLayout.JAVA_FLOAT);
         addDefaultMapping(ValueLayout.OfLong.class, JAVA_LONG);
         addDefaultMapping(ValueLayout.OfDouble.class, ValueLayout.JAVA_DOUBLE);
+        addDefaultMapping(PaddingLayout.class, MemoryLayout.paddingLayout(32));
         addDefaultMapping(GroupLayout.class, MemoryLayout.structLayout(ValueLayout.JAVA_INT));
+        addDefaultMapping(StructLayout.class, MemoryLayout.structLayout(ValueLayout.JAVA_INT));
+        addDefaultMapping(UnionLayout.class, MemoryLayout.unionLayout(ValueLayout.JAVA_INT));
         addDefaultMapping(SequenceLayout.class, MemoryLayout.sequenceLayout(1, ValueLayout.JAVA_INT));
         addDefaultMapping(SymbolLookup.class, SymbolLookup.loaderLookup());
         addDefaultMapping(MemorySegment.class, MemorySegment.ofArray(new byte[10]));
@@ -167,6 +174,7 @@ static <Z> void addDefaultMapping(Class<Z> carrier, Z value) {
         addDefaultMapping(SegmentAllocator.class, SegmentAllocator.prefixAllocator(MemorySegment.ofArray(new byte[10])));
         addDefaultMapping(Supplier.class, () -> null);
         addDefaultMapping(ClassLoader.class, TestNulls.class.getClassLoader());
+        addDefaultMapping(Thread.UncaughtExceptionHandler.class, (thread, ex) -> {});
     }
 
     static final Map<Class<?>, Object[]> REPLACEMENT_VALUES = new HashMap<>();