Support for all tests passing in release mode (the CI now checks this too).

Some needed changes in lower1/lower2 and new shims to support this. Replaced uses of String with &str as String is part of alloc (we are just trying to support core for now). Added debug/release modes to java-linker. Added confirming release mode works to CI script.

Author: IntegralPilot

.github/workflows/ci.yml

@@ -52,5 +52,9 @@ jobs:
       run: make ci # Use your optimized CI build command
 
     # 10. Run tests
-    - name: Run integration tests
-      run: python3 Tester.py
+    - name: Run integration tests (debug mode)
+      run: python3 Tester.py
+
+    # 11. Run tests in release mode
+    - name: Run integration tests (release mode)
+      run: python3 Tester.py --release

Cargo.lock

@@ -6,13 +6,15 @@ edition = "2024"
 [dependencies]
 bigdecimal = "0.4.8"
 half = "2.6.0"
+libc = "0.2.172"
 num-bigint = "0.4.6"
 num-traits = "0.2.19"
 regex = "1.11.1"
 ristretto_classfile = { version = "0.16.0" }
 serde = { version = "1.0.219", features = ["derive"] }
 serde_json = "1.0.140"
 sha2 = "0.10.8"
+zerocopy = "0.8.25"
 
 [lib]
 crate-type = ["dylib"]

Cargo.toml

@@ -134,4 +134,6 @@ clean-vendor-r8:
 
 # === Clean All ===
 clean: clean-rust clean-java-linker clean-library clean-shim-metadata-gen clean-gen-files clean-vendor-r8
-	@echo "$(GREEN)🧼 All clean!$(RESET)"
+	@echo "$(GREEN)🧼 All clean!$(RESET)"
+
+rebuild-shim: clean-library library shim-metadata-gen/core.json rust

Makefile

@@ -50,7 +50,7 @@ All examples live in `tests/binary` and are compiled to JVM bytecode & run/teste
 - Structs, tuples, enums (both C‑like and Rust‑style)  
 - Executable `.jar` generation for binary crates  
 - Mutable borrowing, references, and dereferencing
-- **Integration tests** for all features
+- **Integration tests** for all features, in debug and release modes
 
 🚧 **Next Milestone:** Full support for the Rust `core` crate.
 
@@ -117,12 +117,16 @@ make gen-files
 ## 🚀 Usage
 
 1. **Configure your project**  
-   In *your* Rust project directory, create or update `.cargo/config.toml` with the generated template (will be at the root of this repo after running make).
+   In *your* Rust project directory, create or update `.cargo/config.toml` by copying the generated template (will be at the root of this repo after running make). Also, your `Cargo.toml` needs to contain the following (used to pass flags differentiating between debug and release builds to the linker):
+
+   ```toml
+   cargo-features = ["profile-rustflags"]
+   ```
 
 2. **Build with Cargo**  
    ```bash
    cargo build           # debug
-   cargo build --release # optimized - functionality available slightly impaired 
+   cargo build --release # optimized
    ```
 
 3. **Run the `.jar`**  

Readme.md

@@ -83,7 +83,10 @@ def process_test(test_dir: str, release_mode: bool):
             print(f"|---- ❌ java exited with code {proc.returncode}")
             return False
 
-    expected_file = os.path.join(test_dir, "java-output.expected")
+    expected_file = os.path.join(test_dir, "java-output.release.expected") if release_mode else os.path.join(test_dir, "java-output.expected")
+    if not os.path.exists(expected_file) and release_mode:
+        expected_file = os.path.join(test_dir, "java-output.expected")
+
     if os.path.exists(expected_file):
         expected_output = read_from_file(expected_file)
         if expected_output.strip() == "":

Tester.py

@@ -10,4 +10,7 @@ rustflags = [
 panic = "abort"
 
 [profile.release]
-panic = "abort"
+panic = "abort"
+rustflags = [
+  "-C", "link-args=--release"
+]

config.toml.template

@@ -34,6 +34,7 @@ fn main() -> Result<(), i32> {
     let mut output_file: Option<String> = None;
     let mut r8_jar_path: Option<PathBuf> = None;
     let mut proguard_config_path: Option<PathBuf> = None;
+    let mut release_mode = false; // Default to false, can be set by a flag
     let java_lib_path: Option<PathBuf> = env::var("JAVA_HOME").ok().map(PathBuf::from);
 
 
@@ -71,6 +72,9 @@ fn main() -> Result<(), i32> {
                 );
                 return Err(1);
             }
+        } else if arg == "--release" {
+            release_mode = true; // Set release mode
+            i += 1;
         } else if !arg.starts_with('-') {
              // Collect potential input files, differentiating classes and JARs
              if arg.ends_with(".class") {
@@ -174,6 +178,7 @@ fn main() -> Result<(), i32> {
         r8_jar_path.as_deref(),
         proguard_config_path.as_deref(),
         java_lib_path.as_deref(),
+        release_mode,
     ).map_err(|e| {
         eprintln!("Error creating JAR file: {}", e);
         1 // Propagate error code
@@ -354,6 +359,7 @@ fn create_jar(
     r8_jar_path: Option<&Path>,
     proguard_config_path: Option<&Path>,
     java_lib_path: Option<&Path>, // Base Java runtime lib path
+    release_mode: bool
 ) -> io::Result<()> {
     // Regex for stripping cargo hashes from .class filenames
     let re_strip_hash = Regex::new(r"^(?P<name>[^-]+)(?:-[0-9a-fA-F]+)?\.class$").unwrap();
@@ -466,6 +472,7 @@ fn create_jar(
             &intermediate_jar_path, // Program input
             &library_jar_paths, // Additional libs
             &optimized_jar_path, // Output
+            release_mode, // Release mode flag
         ) {
             Ok(_) => {
                 println!("R8 optimization successful. Output: {}", optimized_jar_path.display());
@@ -642,6 +649,7 @@ fn run_r8_optimizer(
     program_input_jar_path: &Path,  // The intermediate JAR with app classes
     library_jar_paths: &[PathBuf], // List of other input JARs (dependencies)
     output_jar_path: &Path,         // Where R8 should write the optimized JAR
+    release_mode: bool,             // Release mode flag
 ) -> io::Result<()> {
     println!("--- Running R8 ---");
     println!("  R8 JAR: {}", r8_jar_path.display());
@@ -662,7 +670,6 @@ fn run_r8_optimizer(
        .arg(r8_jar_path)               // Provide path to r8.jar
        .arg(r8_main_class)             // Specify the main class to run
        // --- R8 specific arguments ---
-       .arg("--release")               // Enable release mode (optimizations, shrinking)
        .arg("--output")                // Specify output path
        .arg(output_jar_path)
        .arg("--pg-conf")               // Specify ProGuard/R8 config file
@@ -677,6 +684,10 @@ fn run_r8_optimizer(
         cmd.arg("--classpath").arg(lib_path);
     }
 
+    if release_mode {
+        cmd.arg("--release"); // Add release mode flag if specified
+    }
+
     // Add the program input JAR (containing app classes) last
     cmd.arg(program_input_jar_path);