Skip to content

Commit

Permalink
Rollup merge of rust-lang#88482 - athei:add-import-test, r=the8472
Browse files Browse the repository at this point in the history
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 rust-lang#78744
r? `@jyn514`
  • Loading branch information
m-ou-se authored Sep 2, 2021
2 parents 3f72532 + 14cbb4b commit 7e2d0e1
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 0 deletions.
7 changes: 7 additions & 0 deletions src/test/run-make/wasm-spurious-import/Makefile
Original file line number Diff line number Diff line change
@@ -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
14 changes: 14 additions & 0 deletions src/test/run-make/wasm-spurious-import/main.rs
Original file line number Diff line number Diff line change
@@ -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
}
9 changes: 9 additions & 0 deletions src/test/run-make/wasm-spurious-import/verify.js
Original file line number Diff line number Diff line change
@@ -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);

0 comments on commit 7e2d0e1

Please sign in to comment.