Merge pull request #1717 from alexcrichton/walrus-update

Update with list IR from `walrus`

Author: alexcrichton

azure-pipelines.yml

@@ -18,8 +18,6 @@ jobs:
         displayName: "Crate test suite"
       - script: WASM_BINDGEN_NO_DEBUG=1 cargo test --target wasm32-unknown-unknown
         displayName: "Crate test suite (no debug)"
-      - script: NODE_ARGS=/dev/null WASM_BINDGEN_ANYREF=1 cargo test --target wasm32-unknown-unknown --test wasm
-        displayName: "Anyref test suite builds"
       - script: cargo test --target wasm32-unknown-unknown --features serde-serialize
         displayName: "Crate test suite (with serde)"
       - script: cargo test --target wasm32-unknown-unknown --features enable-interning
@@ -30,6 +28,19 @@ jobs:
         displayName: "Futures test suite on native"
       - script: cargo test -p wasm-bindgen-futures --target wasm32-unknown-unknown
         displayName: "Futures test suite on wasm"
+      - script: |
+          set -e
+          curl https://nodejs.org/download/nightly/v13.0.0-nightly2019081215b2d13310/node-v13.0.0-nightly2019081215b2d13310-linux-x64.tar.xz | tar xJf -
+          echo "##vso[task.prependpath]$PWD/node-v13.0.0-nightly2019081215b2d13310-linux-x64/bin"
+          echo "##vso[task.setvariable variable=NODE_ARGS]--experimental-wasm-anyref,--experimental-wasm-bulk_memory"
+          echo "##vso[task.setvariable variable=WASM_BINDGEN_ANYREF]1"
+        displayName: "Install a custom node.js and configure anyref"
+      - script: cargo test --target wasm32-unknown-unknown --test wasm
+        displayName: "(anyref) Crate test suite"
+      - script: WASM_BINDGEN_NO_DEBUG=1 cargo test --target wasm32-unknown-unknown --test wasm
+        displayName: "(anyref) Crate test suite (no debug)"
+      - script: cargo test --target wasm32-unknown-unknown --features serde-serialize --test wasm
+        displayName: "(anyref) Crate test suite (with serde)"
 
   - job: test_wasm_bindgen_windows
     displayName: "Run wasm-bindgen crate tests (Windows)"

crates/anyref-xform/Cargo.toml

@@ -13,4 +13,4 @@ edition = '2018'
 
 [dependencies]
 failure = "0.1"
-walrus = "0.10.0"
+walrus = "0.11.0"

crates/anyref-xform/src/lib.rs

@@ -18,9 +18,9 @@ log = "0.4"
 rustc-demangle = "0.1.13"
 serde_json = "1.0"
 tempfile = "3.0"
-walrus = "0.10.0"
+walrus = "0.11.0"
 wasm-bindgen-anyref-xform = { path = '../anyref-xform', version = '=0.2.48' }
 wasm-bindgen-shared = { path = "../shared", version = '=0.2.48' }
 wasm-bindgen-threads-xform = { path = '../threads-xform', version = '=0.2.48' }
 wasm-bindgen-wasm-interpreter = { path = "../wasm-interpreter", version = '=0.2.48' }
-wasm-webidl-bindings = "0.3.0"
+wasm-webidl-bindings = "0.4.0"

crates/cli-support/Cargo.toml

@@ -44,6 +44,21 @@ pub fn process(module: &mut Module) -> Result<(), Error> {
     }
 
     cfg.run(module)?;
+
+    // Make sure to export the `anyref` table for the JS bindings since it
+    // will need to be initialized. If it doesn't exist though then the
+    // module must not use it, so we skip it.
+    let table = module.tables.iter().find(|t| match t.kind {
+        walrus::TableKind::Anyref(_) => true,
+        _ => false,
+    });
+    let table = match table {
+        Some(t) => t.id(),
+        None => return Ok(()),
+    };
+    module.exports.add("__wbg_anyref_table", table);
+
+    // Clean up now-unused intrinsics and shims and such
     walrus::passes::gc::run(module);
 
     // The GC pass above may end up removing some imported intrinsics. For

crates/cli-support/src/anyref.rs

@@ -14,9 +14,8 @@ use crate::descriptor::{Closure, Descriptor};
 use failure::Error;
 use std::borrow::Cow;
 use std::collections::{HashMap, HashSet};
-use std::mem;
 use walrus::ImportId;
-use walrus::{CustomSection, FunctionId, LocalFunction, Module, TypedCustomSectionId};
+use walrus::{CustomSection, FunctionId, Module, TypedCustomSectionId};
 use wasm_bindgen_wasm_interpreter::Interpreter;
 
 #[derive(Default, Debug)]
