commit a335e1e29d89e2b400c3335e033fe0d0c97b3ae3
author Simon Pilgrim <llvm-dev@redking.me.uk> Sat Dec 09 16:19:18 2017 +0000
committer Simon Pilgrim <llvm-dev@redking.me.uk> Sat Dec 09 16:19:18 2017 +0000
tree 4895c10958d0a4a4c42a0df3f265607f3185a809
parent 3d0be4f5079b2a8680ffcd5fc6d3dd846f1d35ef

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

llvm-svn: 320254

llvm/lib/Target/Hexagon/HexagonISelDAGToDAGHVX.cpp

diff --git a/llvm/lib/Target/Hexagon/HexagonISelDAGToDAGHVX.cpp b/llvm/lib/Target/Hexagon/HexagonISelDAGToDAGHVX.cpp
index 26bceff..698d505 100644
--- a/llvm/lib/Target/Hexagon/HexagonISelDAGToDAGHVX.cpp
+++ b/llvm/lib/Target/Hexagon/HexagonISelDAGToDAGHVX.cpp
@@ -139,7 +139,7 @@
 
   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);