codespecs · markro49 · Jun 25, 2025 · Jun 26, 2025 · Jun 26, 2025 · Jun 26, 2025
diff --git a/Makefile b/Makefile
@@ -759,7 +759,7 @@ endif
 
 update-bibtex2web:
 ifndef NONETWORK
-	if test -d .utils/bibtex2web/.git ; then \
+	@if test -d .utils/bibtex2web/.git ; then \
 	  (cd .utils/bibtex2web && (git pull -q || (sleep 1m && (git pull || true)))) \
 	elif ! test -d .utils/bibtex2web ; then \
 	  (mkdir -p .utils && (git clone -q --depth=1 https://github.com/mernst/bibtex2web.git .utils/bibtex2web || (sleep 1m && git clone -q --depth=1 https://github.com/mernst/bibtex2web.git .utils/bibtex2web))) \
@@ -768,7 +768,7 @@ endif
 
 update-checklink:
 ifndef NONETWORK
-	if test -d .utils/checklink/.git ; then \
+	@if test -d .utils/checklink/.git ; then \
 	  (cd .utils/checklink && (git pull -q || (sleep 1m && (git pull || true)))) \
 	elif ! test -d .utils/checklink ; then \
 	  (mkdir -p .utils && (git clone -q --depth=1 https://github.com/plume-lib/checklink.git .utils/checklink || (sleep 1m && git clone -q --depth=1 https://github.com/plume-lib/checklink.git .utils/checklink))) \
@@ -777,7 +777,7 @@ endif
 
 update-git-scripts:
 ifndef NONETWORK
-	if test -d .utils/git-scripts/.git ; then \
+	@if test -d .utils/git-scripts/.git ; then \
 	  (cd .utils/git-scripts && (git pull -q || (sleep 1m && (git pull || true)))) \
 	elif ! test -d .utils/git-scripts ; then \
 	  (mkdir -p .utils && (git clone -q --depth=1 https://github.com/plume-lib/git-scripts.git .utils/git-scripts || (sleep 1m && git clone -q --depth=1 https://github.com/plume-lib/git-scripts.git .utils/git-scripts))) \
@@ -786,7 +786,7 @@ endif
 
 update-html-tools:
 ifndef NONETWORK
-	if test -d ${HTMLTOOLS}/.git ; then \
+	@if test -d ${HTMLTOOLS}/.git ; then \
 	  (cd ${HTMLTOOLS} && (git pull -q || (sleep 1m && (git pull || true)))) \
 	elif ! test -d ${HTMLTOOLS} ; then \
 	  (mkdir -p .utils && (git clone -q --depth=1 https://github.com/plume-lib/html-tools.git ${HTMLTOOLS} || (sleep 1m && git clone -q --depth=1 https://github.com/plume-lib/html-tools.git ${HTMLTOOLS}))) \
@@ -795,7 +795,7 @@ endif
 
 update-plume-scripts-in-utils:
 ifndef NONETWORK
-	if test -d ${PLUMESCRIPTS}/.git ; then \
+	@if test -d ${PLUMESCRIPTS}/.git ; then \
 	  (cd ${PLUMESCRIPTS} && (git pull -q || (sleep 1m && (git pull || true)))) \
 	elif ! test -d ${PLUMESCRIPTS} ; then \
 	  mkdir -p .utils && (git clone -q --depth=1 https://github.com/plume-lib/plume-scripts.git ${PLUMESCRIPTS} || (sleep 1m && git clone -q --depth=1 https://github.com/plume-lib/plume-scripts.git ${PLUMESCRIPTS})) \
@@ -804,7 +804,7 @@ endif
 
 update-run-google-java-format:
 ifndef NONETWORK
-	if test -d .utils/run-google-java-format/.git ; then \
+	@if test -d .utils/run-google-java-format/.git ; then \
 	  (cd .utils/run-google-java-format && (git pull -q || (sleep 1m && (git pull || true)))) \
 	elif ! test -d .utils/run-google-java-format ; then \
 	  (mkdir -p .utils && (git clone -q --depth=1 https://github.com/plume-lib/run-google-java-format.git .utils/run-google-java-format || (sleep 1m && git clone -q --depth=1 https://github.com/plume-lib/run-google-java-format.git .utils/run-google-java-format))) \

diff --git a/java/Makefile b/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//')
@@ -48,6 +50,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
@@ -535,13 +538,13 @@ endif
 # compiled, but changing JDKs doesn't cause this Makefile to otherwise
 # trigger re-execution.
 .PRECIOUS: ChicoryPremain.jar
-ChicoryPremain.jar : daikon/Chicory.class daikon/chicory/manifest.txt
+ChicoryPremain.jar : daikon/Daikon.class daikon/chicory/manifest.txt
 	${JAR} cfm ChicoryPremain.jar daikon/chicory/manifest.txt \
 	  daikon/chicory/ChicoryPremain.class
 
-.PHONY: chicory chicory-test
-chicory chicory-test : daikon/chicory/inv_out.diff
-daikon/chicory/inv_out.diff : ChicoryPremain.jar daikon/Daikon.class
+.PHONY: chicory-test
+chicory-test: daikon/chicory/inv_out.diff
+daikon/chicory/inv_out.diff: ChicoryPremain.jar
 	cd daikon/chicory && rm -f ChicoryTest.log ChicoryTest.dtrace.gz ChicoryTest.inv.gz ChicoryTest.inv.out
 	cd daikon/chicory && ${JAVA_COMMAND} daikon.Chicory --verbose --debug daikon.chicory.ChicoryTest > ChicoryTest.log || (cat ChicoryTest.log; false)
 	cd daikon/chicory && ${JAVA_COMMAND} daikon.Daikon --no_text_output --no_show_progress ChicoryTest.dtrace.gz
@@ -608,7 +611,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} -Xmx7g daikon.dcomp.BuildJDK ${DCOMP_RT}
+	${JAVA_COMMAND} -Xmx7g 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
@@ -2062,6 +2065,21 @@ daikon/derive/unary/SequenceInitialFactoryFloat.java: daikon/derive/unary/Sequen
 	$(JAVA_CPP:DEFINEDVAR=TYPEDOUBLE)
 
 
+###########################################################################
+### Diffs
+###
+
+# Don't diff StackMapUtils24.java, ClassGen24.java, MethodGen24.java, or
+# OperandStack24.java, because there are too many differences between the
+# upstream version (in BCEL or in bcel-util) and the version in Daikon.
+.PHONY: diff24
+diff24:
+	-diff -u daikon/dcomp/Instrument.java daikon/dcomp/Instrument24.java
+	-diff -u daikon/dcomp/DCInstrument.java daikon/dcomp/DCInstrument24.java
+	-diff -u daikon/dcomp/BuildJDK.java daikon/dcomp/BuildJDK24.java
+	-diff -u daikon/chicory/Instrument.java daikon/chicory/Instrument24.java
+
+
 ###########################################################################
 ### Delete-on-error
 ###

diff --git a/java/daikon/DynComp.java b/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 (Runtime.isJava24orLater()) {
+        // 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.

diff --git a/java/daikon/chicory/ClassInfo.java b/java/daikon/chicory/ClassInfo.java
@@ -25,12 +25,14 @@ 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;
 
-  // Does not include class initializers, so each element's .member field
-  // is non-null.
+  // Does not include class initializers, so each element's .member field is non-null.
   /** list of methods in the class. */
   public List<MethodInfo> method_infos = new ArrayList<>();
 
@@ -47,9 +49,8 @@ public class ClassInfo {
   /** True if any methods in this class were instrumented. */
   public boolean shouldInclude = false;
 
-  /** Mapping from field name to string representation of its value* */
-  // only for static final primitives
-  // which are declared by a CONSTANT VALUE in the code
+  /** Mapping from field name to string representation of its value. */
+  // Only for static final primitives which are declared by a CONSTANT VALUE in the code.
   public Map<String, String> staticMap = new HashMap<>();
 
   /** Create ClassInfo with specified name. */