Merge branch 'main' into update-to-rust-1.90.0

Author: brianheineman

.github/workflows/release.yml

@@ -66,7 +66,7 @@ jobs:
         # we specify bash to get pipefail; it guards against the `curl` command
         # failing. otherwise `sh` won't catch that `curl` returned non-0
         shell: bash
-        run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.29.0/cargo-dist-installer.sh | sh"
+        run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.30.0/cargo-dist-installer.sh | sh"
       - name: Cache dist
         uses: actions/upload-artifact@v4
         with:

Cargo.lock

@@ -41,7 +41,7 @@ byteorder = "1.5.0"
 byte-unit = "5.1.6"
 clap = "4.5.48"
 console = "0.16.1"
-cranelift = "0.123.2"
+cranelift = "0.124.1"
 criterion = { version = "0.7.0", default-features = false }
 dashmap = "6.1.0"
 dirs = "6.0.0"

Cargo.toml

@@ -8,7 +8,7 @@ cargo-auditable = false
 # Whether to use cargo-cyclonedx to generate an SBOM
 cargo-cyclonedx = true
 # The preferred dist version to use in CI (Cargo.toml SemVer syntax)
-cargo-dist-version = "0.29.0"
+cargo-dist-version = "0.30.0"
 # CI backends to support
 ci = "github"
 # Whether dist should create a Github Release or use an existing draft

dist-workspace.toml

@@ -22,7 +22,7 @@ async fn common_main() -> Result<()> {
     let cargo_manifest_dir = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
     let class_path = ClassPath::from(&[cargo_manifest_dir]);
     let configuration = ConfigurationBuilder::new()
-        .class_path(class_path.clone())
+        .class_path(class_path)
         .main_class("HelloWorld")
         .build()?;
     let vm = VM::new(configuration).await?;

examples/embedded_jvm/src/main.rs

@@ -32,7 +32,9 @@ pub(crate) async fn platform_properties(
     push_property(system_properties, &mut properties, "user.language")?;
     push_property(system_properties, &mut properties, "user.script")?;
     push_property(system_properties, &mut properties, "user.variant")?;
-    push_property(system_properties, &mut properties, "native.encoding")?;
+    if java_version < JAVA_25.java() {
+        push_property(system_properties, &mut properties, "native.encoding")?;
+    }
     push_property(system_properties, &mut properties, "file.separator")?;
     push_property(system_properties, &mut properties, "format.country")?;
     push_property(system_properties, &mut properties, "format.language")?;
@@ -48,6 +50,9 @@ pub(crate) async fn platform_properties(
     push_property(system_properties, &mut properties, "https.proxyPort")?;
     push_property(system_properties, &mut properties, "java.io.tmpdir")?;
     push_property(system_properties, &mut properties, "line.separator")?;
+    if java_version >= JAVA_25.java() {
+        push_property(system_properties, &mut properties, "native.encoding")?;
+    }
     push_property(system_properties, &mut properties, "os.arch")?;
     push_property(system_properties, &mut properties, "os.name")?;
     push_property(system_properties, &mut properties, "os.version")?;

ristretto_vm/src/intrinsic_methods/jdk/internal/util/systemprops_raw.rs

@@ -1,5 +1,5 @@
 #[cfg(feature = "startup-trace")]
-use std::sync::{LazyLock, Mutex};
+use std::sync::{LazyLock, Mutex, OnceLock};
 #[cfg(feature = "startup-trace")]
 use std::time::{Duration, Instant};
 
@@ -13,7 +13,7 @@ pub static ENABLED: LazyLock<bool> = LazyLock::new(|| {
 
 // First-call timestamp (set exactly on the first trace call)
 #[cfg(feature = "startup-trace")]
-static START: LazyLock<Mutex<Option<Instant>>> = LazyLock::new(|| Mutex::new(None));
+static START: OnceLock<Instant> = OnceLock::new();
 
 // Previous-call timestamp
 #[cfg(feature = "startup-trace")]
@@ -28,40 +28,32 @@ pub fn startup_trace_log(message: &str) {
     }
 
     let now = Instant::now();
-    let mut start_guard = START.lock().expect("failed to lock START");
     let mut last_guard = LAST.lock().expect("failed to lock LAST");
+    let start = START.get_or_init(|| {
+        *last_guard = Some(now);
+        now
+    });
 
-    if start_guard.is_none() {
-        *start_guard = Some(now);
+    if let Some(last) = *last_guard {
+        let delta_elapsed = now.checked_duration_since(last).unwrap_or(Duration::ZERO);
+        let start_elapsed = now.checked_duration_since(*start).unwrap_or(Duration::ZERO);
+        *last_guard = Some(now);
+        println!("[startup]{message}: +{delta_elapsed:.3?} (Σ {start_elapsed:.3?})");
+    } else {
         *last_guard = Some(now);
         println!(
             "[startup]{message}: +{:.3?} (Σ {:.3?})",
             Duration::ZERO,
             Duration::ZERO
         );
-        return;
     }
-
-    let start = start_guard.expect("START should be initialized");
-    let last = last_guard.expect("LAST should be initialized");
-    let delta_elapsed = now.checked_duration_since(last).unwrap_or(Duration::ZERO);
-    let start_elapsed = now.checked_duration_since(start).unwrap_or(Duration::ZERO);
-
-    *last_guard = Some(now);
-
-    println!("[startup]{message}: +{delta_elapsed:.3?} (Σ {start_elapsed:.3?})");
 }
 
-/// No-op version when the feature is disabled; zero code generation.
-#[doc(hidden)]
-#[cfg(not(feature = "startup-trace"))]
-#[inline(always)]
-pub fn startup_trace_log(_message: &str) {}
-
 /// Log a startup phase message and the time elapsed since the last `startup_trace!()` call.
 #[macro_export]
 macro_rules! startup_trace {
     ($msg:expr) => {{
+        #[cfg(feature = "startup-trace")]
         $crate::startup_trace::startup_trace_log($msg);
     }};
 }

ristretto_vm/src/startup_trace.rs

@@ -1,5 +1,8 @@
 use ristretto_vm::{ClassPath, ConfigurationBuilder, Result, VM};
+use std::io::Cursor;
 use std::path::PathBuf;
+use std::sync::Arc;
+use tokio::sync::Mutex;
 
 async fn test_helloworld(java_verison: &str) -> Result<()> {
     let cargo_manifest = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
@@ -8,15 +11,23 @@ async fn test_helloworld(java_verison: &str) -> Result<()> {
         .join("classes")
         .join("classes.jar");
     let class_path = ClassPath::from(&[classes_jar_path]);
+    let stdout_buffer = Arc::new(Mutex::new(Cursor::new(Vec::<u8>::new())));
+
     let configuration = ConfigurationBuilder::new()
         .class_path(class_path.clone())
         .main_class("HelloWorld")
         .java_version(java_verison)
+        .stdout(stdout_buffer.clone())
         .build()?;
     let vm = VM::new(configuration).await?;
-    let parameters: Vec<&str> = Vec::new();
+    let parameters = vec!["world!"];
+
     let result = vm.invoke_main(&parameters).await?;
     assert!(result.is_none());
+    let output = stdout_buffer.lock().await;
+    let output_bytes = output.get_ref();
+    let output_str = String::from_utf8(output_bytes.clone()).expect("Invalid UTF-8 output");
+    assert_eq!(output_str.trim(), "Hello world!");
     Ok(())
 }