Skip to content

Commit a2c62f0

Browse files
CryZeCryZe
committed
Disable Automatic Activation of externref
Starting with Rust 1.82 `reference-types` is always present in the `target_features` section. The problem is that JS bundlers like Webpack can't currently handle the `reference-types` proposal. So for now there should not be any automatic detection of the feature and instead it should explicitly be enabled by the user.
1 parent 76776ef commit a2c62f0

21 files changed

+56
-104
lines changed

‎crates/cli-support/src/lib.rs

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -323,11 +323,17 @@ impl Bindgen {
323323
.context("failed getting Wasm module")?,
324324
};
325325

326-
// 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")
328-
{
329-
self.externref = true;
330-
}
326+
// FIXME: Starting with Rust 1.82 `reference-types` is always present
327+
// in the `target_features` section. The problem is that JS bundlers
328+
// like Webpack can't currently handle the `reference-types` proposal.
329+
// So for now there should not be any automatic detection of the feature
330+
// and instead it should explicitly be enabled by the user.
331+
332+
// // Enable reference type transformations if the module is already using it.
333+
// if let Ok(true) = wasm_bindgen_wasm_conventions::target_feature(&module, "reference-types")
334+
// {
335+
// self.externref = true;
336+
// }
331337

332338
// Enable multivalue transformations if the module is already using it.
333339
if let Ok(true) = wasm_bindgen_wasm_conventions::target_feature(&module, "multivalue") {

‎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

‎crates/cli/tests/reference/anyref-import-catch.wat

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

‎crates/cli/tests/reference/enums.wat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@
1010
(export "option_enum_echo" (func $option_enum_echo))
1111
(export "get_name" (func $get_name))
1212
(export "option_string_enum_echo" (func $option_string_enum_echo))
13-
(@custom "target_features" (after code) "\02+\0fmutable-globals+\08sign-ext")
13+
(@custom "target_features" (after code) "\04+\0amultivalue+\0fmutable-globals+\0freference-types+\08sign-ext")
1414
)
1515

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

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,6 @@ function handleError(f, args) {
2727
}
2828
}
2929

30-
let cachedDataViewMemory0 = null;
31-
32-
function getDataViewMemory0() {
33-
if (cachedDataViewMemory0 === null || cachedDataViewMemory0.buffer.detached === true || (cachedDataViewMemory0.buffer.detached === undefined && cachedDataViewMemory0.buffer !== wasm.memory.buffer)) {
34-
cachedDataViewMemory0 = new DataView(wasm.memory.buffer);
35-
}
36-
return cachedDataViewMemory0;
37-
}
38-
3930
function getObject(idx) { return heap[idx]; }
4031

4132
function dropObject(idx) {
@@ -51,16 +42,9 @@ function takeObject(idx) {
5142
}
5243

5344
export function exported() {
54-
try {
55-
const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
56-
wasm.exported(retptr);
57-
var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
58-
var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
59-
if (r1) {
60-
throw takeObject(r0);
61-
}
62-
} finally {
63-
wasm.__wbindgen_add_to_stack_pointer(16);
45+
const ret = wasm.exported();
46+
if (ret[1]) {
47+
throw takeObject(ret[0]);
6448
}
6549
}
6650

‎crates/cli/tests/reference/import-catch.wat

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
(module $reference_test.wasm
2-
(type (;0;) (func (param i32)))
3-
(type (;1;) (func (param i32) (result i32)))
4-
(func $exported (;0;) (type 0) (param i32))
5-
(func $__wbindgen_exn_store (;1;) (type 0) (param i32))
6-
(func $__wbindgen_add_to_stack_pointer (;2;) (type 1) (param i32) (result i32))
2+
(type (;0;) (func (result i32 i32)))
3+
(type (;1;) (func (param i32)))
4+
(func $__wbindgen_exn_store (;0;) (type 1) (param i32))
5+
(func $"exported multivalue shim" (;1;) (type 0) (result i32 i32))
76
(memory (;0;) 17)
87
(export "memory" (memory 0))
9-
(export "exported" (func $exported))
8+
(export "exported" (func $"exported multivalue shim"))
109
(export "__wbindgen_exn_store" (func $__wbindgen_exn_store))
11-
(export "__wbindgen_add_to_stack_pointer" (func $__wbindgen_add_to_stack_pointer))
12-
(@custom "target_features" (after code) "\02+\0fmutable-globals+\08sign-ext")
10+
(@custom "target_features" (after code) "\04+\0amultivalue+\0fmutable-globals+\0freference-types+\08sign-ext")
1311
)
1412

‎crates/cli/tests/reference/nop.wat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
(memory (;0;) 17)
55
(export "memory" (memory 0))
66
(export "nop" (func $nop))
7-
(@custom "target_features" (after code) "\02+\0fmutable-globals+\08sign-ext")
7+
(@custom "target_features" (after code) "\04+\0amultivalue+\0fmutable-globals+\0freference-types+\08sign-ext")
88
)
99

‎crates/cli/tests/reference/pointers.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 "const_pointer" (func $const_pointer))
88
(export "mut_pointer" (func $mut_pointer))
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/raw.wat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@
1111
(export "__wbg_test_free" (func $__wbg_test_free))
1212
(export "test_test1" (func $test_test1))
1313
(export "test_test2" (func $test_test2))
14-
(@custom "target_features" (after code) "\02+\0fmutable-globals+\08sign-ext")
14+
(@custom "target_features" (after code) "\04+\0amultivalue+\0fmutable-globals+\0freference-types+\08sign-ext")
1515
)
1616

