Skip to content

Commit 04d508b

Browse files
authored
Disable enabling reference types by default with the bundler target (#4235)
Update reference files to Rust v1.82.
1 parent 2f2ac1a commit 04d508b

24 files changed

+80
-158
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@
2828
* Optimized ABI performance for `Option<{i32,u32,isize,usize,f32,*const T,*mut T}>`.
2929
[#4183](https://github.com/rustwasm/wasm-bindgen/pull/4183)
3030

31+
* Reference type proposal transformations are not applied by default when detecting it in the Wasm module for the bundler target because currently `webpack` doesn't support it.
32+
[#4235](https://github.com/rustwasm/wasm-bindgen/pull/4235)
33+
3134
### Fixed
3235

3336
* Fixed methods with `self: &Self` consuming the object.

crates/cli-support/src/lib.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,10 @@ impl Bindgen {
324324
};
325325

326326
// Enable reference type transformations if the module is already using it.
327-
if let Ok(true) = wasm_bindgen_wasm_conventions::target_feature(&module, "reference-types")
327+
// Currently `webpack` does not support reference types.
328+
if !matches!(self.mode, OutputMode::Bundler { .. })
329+
&& wasm_bindgen_wasm_conventions::target_feature(&module, "reference-types").ok()
330+
== Some(true)
328331
{
329332
self.externref = true;
330333
}

crates/cli/tests/reference/add.wat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66
(export "memory" (memory 0))
77
(export "add_u32" (func $add_u32))
88
(export "add_i32" (func $add_i32))
9-
(@custom "target_features" (after code) "\02+\0fmutable-globals+\08sign-ext")
9+
(@custom "target_features" (after code) "\04+\0amultivalue+\0fmutable-globals+\0freference-types+\08sign-ext")
1010
)
1111

crates/cli/tests/reference/anyref-empty.wat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66
(export "memory" (memory 0))
77
(export "__wbindgen_export_0" (table 0))
88
(export "__wbindgen_start" (func 0))
9-
(@custom "target_features" (after export) "\03+\0fmutable-globals+\08sign-ext+\0freference-types")
9+
(@custom "target_features" (after export) "\04+\0amultivalue+\0fmutable-globals+\0freference-types+\08sign-ext")
1010
)
1111

crates/cli/tests/reference/anyref-import-catch.js

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -39,32 +39,16 @@ function getStringFromWasm0(ptr, len) {
3939
return cachedTextDecoder.decode(getUint8ArrayMemory0().subarray(ptr, ptr + len));
4040
}
4141

42-
let cachedDataViewMemory0 = null;
43-
44-
function getDataViewMemory0() {
45-
if (cachedDataViewMemory0 === null || cachedDataViewMemory0.buffer.detached === true || (cachedDataViewMemory0.buffer.detached === undefined && cachedDataViewMemory0.buffer !== wasm.memory.buffer)) {
46-
cachedDataViewMemory0 = new DataView(wasm.memory.buffer);
47-
}
48-
return cachedDataViewMemory0;
49-
}
50-
5142
function takeFromExternrefTable0(idx) {
5243
const value = wasm.__wbindgen_export_2.get(idx);
5344
wasm.__externref_table_dealloc(idx);
5445
return value;
5546
}
5647

5748
export function exported() {
58-
try {
59-
const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
60-
wasm.exported(retptr);
61-
var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
62-
var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
63-
if (r1) {
64-
throw takeFromExternrefTable0(r0);
65-
}
66-
} finally {
67-
wasm.__wbindgen_add_to_stack_pointer(16);
49+
const ret = wasm.exported();
50+
if (ret[1]) {
51+
throw takeFromExternrefTable0(ret[0]);
6852
}
6953
}
7054

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,22 @@
11
(module $reference_test.wasm
22
(type (;0;) (func))
33
(type (;1;) (func (result i32)))
4-
(type (;2;) (func (param i32)))
5-
(type (;3;) (func (param i32) (result i32)))
4+
(type (;2;) (func (result i32 i32)))
5+
(type (;3;) (func (param i32)))
66
(import "./reference_test_bg.js" "__wbindgen_init_externref_table" (func (;0;) (type 0)))
7-
(func $exported (;1;) (type 2) (param i32))
8-
(func $__externref_table_dealloc (;2;) (type 2) (param i32))
9-
(func $__externref_table_alloc (;3;) (type 1) (result i32))
10-
(func $__wbindgen_exn_store (;4;) (type 2) (param i32))
11-
(func $__wbindgen_add_to_stack_pointer (;5;) (type 3) (param i32) (result i32))
7+
(func $__externref_table_dealloc (;1;) (type 3) (param i32))
8+
(func $__externref_table_alloc (;2;) (type 1) (result i32))
9+
(func $__wbindgen_exn_store (;3;) (type 3) (param i32))
10+
(func $"exported multivalue shim" (;4;) (type 2) (result i32 i32))
1211
(table (;0;) 128 externref)
1312
(memory (;0;) 17)
1413
(export "memory" (memory 0))
15-
(export "exported" (func $exported))
14+
(export "exported" (func $"exported multivalue shim"))
1615
(export "__wbindgen_exn_store" (func $__wbindgen_exn_store))
1716
(export "__externref_table_alloc" (func $__externref_table_alloc))
1817
(export "__wbindgen_export_2" (table 0))
19-
(export "__wbindgen_add_to_stack_pointer" (func $__wbindgen_add_to_stack_pointer))
2018
(export "__externref_table_dealloc" (func $__externref_table_dealloc))
2119
(export "__wbindgen_start" (func 0))
22-
(@custom "target_features" (after code) "\03+\0fmutable-globals+\08sign-ext+\0freference-types")
20+
(@custom "target_features" (after code) "\04+\0amultivalue+\0fmutable-globals+\0freference-types+\08sign-ext")
2321
)
2422

crates/cli/tests/reference/anyref-nop.wat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@
88
(export "foo" (func $foo))
99
(export "__wbindgen_export_0" (table 0))
1010
(export "__wbindgen_start" (func 0))
11-
(@custom "target_features" (after code) "\03+\0fmutable-globals+\08sign-ext+\0freference-types")
11+
(@custom "target_features" (after code) "\04+\0amultivalue+\0fmutable-globals+\0freference-types+\08sign-ext")
1212
)
1313

crates/cli/tests/reference/builder.wat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
(export "memory" (memory 0))
88
(export "__wbg_classbuilder_free" (func $__wbg_classbuilder_free))
99
(export "classbuilder_builder" (func $classbuilder_builder))
10-
(@custom "target_features" (after code) "\02+\0fmutable-globals+\08sign-ext")
10+
(@custom "target_features" (after code) "\04+\0amultivalue+\0fmutable-globals+\0freference-types+\08sign-ext")
1111
)
1212

crates/cli/tests/reference/constructor.wat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
(export "memory" (memory 0))
88
(export "__wbg_classconstructor_free" (func $__wbg_classconstructor_free))
99
(export "classconstructor_new" (func $classconstructor_new))
10-
(@custom "target_features" (after code) "\02+\0fmutable-globals+\08sign-ext")
10+
(@custom "target_features" (after code) "\04+\0amultivalue+\0fmutable-globals+\0freference-types+\08sign-ext")
1111
)
1212

crates/cli/tests/reference/empty.wat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
(module $reference_test.wasm
22
(memory (;0;) 16)
33
(export "memory" (memory 0))
4-
(@custom "target_features" (after export) "\02+\0fmutable-globals+\08sign-ext")
4+
(@custom "target_features" (after export) "\04+\0amultivalue+\0fmutable-globals+\0freference-types+\08sign-ext")
55
)
66

0 commit comments

Comments
 (0)