From 17dc79e4c5111c48102c10e8266c556139340a8a Mon Sep 17 00:00:00 2001
From: Nick Fitzgerald <fitzgen@gmail.com>
Date: Thu, 14 Feb 2019 06:35:40 -0800
Subject: [PATCH] Configure walrus to generate DWARF/names at the right times

Fixes ##1254
---
 crates/cli-support/Cargo.toml      | 2 +-
 crates/cli-support/src/lib.rs      | 2 ++
 crates/cli/Cargo.toml              | 2 +-
 crates/threads-xform/Cargo.toml    | 2 +-
 crates/wasm-interpreter/Cargo.toml | 2 +-
 5 files changed, 6 insertions(+), 4 deletions(-)
 mode change 100644 => 100755 crates/cli-support/src/lib.rs

diff --git a/crates/cli-support/Cargo.toml b/crates/cli-support/Cargo.toml
index b63bf6db292..9378221a88b 100644
--- a/crates/cli-support/Cargo.toml
+++ b/crates/cli-support/Cargo.toml
@@ -16,7 +16,7 @@ base64 = "0.9"
 failure = "0.1.2"
 rustc-demangle = "0.1.13"
 tempfile = "3.0"
-walrus = "0.1"
+walrus = "0.2"
 wasm-bindgen-shared = { path = "../shared", version = '=0.2.36' }
 wasm-bindgen-threads-xform = { path = '../threads-xform', version = '=0.2.36' }
 wasm-bindgen-wasm-interpreter = { path = "../wasm-interpreter", version = '=0.2.36' }
diff --git a/crates/cli-support/src/lib.rs b/crates/cli-support/src/lib.rs
old mode 100644
new mode 100755
index f5176c97fd4..c927e989063
--- a/crates/cli-support/src/lib.rs
+++ b/crates/cli-support/src/lib.rs
@@ -157,6 +157,8 @@ impl Bindgen {
                     // include shared memory, so it fails that part of
                     // validation!
                     .strict_validate(false)
+                    .generate_dwarf(self.keep_debug)
+                    .generate_name_section(!self.remove_name_section)
                     .parse(&contents)
                     .context("failed to parse input file as wasm")?;
                 let stem = match &self.out_name {
diff --git a/crates/cli/Cargo.toml b/crates/cli/Cargo.toml
index cd4b67a221e..906157175c6 100644
--- a/crates/cli/Cargo.toml
+++ b/crates/cli/Cargo.toml
@@ -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 = "0.1"
+walrus = "0.2"
 wasm-bindgen-cli-support = { path = "../cli-support", version = "=0.2.36" }
 wasm-bindgen-shared = { path = "../shared", version = "=0.2.36" }
 
diff --git a/crates/threads-xform/Cargo.toml b/crates/threads-xform/Cargo.toml
index 6d02fafadaf..6fada844229 100644
--- a/crates/threads-xform/Cargo.toml
+++ b/crates/threads-xform/Cargo.toml
@@ -12,5 +12,5 @@ Support for threading-related transformations in wasm-bindgen
 edition = "2018"
 
 [dependencies]
-walrus = "0.1"
+walrus = "0.2"
 failure = "0.1"
diff --git a/crates/wasm-interpreter/Cargo.toml b/crates/wasm-interpreter/Cargo.toml
index 16be57fadf0..c8263b28599 100644
--- a/crates/wasm-interpreter/Cargo.toml
+++ b/crates/wasm-interpreter/Cargo.toml
@@ -12,7 +12,7 @@ Micro-interpreter optimized for wasm-bindgen's use case
 edition = '2018'
 
 [dependencies]
-walrus = "0.1"
+walrus = "0.2"
 log = "0.4"
 
 [dev-dependencies]