8253465: jextract should generate constant classes as package private

Reviewed-by: jvernee

Author: sundararajana

src/jdk.incubator.jextract/share/classes/README

@@ -4,7 +4,6 @@ jextract was run using "sh extract.sh" on Mac OS.
 Manual modifications:
 
 * GNU/CP copyright header added
-* CSupport.SysV.* imports replaced by CSupport.* (platform independent C layouts)
 * Generated C_LONG layouts are replaced with C_LONGLONG for portability
 * Index_h$constants$N classes were renamed to be Index_h$constants_N
 * Index_h$constants_0.libName was manually added to handle platform dependency of

src/jdk.incubator.jextract/share/classes/jdk/internal/clang/libclang/Index_h$constants.java src/jdk.incubator.jextract/share/classes/jdk/internal/clang/libclang/C.java

@@ -24,16 +24,25 @@
  *
  */
 
-// Generated by jextract
-
 package jdk.internal.clang.libclang;
+// Generated by jextract
 
-import java.lang.invoke.MethodHandle;
-import java.lang.invoke.VarHandle;
-import jdk.incubator.foreign.*;
-import jdk.incubator.foreign.MemoryLayout.PathElement;
-import static jdk.incubator.foreign.CLinker.*;
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
-public final class Index_h$constants extends Index_h$constants_2 {
+/**
+ * Annotation to indicate C types
+ */
+@Target({ ElementType.TYPE_USE })
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface C {
+    /**
+     * The C type associated with a given Java type
+     * @return The C type associated with a given Java type
+     */
+    String value();
 }
-

src/jdk.incubator.jextract/share/classes/jdk/internal/clang/libclang/Index_h$constants_0.java

@@ -24,9 +24,8 @@
  *
  */
 
-// Generated by jextract
-
 package jdk.internal.clang.libclang;
+// Generated by jextract
 
 import jdk.incubator.foreign.Addressable;
 import jdk.incubator.foreign.CLinker;
@@ -41,13 +40,12 @@
 import java.lang.invoke.MethodType;
 import java.io.File;
 import java.nio.file.Path;
+import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.Optional;
 import java.util.stream.Stream;
 
-import static jdk.incubator.foreign.CLinker.C_DOUBLE;
-import static jdk.incubator.foreign.CLinker.C_LONGLONG;
-import static jdk.incubator.foreign.CLinker.C_POINTER;
+import static jdk.incubator.foreign.CLinker.*;
 
 final class RuntimeHelper {
     private RuntimeHelper() {}
@@ -77,10 +75,6 @@ static final MemorySegment lookupGlobalVariable(LibraryLookup[] LIBRARIES, Strin
                     .withOwnerThread(null))).orElse(null);
     }
 
