Subzero: Fix some build problems against LLVM trunk.

src/IceClFlags.cpp

 //===- subzero/src/IceClFlags.cpp - Command line flags and parsing --------===//
 //
 //                        The Subzero Code Generator
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 ///
 /// \file
@@ skipping 42 matching lines @@
 template <typename T> using list = llvm::cl::list<T>;
 
 using llvm::cl::NotHidden;
 
 template <typename T> using opt = llvm::cl::opt<T>;
 
 using llvm::cl::ParseCommandLineOptions;
 
 using llvm::cl::Positional;
 
+// LLVM commit 3ffe113e11168abcd809ec5ac539538ade5db0cb changed the internals of
+// llvm::cl that need to be mirrored here.  That commit removed the clEnumValEnd
+// macro, so we can use that to determine which version of LLVM we're compiling
+// against.
+#if defined(clEnumValEnd)
+
+#define CLENUMVALEND , clEnumValEnd
+
 template <typename T> using ValuesClass = llvm::cl::ValuesClass<T>;
 
 template <typename T, typename... A>
 ValuesClass<T> values(const char *Arg, T Val, const char *Desc, A &&... Args) {
   return llvm::cl::values(Arg, Val, Desc, std::forward<A>(Args)..., nullptr);
 }
 
+#else // !defined(clEnumValEnd)
+
+#define CLENUMVALEND
+
+using llvm::cl::OptionEnumValue;
+
+template <typename... A> llvm::cl::ValuesClass values(A &&... Args) {
+  return llvm::cl::values(std::forward<A>(Args)...);
+}
+
+#endif // !defined(clEnumValEnd)
+
 using llvm::cl::value_desc;
 } // end of namespace cl
 
 // cl_type_traits is used to convert between a tuple of <T, cl_detail::*flag> to
 // the appropriate (llvm::)cl object.
 template <typename B, typename CL> struct cl_type_traits {};
 
 template <typename T>
 struct cl_type_traits<T, ::Ice::cl_detail::dev_list_flag> {
   using cl_type = cl::list<T>;
@@ skipping 125 matching lines @@
                                     (OutFileTypeObj != Ice::FT_Iasm));
   OutFlags.ForceO2.init(OutFlags.getForceO2String());
   OutFlags.SplitInsts.init(OutFlags.getSplitInstString());
   OutFlags.TestStatus.init(OutFlags.getTestStatusString());
   OutFlags.TimingFocus.init(OutFlags.getTimingFocusOnString());
   OutFlags.TranslateOnly.init(OutFlags.getTranslateOnlyString());
   OutFlags.VerboseFocus.init(OutFlags.getVerboseFocusOnString());
 }
 
 } // end of namespace Ice