Add additional version of DynComp for Java 24 (2nd version)

java/Makefile

@@ -21,6 +21,8 @@ JAVAC ?= javac
 JAVADOC ?= javadoc
 JAR ?= jar
 
+BuildJDKTool = BuildJDK
+
 # The "JAVANN" variables mean "at least version NN", except JAVA8.
 JAVA_VERSION_STRING_WITH_EA := $(shell javac -version 2>&1 | head -1 | cut "-d " -f2)
 JAVA_VERSION_STRING := $(shell javac -version 2>&1 | head -1 | cut "-d " -f2 | sed 's/-ea//')
@@ -41,6 +43,7 @@ endif
 # Temporary, since Java 24 is not a LTS release.
 ifeq ($(shell test ${JAVA_RELEASE_NUMBER} -ge 24; echo $$?),0)
   JAVA24 := 1
+  BuildJDKTool = BuildJDK24
 endif
 ifeq ($(shell test ${JAVA_RELEASE_NUMBER} -ge 25; echo $$?),0)
   JAVA25 := 1
@@ -625,7 +628,7 @@ dyncomp-jdk dcomp-jdk   : dcomp_rt.jar
 ${DCOMP_RT} dcomp_rt.jar : dcomp_premain.jar
 	/bin/rm -rf ${DCOMP_RT}
 	${INSTALL} -d ${DCOMP_RT}
-	${JAVA_COMMAND} -Xmx3600m daikon.dcomp.BuildJDK ${DCOMP_RT}
+	${JAVA_COMMAND} -Xmx3600m daikon.dcomp.${BuildJDKTool} ${DCOMP_RT}
 # "then" clause is Java 8, "else" clause is Java 9+.
 # For Java 9+, there appears to be a bug in the Java reflection invoke code that it
 # does not check that the arg list matches.  Hence, it tries to invoke
@@ -754,6 +757,9 @@ very-clean: clean clean-generated-files
 	-rm -rf api
 	-rm -rf daikon/dcomp/std_dcomp_out.diff daikon/dcomp/std_dcomp_out.txt
 	-rm -rf daikon/chicory/ChicoryTest.inv.out
+	-rm -rf daikon/dcomp/debug/
+	-rm -rf daikon/dcomp/DcompTest.log
+	-rm -rf daikon/chicory/debug
 
 run:	all
 	${JAVA_COMMAND} daikon.Daikon

java/daikon/DynComp.java

