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

coolreader18 · coolreader18 · commit 9199599defb9 · 2022-10-14T16:56:28.000-05:00
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -407,6 +407,14 @@ jobs:
           npm install
           npm run test
         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
@@ -15,7 +15,7 @@ include = ["LICENSE", "Cargo.toml", "src/**/*.rs"]
 resolver = "2"
 members = [
     "compiler", "compiler/ast", "compiler/core", "compiler/codegen", "compiler/parser",
-    ".", "common", "derive", "jit", "vm", "pylib", "stdlib", "wasm/lib",
+    ".", "common", "derive", "jit", "vm", "pylib", "stdlib", "wasm/lib", "wasm/wasm-unknown-test",
 ]
 
 [features]
diff --git a/stdlib/Cargo.toml b/stdlib/Cargo.toml
@@ -15,7 +15,7 @@ ssl-vendor = ["ssl", "openssl/vendored", "openssl-probe"]
 [dependencies]
 # rustpython crates
 rustpython-derive = { path = "../derive" }
-rustpython-vm = { path = "../vm" }
+rustpython-vm = { path = "../vm", default-features = false }
 rustpython-common = { path = "../common" }
 
 # random
diff --git a/vm/Cargo.toml b/vm/Cargo.toml
@@ -9,7 +9,7 @@ edition = "2021"
 include = ["src/**/*.rs", "Cargo.toml", "build.rs", "Lib/**/*.py"]
 
 [features]
-default = ["compiler"]
+default = ["compiler", "js"]
 importlib = []
 encodings = ["importlib"]
 vm-tracing-logging = []
@@ -22,6 +22,8 @@ ast = ["rustpython-ast"]
 codegen = ["rustpython-codegen", "ast"]
 parser = ["rustpython-parser", "ast"]
 
+js = ["getrandom/js", "chrono/wasmbind", "wasm-bindgen"]
+
 [dependencies]
 rustpython-compiler = { path = "../compiler", optional = true, version = "0.1.2" }
 rustpython-ast = { path = "../compiler/ast", optional = true, version = "0.1" }
@@ -38,11 +40,11 @@ num-traits = "0.2.14"
 num-integer = "0.1.44"
 num-rational = "0.4.0"
 rand = "0.8.5"
-getrandom = { version = "0.2.6", features = ["js"] }
+getrandom = { version = "0.2.6" }
 log = "0.4.16"
 serde = { version = "1.0.136", features = ["derive"] }
 caseless = "0.2.1"
-chrono = { version = "0.4.19", features = ["wasmbind"] }
+chrono = { version = "0.4.19", default-features = false, features = ["clock", "std", "oldtime"] }
 itertools = "0.10.3"
 hex = "0.4.3"
 hexf-parse = "0.2.1"
@@ -126,8 +128,8 @@ features = [
   "impl-default", "vcruntime", "ifdef", "netioapi", "memoryapi",
 ]
 
-[target.'cfg(target_arch = "wasm32")'.dependencies]
-wasm-bindgen = "0.2.80"
+[target.'cfg(all(target_arch = "wasm32", target_os = "unknown"))'.dependencies]
+wasm-bindgen = { version = "0.2.80", optional = true }
 
 [build-dependencies]
 itertools = "0.10.3"
diff --git a/vm/src/stdlib/time.rs b/vm/src/stdlib/time.rs
@@ -89,7 +89,7 @@ mod time {
         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]
@@ -102,6 +102,11 @@ mod time {
         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
@@ -40,7 +40,7 @@ impl VirtualMachine {
             };
             panic!("{}; {}", msg, after)
         }
-        #[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]
@@ -53,6 +53,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)
+        }
     }
 
     #[track_caller]
diff --git a/wasm/lib/Cargo.toml b/wasm/lib/Cargo.toml
@@ -21,7 +21,7 @@ rustpython-parser = { path = "../../compiler/parser" }
 rustpython-pylib = { path = "../../pylib", default-features = false, optional = true }
 rustpython-stdlib = { path = "../../stdlib", default-features = false, optional = true }
 # make sure no threading! otherwise wasm build will fail
-rustpython-vm = { path = "../../vm", default-features = false, features = ["compiler", "encodings"] }
+rustpython-vm = { path = "../../vm", default-features = false, features = ["compiler", "encodings", "js"] }
 
 console_error_panic_hook = "0.1"
 js-sys = "0.3"
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
`@@ -15,7 +15,7 @@ include = ["LICENSE", "Cargo.toml", "src/*/.rs"]`
`15`	`15`	`resolver = "2"`
`16`	`16`	`members = [`
`17`	`17`	`"compiler", "compiler/ast", "compiler/core", "compiler/codegen", "compiler/parser",`
`18`		`- ".", "common", "derive", "jit", "vm", "pylib", "stdlib", "wasm/lib",`
	`18`	`+ ".", "common", "derive", "jit", "vm", "pylib", "stdlib", "wasm/lib", "wasm/wasm-unknown-test",`
`19`	`19`	`]`
`20`	`20`
`21`	`21`	`[features]`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ impl VirtualMachine {`
`40`	`40`	`};`
`41`	`41`	`panic!("{}; {}", msg, after)`
`42`	`42`	`}`
`43`		`- #[cfg(all(target_arch = "wasm32", not(target_os = "wasi")))]`
	`43`	`+ #[cfg(all(target_arch = "wasm32", feature = "js", not(target_os = "wasi")))]`
`44`	`44`	`{`
`45`	`45`	`use wasm_bindgen::prelude::*;`
`46`	`46`	`#[wasm_bindgen]`
`@@ -53,6 +53,11 @@ impl VirtualMachine {`
`53`	`53`	`error(&s);`
`54`	`54`	`panic!("{}; exception backtrace above", msg)`
`55`	`55`	`}`
	`56`	`+ #[cfg(all(target_arch = "wasm32", not(feature = "js"), not(target_os = "wasi")))]`
	`57`	`+ {`
	`58`	`+ let _ = exc;`
	`59`	`+ panic!("{}; python exception not available", msg)`
	`60`	`+ }`
`56`	`61`	`}`
`57`	`62`
`58`	`63`	`#[track_caller]`
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.