Build the JSpecify JDK (#114)

Co-authored-by: Chris Povirk <[email protected]>

.github/workflows/jspecify.yml

@@ -0,0 +1,36 @@
+name: JSpecify JDK CI tests
+
+on:
+  pull_request:
+  push:
+    branches: [ "main" ]
+
+jobs:
+  build_jdk:
+    name: Build the JSpecify JDK
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+    env:
+      JAVA_VERSION: 23
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set up JDK 23
+      uses: actions/setup-java@v4
+      with:
+        java-version: 23
+        distribution: 'temurin'
+    - name: Install dependencies
+      run: |
+        sudo apt-get update
+        sudo apt-get install --only-upgrade apt
+        sudo apt-get install gcc-10 g++-10 libxrandr-dev libxtst-dev libcups2-dev libasound2-dev
+    - name: Install jtreg
+      run: |
+        wget https://builds.shipilev.net/jtreg/jtreg-7.5%2B1.zip -O /tmp/jtreg.zip
+        unzip /tmp/jtreg.zip -d /tmp/
+    - name: Configure the JDK
+      run: bash ./configure --with-jtreg=/tmp/jtreg --disable-warnings-as-errors
+    - name: Build the JDK
+      run: make jdk
+

.github/workflows/main.yml

@@ -35,8 +35,9 @@ on:
     inputs:
       platforms:
         description: 'Platform(s) to execute on (comma separated, e.g. "linux-x64, macos, aarch64")'
-        required: true
-        default: 'linux-x64, linux-x64-variants, linux-cross-compile, alpine-linux-x64, macos-x64, macos-aarch64, windows-x64, windows-aarch64, docs'
+        required: false
+        default: ''
+          # default: 'linux-x64, linux-x64-variants, linux-cross-compile, alpine-linux-x64, macos-x64, macos-aarch64, windows-x64, windows-aarch64, docs'
       configure-arguments:
         description: 'Additional configure arguments'
         required: false
@@ -120,7 +121,9 @@ jobs:
                   return
                 fi
               done
-              echo 'true'
+              # echo 'true'
+              # WMD: Assume empty means no platforms
+              echo 'false'
               return
             else
               # Check for all acceptable platform names
@@ -163,6 +166,7 @@ jobs:
     uses: ./.github/workflows/build-linux.yml
     with:
       platform: linux-x64
+      debug-levels: '[ "debug" ]'
       gcc-major-version: '10'
       configure-arguments: ${{ github.event.inputs.configure-arguments }}
       make-arguments: ${{ github.event.inputs.make-arguments }}

make/CompileInterimLangtools.gmk

@@ -89,6 +89,9 @@ TARGETS += $(COPY_PREVIEW_FEATURES)
 # would require the source files to be copied into directories named after the
 # actual interim modules.
 
+## DON'T PUT COMMAS within this macro definition, as in
+#          --add-exports java.base/org.checkerframework.checker.builder.qual=java.compiler.interim,jdk.compiler.interim \
+
 # Param 1 - Name of module to compile
 define SetupInterimModule
   $$(eval $$(call SetupJavaCompilation, BUILD_$1.interim, \
@@ -112,6 +115,8 @@ define SetupInterimModule
       DISABLED_WARNINGS := module options, \
       JAVAC_FLAGS := \
           --module-path $(BUILDTOOLS_OUTPUTDIR)/interim_langtools_modules \
+          -cp $(TOPDIR)/src/java.base/share/classes/ \
+          --add-reads $1.interim=ALL-UNNAMED \
           $$(INTERIM_LANGTOOLS_ADD_EXPORTS) \
           --patch-module java.base=$(BUILDTOOLS_OUTPUTDIR)/gensrc/java.base.interim \
           --add-exports java.base/jdk.internal.javac=java.compiler.interim \

make/CopyInterimTZDB.gmk

@@ -38,6 +38,10 @@ define tzdb_copyfiles
 	$(call MakeTargetDir)
 	$(RM) '$@'
 	$(SED) -e "s/package java.time.zone/package build.tools.tzdb/" \
+	    -e "s/import org.jspecify.annotations.NullMarked;//" \
+	    -e "s/import org.jspecify.annotations.Nullable;//" \
+	    -e "s/@NullMarked//" \
+	    -e "s/@Nullable //" \
         < $(<) > $@
 endef
 

make/autoconf/spec.gmk.template

@@ -697,6 +697,7 @@ INTERIM_LANGTOOLS_ARGS := \
     --add-modules $(INTERIM_LANGTOOLS_MODULES_COMMA) \
     --module-path $(BUILDTOOLS_OUTPUTDIR)/interim_langtools_modules \
     --patch-module java.base=$(BUILDTOOLS_OUTPUTDIR)/gensrc/java.base.interim \
+    -cp $(TOPDIR)/src/java.base/share/classes/ \
     $(INTERIM_LANGTOOLS_ADD_EXPORTS) \
     #
 JAVAC_MAIN_CLASS := -m jdk.compiler.interim/com.sun.tools.javac.Main

make/common/JavaCompilation.gmk

@@ -270,7 +270,7 @@ define SetupJavaCompilationBody
   endif
 
   # Allow overriding on the command line
-  JAVA_WARNINGS_ARE_ERRORS ?= -Werror
+  JAVA_WARNINGS_ARE_ERRORS ?=
 
   # Tell javac to do exactly as told and no more
   PARANOIA_FLAGS := -implicit:none -Xprefer:source -XDignore.symbol.file=true -encoding ascii

make/langtools/build.properties

@@ -24,10 +24,10 @@
 #
 
 #javac configuration for "normal build" (these will be passed to the bootstrap compiler):
-javac.opts = -XDignore.symbol.file=true -Xlint:all,-deprecation,-exports -Werror -g:source,lines,vars
+javac.opts = -XDignore.symbol.file=true -Xlint:all,-deprecation,-exports -g:source,lines,vars
 
 #version used to compile build tools
-javac.build.opts = -XDignore.symbol.file=true -Xlint:all,-deprecation,-options -Werror -g:source,lines,vars
+javac.build.opts = -XDignore.symbol.file=true -Xlint:all,-deprecation,-options -g:source,lines,vars
 javac.build.source = 8
 javac.build.target = 8
 

make/langtools/src/classes/build/tools/symbolgenerator/CreateSymbols.java

@@ -2613,6 +2613,10 @@ private boolean readAttribute(ClassFile cf, FeatureDescription feature, Attribut
                 ((MethodDescription) feature).classParameterAnnotations =
                         parameterAnnotations2Description(cf.constant_pool, attr);
                 break;
+            case "RuntimeInvisibleTypeAnnotations":
+            case "RuntimeVisibleTypeAnnotations":
+                // TODO(wmdietl): What should happen to type annotations?
+                break;
             case Attribute.Module: {
                 assert feature instanceof ModuleHeaderDescription;
                 ModuleHeaderDescription header =

src/java.base/share/classes/java/io/DataOutputStream.java

@@ -28,6 +28,9 @@
 
 import org.jspecify.annotations.NullMarked;
 import org.jspecify.annotations.Nullable;
+
+import jdk.internal.access.JavaLangAccess;
+import jdk.internal.access.SharedSecrets;
 import jdk.internal.util.ByteArray;
 
 import static jdk.internal.util.ModifiedUtf.putChar;

src/java.base/share/classes/java/lang/Runtime.java

@@ -124,7 +124,7 @@
  */
 
 @NullMarked
-public  class Runtime {
+public class Runtime {
     private static final Runtime currentRuntime = new Runtime();
 
     private static Version version;
@@ -177,7 +177,6 @@ private Runtime() {}
      * @see #removeShutdownHook
      * @see #halt(int)
      */
-
     public void exit(int status) {
         Shutdown.exit(status);
     }
@@ -368,6 +367,7 @@ public Process exec(String command) throws IOException {
      * @see     #exec(String[], String[], File)
      * @see     ProcessBuilder
      */
+    @Deprecated(since="18")
     public Process exec(String command, String @Nullable [] envp) throws IOException {
         return exec(command, envp, null);
     }

src/java.base/share/classes/java/net/DatagramSocket.java

@@ -25,7 +25,6 @@
 
 package java.net;
 
-import org.checkerframework.checker.interning.qual.UsesObjectEquals;
 import org.jspecify.annotations.NullMarked;
 import org.jspecify.annotations.Nullable;
 

src/java.base/share/classes/java/nio/file/Files.java

@@ -25,10 +25,6 @@
 
 package java.nio.file;
 
-import org.checkerframework.checker.interning.qual.UsesObjectEquals;
-import org.checkerframework.checker.signedness.qual.PolySigned;
-import org.checkerframework.framework.qual.AnnotatedFor;
-
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
 import java.io.Closeable;
@@ -3173,7 +3169,7 @@ public static List<String> readAllLines(Path path) throws IOException {
      *          StandardOpenOption#CREATE_NEW CREATE_NEW} option is specified
      *          <i>(optional specific exception)</i>
      */
-    public static Path write(Path path, @PolySigned byte[] bytes, OpenOption... options)
+    public static Path write(Path path, byte[] bytes, OpenOption... options)
         throws IOException
     {
         // ensure bytes is not null before opening file