Merge pull request #231 from WebAssembly/spec-updates

Spec updates

1 files changed, 7 insertions, 15 deletions

diff --git a/src/wasm.h b/src/wasm.h
index ba9d7de3d..6cbe93e3b 100644
--- a/src/wasm.h
+++ b/src/wasm.h
@@ -842,20 +842,14 @@ public:
 
 class Switch : public Expression {
 public:
-  Switch() : Expression(SwitchId) {}
-
-  struct Case {
-    Name name;
-    Expression *body;
-    Case() {}
-    Case(Name name, Expression *body) : name(name), body(body) {}
-  };
+  Switch() : Expression(SwitchId), condition(nullptr), value(nullptr) {
+    type = unreachable;
+  }
 
-  Name name;
-  Expression *value;
   std::vector<Name> targets;
   Name default_;
-  std::vector<Case> cases;
+  Expression *condition;
+  Expression *value;
 };
 
 class CallBase : public Expression {
@@ -1288,10 +1282,8 @@ struct ChildWalker : public WasmWalkerBase<ChildWalker<ParentType>> {
     parent.walk(curr->value);
   }
   void visitSwitch(Switch *curr) {
-    parent.walk(curr->value);
-    for (auto& case_ : curr->cases) {
-      parent.walk(case_.body);
-    }
+    parent.walk(curr->condition);
+    if (curr->value) parent.walk(curr->value);
   }
   void visitCall(Call *curr) {
     ExpressionList& list = curr->operands;