Use correct ABI for wasm32 by default

Introduces `RUSTC_USE_WASM32_BINDGEN_COMPAT_ABI` env var to use the compat ABI if need.
rust-lang · Jan 11, 2021 · 94bf59e · 94bf59e
1 parent 6526e5c
commit 94bf59e
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/compiler/rustc_target/src/abi/call/mod.rs b/compiler/rustc_target/src/abi/call/mod.rs
@@ -605,7 +605,12 @@ impl<'a, Ty> FnAbi<'a, Ty> {
             "nvptx64" => nvptx64::compute_abi_info(self),
             "hexagon" => hexagon::compute_abi_info(self),
             "riscv32" | "riscv64" => riscv::compute_abi_info(cx, self),
-            "wasm32" if cx.target_spec().os != "emscripten" => {
+            "wasm32"
+                if cx.target_spec().os != "emscripten"
+                    && std::env::var("RUSTC_USE_WASM32_BINDGEN_COMPAT_ABI")
+                        .map(|x| &x != "0")
+                        .unwrap_or(false) =>
+            {
                 wasm32_bindgen_compat::compute_abi_info(self)
             }
             "wasm32" | "asmjs" => wasm32::compute_abi_info(cx, self),