From bf6972c3816dc81b167317a94487d5b9d2c88db0 Mon Sep 17 00:00:00 2001
From: Yury Delendik <ydelendik@mozilla.com>
Date: Mon, 17 Dec 2018 15:49:30 -0600
Subject: Fix i64 select lowering. (#1773)

---
 src/passes/I64ToI32Lowering.cpp | 39 +++++++++++++++++++++++++++++++--------
 1 file changed, 31 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/passes/I64ToI32Lowering.cpp b/src/passes/I64ToI32Lowering.cpp
index 200cebedb..4575dd2f8 100644
--- a/src/passes/I64ToI32Lowering.cpp
+++ b/src/passes/I64ToI32Lowering.cpp
@@ -235,9 +235,7 @@ struct I64ToI32Lowering : public WalkerPass<PostWalker<I64ToI32Lowering>> {
     setOutParam(curr, std::move(highBits));
   }
 
-  // If and Select have identical code
-  template<typename T>
-  void visitBranching(T* curr) {
+  void visitIf(If* curr) {
     if (!hasOutParam(curr->ifTrue)) return;
     assert(curr->ifFalse != nullptr && "Nullable ifFalse found");
     TempVar highBits = fetchOutParam(curr->ifTrue);
@@ -255,10 +253,6 @@ struct I64ToI32Lowering : public WalkerPass<PostWalker<I64ToI32Lowering>> {
     setOutParam(curr, std::move(highBits));
   }
 
-  void visitIf(If* curr) {
-    visitBranching<If>(curr);
-  }
-
   void visitLoop(Loop* curr) {
     assert(labelHighBitVars.find(curr->name) == labelHighBitVars.end());
     if (curr->type != i64) return;
@@ -1526,7 +1520,36 @@ struct I64ToI32Lowering : public WalkerPass<PostWalker<I64ToI32Lowering>> {
   }
 
   void visitSelect(Select* curr) {
-    visitBranching<Select>(curr);
+    if (!hasOutParam(curr->ifTrue)) {
+      assert(!hasOutParam(curr->ifFalse));
+      return;
+    }
+    assert(hasOutParam(curr->ifFalse));
+    TempVar highBits = getTemp();
+    TempVar lowBits = getTemp();
+    TempVar cond = getTemp();
+    Block* result = builder->blockify(
+      builder->makeSetLocal(cond, curr->condition),
+      builder->makeSetLocal(
+        lowBits,
+        builder->makeSelect(
+          builder->makeGetLocal(cond, i32),
+          curr->ifTrue,
+          curr->ifFalse
+        )
+      ),
+      builder->makeSetLocal(
+        highBits,
+        builder->makeSelect(
+          builder->makeGetLocal(cond, i32),
+          builder->makeGetLocal(fetchOutParam(curr->ifTrue), i32),
+          builder->makeGetLocal(fetchOutParam(curr->ifFalse), i32)
+        )
+      ),
+      builder->makeGetLocal(lowBits, i32)
+    );
+    setOutParam(result, std::move(highBits));
+    replaceCurrent(result);
   }
 
   void visitDrop(Drop* curr) {
-- 
cgit v1.2.3