@@ -304,6 +304,10 @@ void start_target(String premain_args, String[] targetArgs) {
       // allow DCRuntime to make reflective access to java.land.Object.clone() without a warning
       cmdlist.add("--add-opens");
       cmdlist.add("java.base/java.lang=ALL-UNNAMED");
+      if (BcelUtil.javaVersion >= 24) {
+        // needed to eliminate warning for JNI access to native code
+        cmdlist.add("--enable-native-access=ALL-UNNAMED");
+      }
       if (!no_jdk) {
         // If we are processing JDK classes, then we need our code on the boot classpath as well.
         // Otherwise, references to DCRuntime from the JDK would fail.

java/daikon/chicory/ClassInfo.java

@@ -25,6 +25,9 @@ public class ClassInfo {
   /** True if the class has a class initializer. */
   public boolean hasClinit;
 
+  /** True if the class is a JUnit test class. */
+  public boolean isJunitTestClass;
+
   // set by initViaReflection()
   /** reflection object for this class. */
   public @MonotonicNonNull Class<?> clazz;

java/daikon/chicory/Instrument.java

@@ -50,23 +50,23 @@
 import org.checkerframework.dataflow.qual.Pure;
 
 /**
- * This class is responsible for modifying another class's bytecodes. Specifically, its main task is
- * to add calls into the Chicory runtime at method entries and exits for instrumentation purposes.
- * These added calls are sometimes referred to as "hooks".
+ * This class modifies another class's bytecodes. It adds calls into the Chicory runtime at method
+ * entries and exits for instrumentation purposes. These added calls are sometimes referred to as
+ * "hooks".
  *
  * <p>This class is loaded by ChicoryPremain at startup. It is a ClassFileTransformer which means
- * that its {@code transform} method gets called each time the JVM loads a class.
+ * that its {@link #transform} method gets called each time the JVM loads a class.
  */
 public class Instrument extends InstructionListUtils implements ClassFileTransformer {
 
-  /** The location of the runtime support class. */
+  /** The name of the Chicory runtime support class. */
   private static final String runtime_classname = "daikon.chicory.Runtime";
 
-  /** Debug information about which classes and/or methods are transformed and why. */
+  /** A log for debug information about which classes and/or methods are transformed and why. */
   protected static final SimpleLog debug_transform = new SimpleLog(false);
 
-  // Public so can be enabled from daikon.dcomp.Instrument.
-  /** Debug information about ppt-omit and ppt-select. */
+  // Public so daikon.dcomp.Instrument can enable it.
+  /** A log for debug information about ppt-omit and ppt-select. */
   public static final SimpleLog debug_ppt_omit = new SimpleLog(false);
 
   /** Directory for debug output. */
@@ -87,7 +87,6 @@ public class Instrument extends InstructionListUtils implements ClassFileTransfo
   /** Create an instrumenter. Setup debug directories, if needed. */
   @SuppressWarnings("nullness:initialization")
   public Instrument() {
-    super();
     debug_transform.enabled = Chicory.debug_transform || Chicory.debug || Chicory.verbose;
     debug_ppt_omit.enabled = debugInstrument.enabled = Chicory.debug;
 
@@ -104,7 +103,7 @@ public Instrument() {
   /**
    * Returns true if the given ppt should be ignored. Uses the patterns in {@link
    * daikon.chicory.Runtime#ppt_omit_pattern} and {@link daikon.chicory.Runtime#ppt_select_pattern}.
-   * This method is used by both Chicory and Dyncomp.
+   * This method is used by both Chicory and DynComp.
    *
    * @param className class name to be checked
    * @param methodName method name to be checked
@@ -159,7 +158,7 @@ public static boolean shouldIgnore(
    * boot classes have the null loader, but some generated classes (such as those in sun.reflect)
    * will have a non-null loader. Some of these have a null parent loader, but some do not. The
    * check for the sun.reflect package is a hack to catch all of these. A more consistent mechanism
-   * to determine boot classes would be preferrable.
+   * to determine boot classes would be preferable.
    *
    * @param className class name to be checked
    * @param loader the class loader for the class

java/daikon/chicory/Instrument24.java

@@ -83,12 +83,12 @@
 import org.checkerframework.dataflow.qual.Pure;
 
 /**
- * This class is responsible for modifying another class's bytecodes. Specifically, its main task is
- * to add calls into the Chicory runtime at method entries and exits for instrumentation purposes.
- * These added calls are sometimes referred to as "hooks".
+ * This class modifies another class's bytecodes. It adds calls into the Chicory runtime at method
+ * entries and exits for instrumentation purposes. These added calls are sometimes referred to as
+ * "hooks".
  *
  * <p>This class is loaded by ChicoryPremain at startup. It is a ClassFileTransformer which means
- * that its {@code transform} method gets called each time the JVM loads a class.
+ * that its {@link #transform} method gets called each time the JVM loads a class.
  *
  * <p>Instrument24 uses Java's ({@code java.lang.classfile}) APIs for reading and modifying .class
  * files. Those APIs were added in JDK 24. Compared to BCEL, these APIs are more complete and robust
@@ -98,17 +98,17 @@
  */
 public class Instrument24 implements ClassFileTransformer {
 
-  /** The location of the runtime support class. */
+  /** The name of the Chicory runtime support class. */
   private static final String runtime_classname = "daikon.chicory.Runtime";
 
   /** The ClassDesc for the Chicory runtime support class. */
   private static final ClassDesc runtimeCD = ClassDesc.of(runtime_classname);
 
-  /** Debug information about which classes and/or methods are transformed and why. */
+  /** A log for debug information about which classes and/or methods are transformed and why. */
   protected static final SimpleLog debug_transform = new SimpleLog(false);
 
-  // Public so can be enabled from daikon.dcomp.Instrument24.
-  /** Debug information about ppt-omit and ppt-select. */
+  // Public so daikon.dcomp.Instrument24 can enable it.
+  /** A log for debug information about ppt-omit and ppt-select. */
   public static final SimpleLog debug_ppt_omit = new SimpleLog(false);
 
   /** A log to which to print debugging information about program instrumentation. */
@@ -326,10 +326,11 @@ private void outputDebugFiles(byte[] classBytes, File directory, @BinaryName Str
           binaryClassName);
     }
 
+    debug_transform.log("%nTransforming: %s%n", binaryClassName);
+
     // Instrument the classfile, die on any errors
     ClassInfo classInfo = new ClassInfo(binaryClassName, cfLoader);
-    byte[] newBytes = {};
-    debug_transform.log("%nTransforming: %s%n", binaryClassName);
+    byte[] newBytes;
     try {
       newBytes =
           classFile.build(
@@ -1719,6 +1720,7 @@ protected LocalVariable createLocalWithMethodScope(
             minfo.nextLocalIndex, localName, localType, minfo.startLabel, minfo.endLabel);
     mgen.localsTable.add(newVar);
     minfo.nextLocalIndex += TypeKind.from(localType).slotSize();
+    mgen.setMaxLocals(minfo.nextLocalIndex);
     return newVar;
   }