‎crates/cli/tests/reference/result-string.js

Lines changed: 5 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,6 @@ function addHeapObject(obj) {
1919
return idx;
2020
}
2121

22-
let cachedDataViewMemory0 = null;
23-
24-
function getDataViewMemory0() {
25-
if (cachedDataViewMemory0 === null || cachedDataViewMemory0.buffer.detached === true || (cachedDataViewMemory0.buffer.detached === undefined && cachedDataViewMemory0.buffer !== wasm.memory.buffer)) {
26-
cachedDataViewMemory0 = new DataView(wasm.memory.buffer);
27-
}
28-
return cachedDataViewMemory0;
29-
}
30-
3122
function getObject(idx) { return heap[idx]; }
3223

3324
function dropObject(idx) {
@@ -68,23 +59,17 @@ export function exported() {
6859
let deferred2_0;
6960
let deferred2_1;
7061
try {
71-
const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
72-
wasm.exported(retptr);
73-
var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
74-
var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
75-
var r2 = getDataViewMemory0().getInt32(retptr + 4 * 2, true);
76-
var r3 = getDataViewMemory0().getInt32(retptr + 4 * 3, true);
77-
var ptr1 = r0;
78-
var len1 = r1;
79-
if (r3) {
62+
const ret = wasm.exported();
63+
var ptr1 = ret[0];
64+
var len1 = ret[1];
65+
if (ret[3]) {
8066
ptr1 = 0; len1 = 0;
81-
throw takeObject(r2);
67+
throw takeObject(ret[2]);
8268
}
8369
deferred2_0 = ptr1;
8470
deferred2_1 = len1;
8571
return getStringFromWasm0(ptr1, len1);
8672
} finally {
87-
wasm.__wbindgen_add_to_stack_pointer(16);
8873
wasm.__wbindgen_free(deferred2_0, deferred2_1, 1);
8974
}
9075
}

‎crates/cli/tests/reference/result-string.wat

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
11
(module $reference_test.wasm
2-
(type (;0;) (func (param i32)))
3-
(type (;1;) (func (param i32) (result i32)))
4-
(type (;2;) (func (param i32 i32 i32)))
5-
(func $exported (;0;) (type 0) (param i32))
6-
(func $__wbindgen_free (;1;) (type 2) (param i32 i32 i32))
7-
(func $__wbindgen_add_to_stack_pointer (;2;) (type 1) (param i32) (result i32))
2+
(type (;0;) (func (result i32 i32 i32 i32)))
3+
(type (;1;) (func (param i32 i32 i32)))
4+
(func $__wbindgen_free (;0;) (type 1) (param i32 i32 i32))
5+
(func $"exported multivalue shim" (;1;) (type 0) (result i32 i32 i32 i32))
86
(memory (;0;) 17)
97
(export "memory" (memory 0))
10-
(export "exported" (func $exported))
11-
(export "__wbindgen_add_to_stack_pointer" (func $__wbindgen_add_to_stack_pointer))
8+
(export "exported" (func $"exported multivalue shim"))
129
(export "__wbindgen_free" (func $__wbindgen_free))
13-
(@custom "target_features" (after code) "\02+\0fmutable-globals+\08sign-ext")
10+
(@custom "target_features" (after code) "\04+\0amultivalue+\0fmutable-globals+\0freference-types+\08sign-ext")
1411
)
1512

‎crates/cli/tests/reference/self-type.wat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@
2020
(export "test_self_Self" (func $test_self_Self))
2121
(export "test_self_ref_Self" (func $test_self_ref_Self))
2222
(export "test_self_ref_mut_Self" (func $test_self_ref_mut_Self))
23-
(@custom "target_features" (after code) "\02+\0fmutable-globals+\08sign-ext")
23+
(@custom "target_features" (after code) "\04+\0amultivalue+\0fmutable-globals+\0freference-types+\08sign-ext")
2424
)
2525

‎crates/cli/tests/reference/skip-jsdoc.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 "docme" (func $docme))
88
(export "i_has_docs" (func $i_has_docs))
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/string-arg.wat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@
1010
(export "foo" (func $foo))
1111
(export "__wbindgen_malloc" (func $__wbindgen_malloc))
1212
(export "__wbindgen_realloc" (func $__wbindgen_realloc))
13-
(@custom "target_features" (after code) "\02+\0fmutable-globals+\08sign-ext")
13+
(@custom "target_features" (after code) "\04+\0amultivalue+\0fmutable-globals+\0freference-types+\08sign-ext")
1414
)
1515

‎crates/cli/tests/reference/web-sys.wat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@
1515
(export "__wbindgen_exn_store" (func $__wbindgen_exn_store))
1616
(export "__wbindgen_malloc" (func $__wbindgen_malloc))
1717
(export "__wbindgen_realloc" (func $__wbindgen_realloc))
18-
(@custom "target_features" (after code) "\02+\0fmutable-globals+\08sign-ext")
18+
(@custom "target_features" (after code) "\04+\0amultivalue+\0fmutable-globals+\0freference-types+\08sign-ext")
1919
)
2020

0 commit comments

Comments
 (0)