about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2021-09-03 23:12:35 +0000
committerbors <bors@rust-lang.org>2021-09-03 23:12:35 +0000
commit03c775c95596cbd92f2b1e8ca98e7addfa3eade2 (patch)
tree64ceafb873d48c1f1ac3e4b2508f2fa9f1487d43
parentb7404c898a1a6933b71c72428a6dce551bcc1be7 (diff)
parent14cbb4b78d532532f611d5653f169319bdf50b75 (diff)
downloadrust-03c775c95596cbd92f2b1e8ca98e7addfa3eade2.tar.gz
rust-03c775c95596cbd92f2b1e8ca98e7addfa3eade2.zip
Auto merge of #88482 - athei:add-import-test, r=the8472
Add regression test for a spurious import

This PR adds a test that verifies that the bug described in the linked issue does not creep back into the code. In essence it checks that compiling some specific code (that uses 128 bit multiplication) with a specific set of compiler options does not lead to a spurious import of a panic function.

I noticed that other wasm tests use `# only-wasm32-bare` in their `Makefile`. This will skip the test for me. I did not find out how to run this test locally. Maybe someone can help.

closes #78744
r? `@jyn514`
-rw-r--r--src/test/run-make/wasm-spurious-import/Makefile7
-rw-r--r--src/test/run-make/wasm-spurious-import/main.rs14
-rw-r--r--src/test/run-make/wasm-spurious-import/verify.js9
3 files changed, 30 insertions, 0 deletions
diff --git a/src/test/run-make/wasm-spurious-import/Makefile b/src/test/run-make/wasm-spurious-import/Makefile
new file mode 100644
index 00000000000..1bb59dc1bfa
--- /dev/null
+++ b/src/test/run-make/wasm-spurious-import/Makefile
@@ -0,0 +1,7 @@
+-include ../../run-make-fulldeps/tools.mk
+
+# only-wasm32-bare
+
+all:
+	$(RUSTC) main.rs -C overflow-checks=yes -C panic=abort -C lto -C opt-level=z --target wasm32-unknown-unknown
+	$(NODE) verify.js $(TMPDIR)/main.wasm
diff --git a/src/test/run-make/wasm-spurious-import/main.rs b/src/test/run-make/wasm-spurious-import/main.rs
new file mode 100644
index 00000000000..fcbead5e28b
--- /dev/null
+++ b/src/test/run-make/wasm-spurious-import/main.rs
@@ -0,0 +1,14 @@
+#![crate_type = "cdylib"]
+#![no_std]
+
+#[panic_handler]
+fn my_panic(_info: &core::panic::PanicInfo) -> ! {
+    loop {}
+}
+
+#[no_mangle]
+pub fn multer(a: i128, b: i128) -> i128 {
+    // Trigger usage of the __multi3 compiler intrinsic which then leads to an imported
+    // panic function in case of a bug. We verify that no imports exist in our verifier.
+    a * b
+}
diff --git a/src/test/run-make/wasm-spurious-import/verify.js b/src/test/run-make/wasm-spurious-import/verify.js
new file mode 100644
index 00000000000..d3b2101b662
--- /dev/null
+++ b/src/test/run-make/wasm-spurious-import/verify.js
@@ -0,0 +1,9 @@
+const fs = require('fs');
+const process = require('process');
+const assert = require('assert');
+const buffer = fs.readFileSync(process.argv[2]);
+
+let m = new WebAssembly.Module(buffer);
+let imports = WebAssembly.Module.imports(m);
+console.log('imports', imports);
+assert.strictEqual(imports.length, 0);