From a335e1e29d89e2b400c3335e033fe0d0c97b3ae3 Mon Sep 17 00:00:00 2001
From: Simon Pilgrim <llvm-dev@redking.me.uk>
Date: Sat, 9 Dec 2017 16:19:18 +0000
Subject: [PATCH] Fix 'enumeral and non-enumeral type in conditional
 expression' gcc warning. NFCI.

llvm-svn: 320254
---
 llvm/lib/Target/Hexagon/HexagonISelDAGToDAGHVX.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/llvm/lib/Target/Hexagon/HexagonISelDAGToDAGHVX.cpp b/llvm/lib/Target/Hexagon/HexagonISelDAGToDAGHVX.cpp
index 26bceff71f4d..698d50542fc0 100644
--- a/llvm/lib/Target/Hexagon/HexagonISelDAGToDAGHVX.cpp
+++ b/llvm/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);