Merge pull request #146 from WebAssembly/update-tests

Latest LLVM + http://reviews.llvm.org/D16650

2 files changed, 11 insertions, 2 deletions

diff --git a/src/s2wasm.h b/src/s2wasm.h
index 82675df1b..5eeb808bb 100644
--- a/src/s2wasm.h
+++ b/src/s2wasm.h
@@ -905,6 +905,15 @@ private:
         Name assign = getAssign();
         skipComma();
         setOutput(getInput(), assign);
+      } else if (match("tee_local")) {
+        Name assign = getAssign();
+        skipComma();
+        auto curr = allocator.alloc<SetLocal>();
+        curr->name = getAssign();
+        skipComma();
+        curr->value = getInput();
+        curr->type = curr->value->type;
+        setOutput(curr, assign);
       } else if (match("return")) {
         Block *temp;
         if (!(func->body && (temp = func->body->dyn_cast<Block>()) && temp->name == FAKE_RETURN)) {
diff --git a/src/wasm.h b/src/wasm.h
index 5b56cd62d..987a8da6b 100644
--- a/src/wasm.h
+++ b/src/wasm.h
@@ -270,8 +270,8 @@ enum HostOp {
 };
 
 #define assert_node(condition, node) \
-  if (!condition) { \
-    std::cerr << "node: " << node << std::endl; \
+  if (!(condition)) { \
+    std::cerr << "node: " << (node) << std::endl; \
     assert(0 && #condition); \
   }