8325148: Enable restricted javac warning in java.base

Reviewed-by: erikj, jvernee, mcimadamore, pminborg, ihse

Author: jddarcy

make/modules/java.base/Java.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2020, 2024, 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
@@ -23,7 +23,7 @@
 # questions.
 #
 
-DISABLED_WARNINGS_java += this-escape restricted
+DISABLED_WARNINGS_java += this-escape
 
 DOCLINT += -Xdoclint:all/protected \
     '-Xdoclint/package:java.*,javax.*'

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, 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
@@ -205,6 +205,7 @@ default SymbolLookup or(SymbolLookup other) {
      * @see System#loadLibrary(String)
      */
     @CallerSensitive
+    @SuppressWarnings("restricted")
     static SymbolLookup loaderLookup() {
         Class<?> caller = Reflection.getCallerClass();
         // If there's no caller class, fallback to system loader
@@ -227,7 +228,7 @@ static SymbolLookup loaderLookup() {
             return addr == 0L ?
                     Optional.empty() :
                     Optional.of(MemorySegment.ofAddress(addr)
-                                    .reinterpret(loaderArena, null));
+                                .reinterpret(loaderArena, null)); // restricted
         };
     }
 
@@ -300,6 +301,7 @@ static SymbolLookup libraryLookup(Path path, Arena arena) {
         return libraryLookup(path, RawNativeLibraries::load, arena);
     }
 
+    @SuppressWarnings("restricted")
     private static <Z>
     SymbolLookup libraryLookup(Z libDesc,
                                BiFunction<RawNativeLibraries, Z, NativeLibrary> loadLibraryFunc,
@@ -327,7 +329,7 @@ public void cleanup() {
             return addr == 0L ?
                     Optional.empty() :
                     Optional.of(MemorySegment.ofAddress(addr)
-                            .reinterpret(libArena, null));
+                                .reinterpret(libArena, null));  // restricted
         };
     }
 }

src/java.base/share/classes/jdk/internal/foreign/SystemLookup.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, 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
@@ -101,6 +101,7 @@ public Boolean run() {
             SymbolLookup fallbackLibLookup =
                     libLookup(libs -> libs.load(jdkLibraryPath("syslookup")));
 
+            @SuppressWarnings("restricted")
             MemorySegment funcs = fallbackLibLookup.find("funcs").orElseThrow()
                     .reinterpret(WindowsFallbackSymbols.LAYOUT.byteSize());
 

src/java.base/share/classes/jdk/internal/foreign/abi/AbstractLinker.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, 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
@@ -256,6 +256,7 @@ private void checkHasNaturalAlignment(MemoryLayout layout) {
         }
     }
 
