From 0abc9ce8e9676c95f7ff572529eebf3018179dad Mon Sep 17 00:00:00 2001
From: Thomas Lively <7121787+tlively@users.noreply.github.com>
Date: Tue, 10 Mar 2020 18:52:50 -0700
Subject: Update Precompute to handle tuples (#2687)

This involves replacing `Literal::makeZero` with `Literal::makeZeroes`
and `Literal::makeSingleZero` and updating `isConstantExpression` to
handle constant tuples as well. Also makes `Literals` its own struct
and adds convenience methods on it.
---
 src/passes/RedundantSetElimination.cpp | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'src/passes/RedundantSetElimination.cpp')

diff --git a/src/passes/RedundantSetElimination.cpp b/src/passes/RedundantSetElimination.cpp
index d881bd9e2..ab052853c 100644
--- a/src/passes/RedundantSetElimination.cpp
+++ b/src/passes/RedundantSetElimination.cpp
@@ -92,11 +92,13 @@ struct RedundantSetElimination
   // numbering
 
   Index nextValue = 1; // 0 is reserved for the "unseen value"
-  std::unordered_map<Literal, Index> literalValues; // each constant has a value
-  std::unordered_map<Expression*, Index>
-    expressionValues; // each value can have a value
+  // each constant has a value
+  std::unordered_map<Literals, Index> literalValues;
+  // each value can have a value
+  std::unordered_map<Expression*, Index> expressionValues;
+  // each block has values for each merge
   std::unordered_map<BasicBlock*, std::unordered_map<Index, Index>>
-    blockMergeValues; // each block has values for each merge
+    blockMergeValues;
 
   Index getUnseenValue() { // we haven't seen this location yet
     return 0;
@@ -108,7 +110,7 @@ struct RedundantSetElimination
     return nextValue++;
   }
 
-  Index getLiteralValue(Literal lit) {
+  Index getLiteralValue(Literals lit) {
     auto iter = literalValues.find(lit);
     if (iter != literalValues.end()) {
       return iter->second;
@@ -159,7 +161,7 @@ struct RedundantSetElimination
   Index getValue(Expression* value, LocalValues& currValues) {
     if (auto* c = value->dynCast<Const>()) {
       // a constant
-      return getLiteralValue(c->value);
+      return getLiteralValue({c->value});
     } else if (auto* get = value->dynCast<LocalGet>()) {
       // a copy of whatever that was
       return currValues[get->index];
-- 
cgit v1.2.3