@@ -112,19 +111,16 @@ impl WasmBindgenDescriptorsSection {
         let mut element_removal_list = HashSet::new();
         let mut func_to_descriptor = HashMap::new();
         for (id, local) in module.funcs.iter_local() {
-            let entry = local.entry_block();
             let mut find = FindDescribeClosure {
-                func: local,
                 wbindgen_describe_closure,
-                cur: entry.into(),
-                call: None,
+                found: false,
             };
-            find.visit_block_id(&entry);
-            if let Some(call) = find.call {
+            dfs_in_order(&mut find, local, local.entry_block());
+            if find.found {
                 let descriptor = interpreter
                     .interpret_closure_descriptor(id, module, &mut element_removal_list)
                     .unwrap();
-                func_to_descriptor.insert(id, (call, Descriptor::decode(descriptor)));
+                func_to_descriptor.insert(id, Descriptor::decode(descriptor));
             }
         }
 
@@ -150,7 +146,7 @@ impl WasmBindgenDescriptorsSection {
         // freshly manufactured import. Save off the type of this import in
         // ourselves, and then we're good to go.
         let ty = module.funcs.get(wbindgen_describe_closure).ty();
-        for (func, (call_instr, descriptor)) in func_to_descriptor {
+        for (func, descriptor) in func_to_descriptor {
             let import_name = format!("__wbindgen_closure_wrapper{}", func.index());
             let (id, import_id) =
                 module.add_import_func("__wbindgen_placeholder__", &import_name, ty);
@@ -160,37 +156,42 @@ impl WasmBindgenDescriptorsSection {
                 walrus::FunctionKind::Local(l) => l,
                 _ => unreachable!(),
             };
-            let call = local.get_mut(call_instr).unwrap_call_mut();
-            assert_eq!(call.func, wbindgen_describe_closure);
-            call.func = id;
+            let entry = local.entry_block();
+            dfs_pre_order_mut(
+                &mut UpdateDescribeClosure {
+                    wbindgen_describe_closure,
+                    replacement: id,
+                },
+                local,
+                entry,
+            );
             self.closure_imports
                 .insert(import_id, descriptor.unwrap_closure());
         }
         return Ok(());
 
-        struct FindDescribeClosure<'a> {
-            func: &'a LocalFunction,
+        struct FindDescribeClosure {
             wbindgen_describe_closure: FunctionId,
-            cur: ExprId,
-            call: Option<ExprId>,
+            found: bool,
         }
 
-        impl<'a> Visitor<'a> for FindDescribeClosure<'a> {
-            fn local_function(&self) -> &'a LocalFunction {
-                self.func
+        impl<'a> Visitor<'a> for FindDescribeClosure {
+            fn visit_call(&mut self, call: &Call) {
+                if call.func == self.wbindgen_describe_closure {
+                    self.found = true;
+                }
             }
+        }
 
-            fn visit_expr_id(&mut self, id: &ExprId) {
-                let prev = mem::replace(&mut self.cur, *id);
-                id.visit(self);
-                self.cur = prev;
-            }
+        struct UpdateDescribeClosure {
+            wbindgen_describe_closure: FunctionId,
+            replacement: FunctionId,
+        }
 
-            fn visit_call(&mut self, call: &Call) {
-                call.visit(self);
+        impl<'a> VisitorMut for UpdateDescribeClosure {
+            fn visit_call_mut(&mut self, call: &mut Call) {
                 if call.func == self.wbindgen_describe_closure {
-                    assert!(self.call.is_none());
-                    self.call = Some(self.cur);
+                    call.func = self.replacement;
                 }
             }
         }

crates/cli-support/src/descriptors.rs

@@ -624,30 +624,16 @@ impl<'a> Context<'a> {
             return Ok(());
         }
 
-        // Make sure to export the `anyref` table for the JS bindings since it
-        // will need to be initialized. If it doesn't exist though then the
-        // module must not use it, so we skip it.
-        let table = self.module.tables.iter().find(|t| match t.kind {
-            walrus::TableKind::Anyref(_) => true,
-            _ => false,
-        });
-        let table = match table {
-            Some(t) => t.id(),
-            None => return Ok(()),
-        };
-        self.module.exports.add("__wbg_anyref_table", table);
-
         let ty = self.module.types.add(&[], &[]);
         let (import, import_id) =
             self.module
                 .add_import_func(PLACEHOLDER_MODULE, "__wbindgen_init_anyref_table", ty);
 
         self.module.start = Some(match self.module.start {
             Some(prev_start) => {
-                let mut builder = walrus::FunctionBuilder::new();
-                let call_init = builder.call(import, Box::new([]));
-                let call_prev = builder.call(prev_start, Box::new([]));
-                builder.finish(ty, Vec::new(), vec![call_init, call_prev], self.module)
+                let mut builder = walrus::FunctionBuilder::new(&mut self.module.types, &[], &[]);
+                builder.func_body().call(import).call(prev_start);
+                builder.finish(Vec::new(), &mut self.module.funcs)
             }
             None => import,
         });
@@ -827,11 +813,9 @@ impl<'a> Context<'a> {
         // because the start function currently only shows up when it's injected
         // through thread/anyref transforms. These injected start functions need
         // to happen before user code, so we always schedule them first.
-        let mut builder = walrus::FunctionBuilder::new();
-        let call1 = builder.call(prev_start, Box::new([]));
-        let call2 = builder.call(id, Box::new([]));
-        let ty = self.module.funcs.get(id).ty();
-        let new_start = builder.finish(ty, Vec::new(), vec![call1, call2], self.module);
+        let mut builder = walrus::FunctionBuilder::new(&mut self.module.types, &[], &[]);
+        builder.func_body().call(prev_start).call(id);
+        let new_start = builder.finish(Vec::new(), &mut self.module.funcs);
         self.module.start = Some(new_start);
         Ok(())
     }

crates/cli-support/src/webidl/mod.rs

@@ -24,7 +24,7 @@ rouille = { version = "3.0.0", default-features = false }
 serde = { version = "1.0", features = ['derive'] }
 serde_derive = "1.0"
 serde_json = "1.0"
-walrus = { version = "0.10.0", features = ['parallel'] }
+walrus = { version = "0.11.0", features = ['parallel'] }
 wasm-bindgen-cli-support = { path = "../cli-support", version = "=0.2.48" }
 wasm-bindgen-shared = { path = "../shared", version = "=0.2.48" }
 

crates/cli/Cargo.toml

@@ -13,4 +13,4 @@ edition = "2018"
 
 [dependencies]
 failure = "0.1"
-walrus = "0.10.0"
+walrus = "0.11.0"