Make rustpython-vm compatible with non-js wasm32-unknown & add tests

coolreader18 · youknowone · commit 85030e368a37 · 2024-08-09T01:11:41.000+09:00
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -380,6 +380,14 @@ jobs:
         env:
           NODE_OPTIONS: "--openssl-legacy-provider"
         working-directory: ./wasm/demo
+      - uses: mwilliamson/setup-wabt-action@v1
+        with: { wabt-version: "1.0.30" }
+      - name: check wasm32-unknown without js
+        run: |
+          cargo build --release -p wasm-unknown-test --target wasm32-unknown-unknown --verbose
+          if wasm-objdump -xj Import target/wasm32-unknown-unknown/release/wasm_unknown_test.wasm; then
+            echo "ERROR: wasm32-unknown module expects imports from the host environment" >2
+          fi
       - name: build notebook demo
         if: github.ref == 'refs/heads/release'
         run: |
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -96,7 +96,8 @@ x86_64-pc-windows-msvc = { triplet = "x64-windows-static-md", dev-dependencies =
 resolver = "2"
 members = [
     "compiler", "compiler/core", "compiler/codegen",
-    ".", "common", "derive", "jit", "vm", "vm/sre_engine", "pylib", "stdlib", "wasm/lib", "derive-impl",
+    ".", "common", "derive", "jit", "vm", "vm/sre_engine", "pylib", "stdlib", "derive-impl",
+    "wasm/lib", "wasm/wasm-unknown-test",
 ]
 
 [workspace.package]
diff --git a/stdlib/Cargo.toml b/stdlib/Cargo.toml
@@ -22,7 +22,7 @@ ssl-vendor = ["ssl", "openssl/vendored", "openssl-probe"]
 [dependencies]
 # rustpython crates
 rustpython-derive = { workspace = true }
-rustpython-vm = { workspace = true }
+rustpython-vm = { workspace = true, default-features = false }
 rustpython-common = { workspace = true }
 
 ahash = { workspace = true }
diff --git a/vm/Cargo.toml b/vm/Cargo.toml
@@ -10,7 +10,7 @@ repository.workspace = true
 license.workspace = true
 
 [features]
-default = ["compiler"]
+default = ["compiler", "js"]
 importlib = []
 encodings = ["importlib"]
 vm-tracing-logging = []
@@ -24,6 +24,8 @@ codegen = ["rustpython-codegen", "ast"]
 parser = ["rustpython-parser", "ast"]
 serde = ["dep:serde"]
 
+js = ["getrandom/js", "chrono/wasmbind", "wasm-bindgen"]
+
 [dependencies]
 rustpython-compiler = { workspace = true, optional = true }
 rustpython-codegen = { workspace = true, optional = true }
@@ -71,7 +73,7 @@ thread_local = { workspace = true }
 memchr = { workspace = true }
 
 caseless = "0.2.1"
-getrandom = { version = "0.2.12", features = ["js"] }
+getrandom = { version = "0.2.12" }
 flamer = { version = "0.4", optional = true }
 half = "1.8.2"
 memoffset = "0.9.1"
@@ -140,8 +142,8 @@ features = [
   "Win32_UI_WindowsAndMessaging",
 ]
 
-[target.'cfg(target_arch = "wasm32")'.dependencies]
-wasm-bindgen = "0.2.92"
+[target.'cfg(all(target_arch = "wasm32", target_os = "unknown"))'.dependencies]
+wasm-bindgen = { version = "0.2.92", optional = true }
 
 [build-dependencies]
 glob = { workspace = true }
diff --git a/vm/src/stdlib/time.rs b/vm/src/stdlib/time.rs
@@ -102,7 +102,7 @@ mod decl {
         Ok(duration_since_system_now(vm)?.as_secs_f64())
     }
 
-    #[cfg(all(target_arch = "wasm32", not(target_os = "wasi")))]
+    #[cfg(all(target_arch = "wasm32", feature = "js", not(target_os = "wasi")))]
     fn _time(_vm: &VirtualMachine) -> PyResult<f64> {
         use wasm_bindgen::prelude::*;
         #[wasm_bindgen]
@@ -115,6 +115,11 @@ mod decl {
         Ok(Date::now() / 1000.0)
     }
 
+    #[cfg(all(target_arch = "wasm32", not(feature = "js"), not(target_os = "wasi")))]
+    fn _time(vm: &VirtualMachine) -> PyResult<f64> {
+        Err(vm.new_not_implemented_error("time.time".to_owned()))
+    }
+
     #[pyfunction]
     fn monotonic(vm: &VirtualMachine) -> PyResult<f64> {
         Ok(get_monotonic_time(vm)?.as_secs_f64())
diff --git a/vm/src/vm/vm_object.rs b/vm/src/vm/vm_object.rs
@@ -19,7 +19,7 @@ impl VirtualMachine {
             self.flush_std();
             panic!("{msg}")
         }
-        #[cfg(all(target_arch = "wasm32", not(target_os = "wasi")))]
+        #[cfg(all(target_arch = "wasm32", feature = "js", not(target_os = "wasi")))]
         {
             use wasm_bindgen::prelude::*;
             #[wasm_bindgen]
@@ -32,6 +32,11 @@ impl VirtualMachine {
             error(&s);
             panic!("{}; exception backtrace above", msg)
         }
+        #[cfg(all(target_arch = "wasm32", not(feature = "js"), not(target_os = "wasi")))]
+        {
+            let _ = exc;
+            panic!("{}; python exception not available", msg)
+        }
     }
 
     pub(crate) fn flush_std(&self) {
diff --git a/wasm/lib/Cargo.toml b/wasm/lib/Cargo.toml
@@ -21,7 +21,7 @@ rustpython-common = { workspace = true }
 rustpython-pylib = { workspace = true, optional = true }
 rustpython-stdlib = { workspace = true, default-features = false, optional = true }
 # make sure no threading! otherwise wasm build will fail
-rustpython-vm = { workspace = true, features = ["compiler", "encodings", "serde"] }
+rustpython-vm = { workspace = true, features = ["compiler", "encodings", "serde", "js"] }
 
 rustpython-parser = { workspace = true }
 
diff --git a/wasm/wasm-unknown-test/Cargo.toml b/wasm/wasm-unknown-test/Cargo.toml
@@ -0,0 +1,11 @@
+[package]
+name = "wasm-unknown-test"
+version = "0.1.0"
+edition = "2021"
+
+[lib]
+crate-type = ["cdylib"]
+
+[dependencies]
+getrandom = { version = "0.2.7", features = ["custom"] }
+rustpython-vm = { path = "../../vm", default-features = false, features = ["compiler"] }
diff --git a/wasm/wasm-unknown-test/README.md b/wasm/wasm-unknown-test/README.md
@@ -0,0 +1 @@
+A test crate to ensure that `rustpython-vm` compiles on `wasm32-unknown-unknown` without a JS host.
diff --git a/wasm/wasm-unknown-test/src/lib.rs b/wasm/wasm-unknown-test/src/lib.rs
@@ -0,0 +1,16 @@
+use rustpython_vm::{eval, Interpreter};
+
+pub unsafe extern "C" fn eval(s: *const u8, l: usize) -> u32 {
+    let src = std::slice::from_raw_parts(s, l);
+    let src = std::str::from_utf8(src).unwrap();
+    Interpreter::without_stdlib(Default::default()).enter(|vm| {
+        let res = eval::eval(vm, src, vm.new_scope_with_builtins(), "<string>").unwrap();
+        res.try_into_value(vm).unwrap()
+    })
+}
+
+fn getrandom_always_fail(_buf: &mut [u8]) -> Result<(), getrandom::Error> {
+    Err(getrandom::Error::UNSUPPORTED)
+}
+
+getrandom::register_custom_getrandom!(getrandom_always_fail);

Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,8 @@ x86_64-pc-windows-msvc = { triplet = "x64-windows-static-md", dev-dependencies =`
`96`	`96`	`resolver = "2"`
`97`	`97`	`members = [`
`98`	`98`	`"compiler", "compiler/core", "compiler/codegen",`
`99`		`- ".", "common", "derive", "jit", "vm", "vm/sre_engine", "pylib", "stdlib", "wasm/lib", "derive-impl",`
	`99`	`+ ".", "common", "derive", "jit", "vm", "vm/sre_engine", "pylib", "stdlib", "derive-impl",`
	`100`	`+ "wasm/lib", "wasm/wasm-unknown-test",`
`100`	`101`	`]`
`101`	`102`
`102`	`103`	`[workspace.package]`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ impl VirtualMachine {`
`19`	`19`	`self.flush_std();`
`20`	`20`	`panic!("{msg}")`
`21`	`21`	`}`
`22`		`- #[cfg(all(target_arch = "wasm32", not(target_os = "wasi")))]`
	`22`	`+ #[cfg(all(target_arch = "wasm32", feature = "js", not(target_os = "wasi")))]`
`23`	`23`	`{`
`24`	`24`	`use wasm_bindgen::prelude::*;`
`25`	`25`	`#[wasm_bindgen]`
`@@ -32,6 +32,11 @@ impl VirtualMachine {`
`32`	`32`	`error(&s);`
`33`	`33`	`panic!("{}; exception backtrace above", msg)`
`34`	`34`	`}`
	`35`	`+ #[cfg(all(target_arch = "wasm32", not(feature = "js"), not(target_os = "wasi")))]`
	`36`	`+ {`
	`37`	`+ let _ = exc;`
	`38`	`+ panic!("{}; python exception not available", msg)`
	`39`	`+ }`
`35`	`40`	`}`
`36`	`41`
`37`	`42`	`pub(crate) fn flush_std(&self) {`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+A test crate to ensure that `rustpython-vm` compiles on `wasm32-unknown-unknown` without a JS host.