From: Simon Pilgrim <llvm-dev@redking.me.uk>
Date: Sat, 9 Dec 2017 16:19:18 +0000 (+0000)
Subject: Fix 'enumeral and non-enumeral type in conditional expression' gcc warning. NFCI.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0fb0fea1a1f676d5f1b8ab97cb691f24f5722e79;p=llvm

Fix 'enumeral and non-enumeral type in conditional expression' gcc warning. NFCI.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@320254 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/Target/Hexagon/HexagonISelDAGToDAGHVX.cpp b/lib/Target/Hexagon/HexagonISelDAGToDAGHVX.cpp
index 26bceff71f4..698d50542fc 100644
--- a/lib/Target/Hexagon/HexagonISelDAGToDAGHVX.cpp
+++ b/lib/Target/Hexagon/HexagonISelDAGToDAGHVX.cpp
@@ -139,7 +139,7 @@ private:
 
   uint8_t getColor(Node N) {
     auto F = Colors.find(N);
-    return F != Colors.end() ? F->second : None;
+    return F != Colors.end() ? F->second : (uint8_t)None;
   }
 
   std::pair<bool,uint8_t> getUniqueColor(const NodeSet &Nodes);