+    @SuppressWarnings("restricted")
     private static MemoryLayout stripNames(MemoryLayout ml) {
         // we don't care about transferring alignment and byte order here
         // since the linker already restricts those such that they will always be the same
@@ -264,7 +265,7 @@ private static MemoryLayout stripNames(MemoryLayout ml) {
             case UnionLayout ul -> MemoryLayout.unionLayout(stripNames(ul.memberLayouts()));
             case SequenceLayout sl -> MemoryLayout.sequenceLayout(sl.elementCount(), stripNames(sl.elementLayout()));
             case AddressLayout al -> al.targetLayout()
-                    .map(tl -> al.withoutName().withTargetLayout(stripNames(tl)))
+                    .map(tl -> al.withoutName().withTargetLayout(stripNames(tl))) // restricted
                     .orElseGet(al::withoutName);
             default -> ml.withoutName(); // ValueLayout and PaddingLayout
         };

src/java.base/share/classes/jdk/internal/foreign/abi/Binding.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, 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
@@ -749,11 +749,12 @@ public void verify(Deque<Class<?>> stack) {
         }
 
         @Override
+        @SuppressWarnings("restricted")
         public void interpret(Deque<Object> stack, StoreFunc storeFunc,
                               LoadFunc loadFunc, SegmentAllocator allocator) {
             MemorySegment segment = Utils.longToAddress((long) stack.pop(), size, align);
             if (needsScope) {
-                segment = segment.reinterpret((Arena) allocator, null);
+                segment = segment.reinterpret((Arena) allocator, null); // restricted
             }
             stack.push(segment);
         }

src/java.base/share/classes/jdk/internal/foreign/abi/SharedUtils.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, 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
@@ -81,6 +81,7 @@ private SharedUtils() {
     public static final MethodHandle MH_CHECK_SYMBOL;
     private static final MethodHandle MH_CHECK_CAPTURE_SEGMENT;
 
+    @SuppressWarnings("restricted")
     public static final AddressLayout C_POINTER = ADDRESS
             .withTargetLayout(MemoryLayout.sequenceLayout(Long.MAX_VALUE, JAVA_BYTE));
 

src/java.base/share/classes/jdk/internal/foreign/abi/UpcallStubs.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, 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
@@ -51,13 +51,14 @@ private static void freeUpcallStub(long stubAddress) {
         registerNatives();
     }
 
+    @SuppressWarnings("restricted")
     static MemorySegment makeUpcall(long entry, Arena arena) {
         MemorySessionImpl.toMemorySession(arena).addOrCleanupIfFail(new MemorySessionImpl.ResourceList.ResourceCleanup() {
             @Override
             public void cleanup() {
                 freeUpcallStub(entry);
             }
         });
-        return MemorySegment.ofAddress(entry).reinterpret(arena, null);
+        return MemorySegment.ofAddress(entry).reinterpret(arena, null); // restricted
     }
 }

src/java.base/share/classes/jdk/internal/foreign/abi/fallback/FallbackLinker.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, 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
@@ -218,21 +218,22 @@ private static Object doDowncall(SegmentAllocator returnAllocator, Object[] args
     // note that cif is not used, but we store it here to keep it alive
     private record UpcallData(MemoryLayout returnLayout, List<MemoryLayout> argLayouts, MemorySegment cif) {}
 
+    @SuppressWarnings("restricted")
     private static void doUpcall(MethodHandle target, MemorySegment retPtr, MemorySegment argPtrs, UpcallData data) throws Throwable {
         List<MemoryLayout> argLayouts = data.argLayouts();
         int numArgs = argLayouts.size();
         MemoryLayout retLayout = data.returnLayout();
         try (Arena upcallArena = Arena.ofConfined()) {
             MemorySegment argsSeg = argPtrs.reinterpret(numArgs * ADDRESS.byteSize(), upcallArena, null);
             MemorySegment retSeg = retLayout != null
-                ? retPtr.reinterpret(retLayout.byteSize(), upcallArena, null)
+                ? retPtr.reinterpret(retLayout.byteSize(), upcallArena, null) // restricted
                 : null;
 
             Object[] args = new Object[numArgs];
             for (int i = 0; i < numArgs; i++) {
                 MemoryLayout argLayout = argLayouts.get(i);
                 MemorySegment argPtr = argsSeg.getAtIndex(ADDRESS, i)
-                        .reinterpret(argLayout.byteSize(), upcallArena, null);
+                        .reinterpret(argLayout.byteSize(), upcallArena, null); // restricted
                 args[i] = readValue(argPtr, argLayout);
             }
 

src/java.base/share/classes/jdk/internal/foreign/abi/fallback/LibFallback.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, 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
@@ -160,6 +160,7 @@ static MemorySegment prepCifVar(MemorySegment returnType, int numFixedArgs, int
      * @throws IllegalStateException if the call to {@code ffi_prep_closure_loc} returns a non-zero status code
      * @throws IllegalArgumentException if {@code target} does not have the right type
      */
+    @SuppressWarnings("restricted")
     static MemorySegment createClosure(MemorySegment cif, MethodHandle target, Arena arena)
             throws IllegalStateException, IllegalArgumentException {
         if (target.type() != UPCALL_TARGET_TYPE) {
@@ -172,7 +173,8 @@ static MemorySegment createClosure(MemorySegment cif, MethodHandle target, Arena
         long execPtr = ptrs[1];
         long globalTarget = ptrs[2];
 
-        return MemorySegment.ofAddress(execPtr).reinterpret(arena, unused -> freeClosure(closurePtr, globalTarget));
+        return MemorySegment.ofAddress(execPtr)
+            .reinterpret(arena, unused -> freeClosure(closurePtr, globalTarget)); // restricted
     }
 
     // the target function for a closure call