Stackmap, 1.7 bytecode

.gitignore

@@ -91,6 +91,7 @@ core.*
 *.tgz
 *.zip
 *.jar
+!vendor/*.jar
 
 # Nix
 result

README.md

@@ -176,7 +176,8 @@ Java 7 language features are fully supported for parsing, semantic analysis, and
 | Exception suppression | ✅ Works | ✅ Works | ✅ Works |
 | Binary/underscore literals | ✅ Works | ✅ Works | ✅ Works |
 
-**Note:** Targets 1.5 and 1.6 pass the full test suite with strict JVM verification. Target 1.7 (class version 51.0) has known StackMapTable limitations with complex boolean expressions used as method arguments (e.g., `test("name", a == b)`). For most code, target 1.7 works correctly; alternatively, use `-target 1.5` or `-target 1.6` for maximum compatibility. Generated class files require at least the corresponding JVM major version.
+**Note:** Targets 1.5, 1.6 and 1.7 pass the full test suite with strict JVM verification. 
+Although our implementation of StackMapTable for target 1.7 still might be imperfect. Use `-target 1.5` or `-target 1.6` for maximum compatibility. 
 
 ### JDK Compliance Snapshot
 

TODO.md

@@ -25,6 +25,26 @@ and is compiled with `-sourcepath runtime`, the generated class file is corrupte
 - Look at bridge method generation when compiling java.lang classes
 - The issue may be related to how the compiler handles self-referential generics in bootstrap mode
 
+### Target 1.7 StackMapTable generation OOM
+
+Compiling tests with `-target 1.7` causes out-of-memory errors on tests with many boolean method arguments (e.g., `NumericBitwiseBoxingTest.java` with ~47 test calls).
+
+**Reproduction:**
+```bash
+./build/src/jopa -source 1.7 -target 1.7 -classpath ./build/runtime/jopa-stub-rt.jar \
+    -d /tmp/out test/autoboxing/NumericBitwiseBoxingTest.java
+# Process consumes 18GB+ RAM before being killed
+```
+
+**Impact:**
+- Target 1.7 excluded from test matrix
+- StackMapTable generation for class version 51.0 has memory leak
+
+**To investigate:**
+- Memory leak is NOT in: SaveLocals, RecordFrame, PushType, SetLocal (debug confirmed reasonable counts)
+- Issue manifests when combining many int boxing tests with long boxing tests
+- Suspected: exponential growth in some path during type verification inference
+
 ## JDK 7 Compliance (In Progress)
 
 - **Status**: 77.4% (657/849 tests passed).

devjopak/CMakeLists.txt

@@ -4,7 +4,7 @@ project(devjopak NONE)
 
 # Read version from flake.nix
 file(READ "${CMAKE_CURRENT_SOURCE_DIR}/../flake.nix" FLAKE_NIX_CONTENT)
-string(REGEX MATCH "version = \"([0-9]+\\.[0-9]+)" _ "${FLAKE_NIX_CONTENT}")
+string(REGEX MATCH "version = \"([0-9]+\\.[0-9]+\\.[0-9]+)" _ "${FLAKE_NIX_CONTENT}")
 set(JOPA_VERSION "${CMAKE_MATCH_1}")
 if(NOT JOPA_VERSION)
     message(FATAL_ERROR "Could not extract version from flake.nix")
@@ -135,12 +135,14 @@ if(NOT JOPA_CLASSPATH_VERSION STREQUAL "0.93")
 
         DEPENDS gnu_classpath
 
+        # Use GCC for JamVM - clang 17+ rejects computed gotos into statement expressions
         CONFIGURE_COMMAND ${CMAKE_COMMAND} -E rm -f "${JAMVM_PREBUILT_CLASSES}"
         COMMAND ${CMAKE_COMMAND} -E env
             ${CLEAN_JAVA_ENV_VARS}
             "UBSAN_OPTIONS=halt_on_error=0"
             "ASAN_OPTIONS=detect_leaks=0"
             "JAVAC=${JOPA_JAVAC_COMMAND} --nowarn:unchecked -bootclasspath ${CLASSPATH_INSTALL_DIR}/share/classpath/glibj.zip"
+            "CC=gcc"
             <SOURCE_DIR>/configure
                 --prefix=<INSTALL_DIR>
                 --with-java-runtime-library=gnuclasspath
@@ -185,7 +187,7 @@ ulimit -s unlimited
     execute_process(COMMAND chmod +x "${CMAKE_CURRENT_BINARY_DIR}/ant-javac.sh" "${CMAKE_CURRENT_BINARY_DIR}/ant-java.sh")
 
     ExternalProject_Add(junit
-        URL "https://repo1.maven.org/maven2/junit/junit/3.8.2/junit-3.8.2-sources.jar"
+        URL "${CMAKE_CURRENT_SOURCE_DIR}/../vendor/junit-3.8.2-sources.jar"
         PREFIX "${CMAKE_CURRENT_BINARY_DIR}/junit-prefix"
         INSTALL_DIR "${VENDOR_PREFIX}/junit"
         DEPENDS gnu_classpath
@@ -228,8 +230,9 @@ endif()
 # DevJopaK Distribution
 # ============================================================================ 
 if(NOT JOPA_CLASSPATH_VERSION STREQUAL "0.93")
+    # Tarball naming: devjopak-{jopa_version}-gnucp-{cp_version}-jopa-{jopa_version}
     set(DEVJOPAK_DIR "${CMAKE_BINARY_DIR}/devjopak")
-    set(DEVJOPAK_ARCHIVE "devjopak-${JOPA_VERSION}.tar.gz")
+    set(DEVJOPAK_ARCHIVE "devjopak-${JOPA_VERSION}-gnucp-${JOPA_CLASSPATH_VERSION}-jopa-${JOPA_VERSION}.tar.gz")
 
     set(JAVAC_WRAPPER "${DEVJOPAK_DIR}/bin/javac")
     set(JAVA_WRAPPER "${DEVJOPAK_DIR}/bin/java")

devjopak/ecj_build.cmake

@@ -2,9 +2,15 @@
 # Eclipse Compiler for Java (ECJ) Build
 # ============================================================================
 if(NOT JOPA_CLASSPATH_VERSION STREQUAL "0.93")
-    set(ECJ_VERSION "4.2.1")
+    # ECJ version - can be overridden on command line
+    set(ECJ_VERSION "4.2.1" CACHE STRING "ECJ version to use (4.2.1 or 4.2.2)")
     # Use local source JAR from vendor directory
     set(ECJ_SOURCE_JAR "${CMAKE_CURRENT_SOURCE_DIR}/../vendor/ecjsrc-${ECJ_VERSION}.jar")
+
+    if(NOT EXISTS "${ECJ_SOURCE_JAR}")
+        message(FATAL_ERROR "ECJ source JAR not found at ${ECJ_SOURCE_JAR}. Available versions: 4.2.1, 4.2.2")
+    endif()
+    message(STATUS "ECJ version: ${ECJ_VERSION}")
 
     set(ECJ_BUILD_DIR "${CMAKE_BINARY_DIR}/ecj-build")
     set(ECJ_INSTALL_DIR "${VENDOR_PREFIX}/ecj")
@@ -62,11 +68,12 @@ find \"$1\" -name '*.java' > \"$2\"
 
     add_custom_target(ecj DEPENDS "${ECJ_JAR}")
 
-    # ============================================================================ 
+    # ============================================================================
     # DevJopaK-ECJ Distribution
-    # ============================================================================ 
+    # ============================================================================
+    # Tarball naming: devjopak-{jopa_version}-gnucp-{cp_version}-ecj-{ecj_version}
     set(DEVJOPAK_ECJ_DIR "${CMAKE_BINARY_DIR}/devjopak-ecj")
-    set(DEVJOPAK_ECJ_ARCHIVE "devjopak-ecj-${JOPA_VERSION}.tar.gz")
+    set(DEVJOPAK_ECJ_ARCHIVE "devjopak-${JOPA_VERSION}-gnucp-${JOPA_CLASSPATH_VERSION}-ecj-${ECJ_VERSION}.tar.gz")
     set(JAVAC_ECJ_WRAPPER "${DEVJOPAK_ECJ_DIR}/bin/javac")
 
     add_custom_command(