-    static final MemorySegment nonCloseableNonTransferableSegment(MemorySegment seg) {
-        return seg.withAccessModes(seg.accessModes() &  ~MemorySegment.CLOSE & ~MemorySegment.HANDOFF);
-    }
-
     static final MethodHandle downcallHandle(LibraryLookup[] LIBRARIES, String name, String desc, FunctionDescriptor fdesc, boolean variadic) {
         return lookup(LIBRARIES, name).map(
                 addr -> {
@@ -102,11 +96,19 @@ static final <Z> MemorySegment upcallStub(Class<Z> fi, Z z, FunctionDescriptor f
         }
     }
 
-    static final MemorySegment asArrayRestricted(MemoryAddress addr, MemoryLayout layout, int numElements) {
-        return nonCloseableNonTransferableSegment(addr.asSegmentRestricted(numElements * layout.byteSize()));
+    static final MemorySegment nonCloseableNonTransferableSegment(MemorySegment seg) {
+        return seg.withAccessModes(seg.accessModes() &  ~MemorySegment.CLOSE & ~MemorySegment.HANDOFF);
+    }
+
+    static MemorySegment asArrayRestricted(MemoryAddress addr, MemoryLayout layout, int numElements) {
+        return nonCloseableSegment(addr.asSegmentRestricted(numElements * layout.byteSize()));
+    }
+
+    // Internals only below this point
+    private static final MemorySegment nonCloseableSegment(MemorySegment seg) {
+        return seg.withAccessModes(seg.accessModes() &  ~MemorySegment.CLOSE);
     }
 
-    // Internals below this point
     private static final Optional<LibraryLookup.Symbol> lookup(LibraryLookup[] LIBRARIES, String sym) {
         return Stream.of(LIBRARIES)
                 .flatMap(l -> l.lookup(sym).stream())

src/jdk.incubator.jextract/share/classes/jdk/internal/clang/libclang/Index_h$constants_1.java

@@ -205,10 +205,7 @@ private static String toInternalName(String className) {
 
     private void classBegin(String baseClassName, boolean isFinal) {
         String baseName = baseClassName != null ? toInternalName(baseClassName) : INTR_OBJECT;
-        int mods = ACC_PUBLIC;
-        if (isFinal) {
-            mods |= ACC_FINAL;
-        }
+        int mods = isFinal? ACC_FINAL : 0;
         cw.visit(V15, mods, internalClassName, null, baseName, null);
     }
 
@@ -513,7 +510,7 @@ private static void emitConDouble(MethodVisitor mv, double value) {
     private DirectMethodHandleDesc emitGetter(String name, Class<?> type, Consumer<MethodVisitor> action) {
         return pool.computeIfAbsent(name, nameKey -> {
             MethodType mt = methodType(type);
-            MethodVisitor mv = cw.visitMethod(ACC_PUBLIC | ACC_STATIC, nameKey, mt.descriptorString(), null, null);
+            MethodVisitor mv = cw.visitMethod(ACC_STATIC | ACC_FINAL, nameKey, mt.descriptorString(), null, null);
             mv.visitCode();
             action.accept(mv);
             emitReturn(mv, type);

src/jdk.incubator.jextract/share/classes/jdk/internal/clang/libclang/Index_h$constants_2.java

@@ -52,7 +52,7 @@
 
 // generates ConstantHelper as java source
 class SourceConstantHelper implements ConstantHelper {
-    private static final String PACKAGE_FINAL_MODS = "static final ";
+    private static final String PKG_STATIC_FINAL_MODS = "static final ";
 
     // set of names generates already
     private static final Map<String, DirectMethodHandleDesc> namesGenerated = new HashMap<>();
@@ -199,7 +199,6 @@ private void emitConstructor() {
     private void classBegin(String[] libraryNames, String baseClassName, boolean isFinal) {
         addPackagePrefix(pkgName);
         addImportSection();
-        append("public ");
         if (isFinal) {
             append("final ");
         }
@@ -231,7 +230,7 @@ private DirectMethodHandleDesc getGetterDesc(String name, Class<?> type) {
     private DirectMethodHandleDesc emitGetter(String name, Class<?> type, String value) {
         incrAlign();
         indent();
-        append(JavaSourceBuilder.PUB_MODS);
+        append(PKG_STATIC_FINAL_MODS);
         append(type.getName());
         append(' ');
         append(name);
@@ -300,7 +299,7 @@ private String emitMethodHandleField(String javaName, String nativeName, MethodT
         incrAlign();
         String fieldName = getMethodHandleFieldName(javaName);
         indent();
-        append(PACKAGE_FINAL_MODS + "MethodHandle ");
+        append(PKG_STATIC_FINAL_MODS + "MethodHandle ");
         append(fieldName + " = RuntimeHelper.downcallHandle(\n");
         incrAlign();
         indent();
@@ -335,7 +334,7 @@ private String emitVarHandleField(String javaName, String nativeName, Class<?> t
         }
         indent();
         String fieldName = getVarHandleFieldName(javaName);
-        append(PACKAGE_FINAL_MODS + "VarHandle " + fieldName + " = ");
+        append(PKG_STATIC_FINAL_MODS + "VarHandle " + fieldName + " = ");
         if (isAddr) {
             append("MemoryHandles.asAddressVarHandle(");
         }
@@ -361,7 +360,7 @@ private String emitLayoutField(String javaName, MemoryLayout layout) {
         String fieldName = getLayoutFieldName(javaName);
         incrAlign();
         indent();
-        append(PACKAGE_FINAL_MODS + "MemoryLayout " + fieldName + " = ");
+        append(PKG_STATIC_FINAL_MODS + "MemoryLayout " + fieldName + " = ");
         emitLayoutString(layout);
         append(";\n");
         decrAlign();
@@ -414,7 +413,7 @@ private String emitFunctionDescField(String javaName, FunctionDescriptor desc) {
         indent();
         String fieldName = getFunctionDescFieldName(javaName);
         final boolean noArgs = desc.argumentLayouts().isEmpty();
-        append(PACKAGE_FINAL_MODS);
+        append(PKG_STATIC_FINAL_MODS);
         append("FunctionDescriptor ");
         append(fieldName);
         append(" = ");
@@ -453,7 +452,7 @@ private String emitConstantSegment(String javaName, Object value) {
         incrAlign();
         indent();
         String fieldName = getConstantSegmentFieldName(javaName);
-        append(PACKAGE_FINAL_MODS);
+        append(PKG_STATIC_FINAL_MODS);
         append("MemorySegment ");
         append(fieldName);
         append(" = CLinker.toCString(\"");
@@ -470,7 +469,7 @@ private String emitConstantAddress(String javaName, Object value) {
         incrAlign();
         indent();
         String fieldName = getConstantAddressFieldName(javaName);
-        append(PACKAGE_FINAL_MODS);
+        append(PKG_STATIC_FINAL_MODS);
         append("MemoryAddress ");
         append(fieldName);
         append(" = MemoryAddress.ofLong(");
@@ -528,7 +527,7 @@ private String emitSegmentField(String javaName, String nativeName, MemoryLayout
          incrAlign();
          indent();
          String fieldName = getSegmentFieldName(javaName);
-         append(PACKAGE_FINAL_MODS);
+         append(PKG_STATIC_FINAL_MODS);
          append("MemorySegment ");
          append(fieldName);
          append(" = ");
@@ -545,7 +544,7 @@ private String emitSegmentField(String javaName, String nativeName, MemoryLayout
     private void emitLibraries(String[] libraryNames) {
         incrAlign();
         indent();
-        append(PACKAGE_FINAL_MODS);
+        append(PKG_STATIC_FINAL_MODS);
         append("LibraryLookup[] LIBRARIES = RuntimeHelper.libraries(new String[] {\n");
         incrAlign();
         for (String lib : libraryNames) {