Subzero: Update for LLVM 3.9 (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 145 matching lines @@
 // toSetterParam is template magic that is needed to convert between (llvm::)cl
 // objects and the arguments to ClFlags' setters. ToSetterParam is a traits
 // object that we need in order for the multiple specializations to
 // toSetterParam to agree on their return type.
 template <typename T> struct ToSetterParam { using ReturnType = const T &; };
 
 template <> struct ToSetterParam<cl::list<Ice::VerboseItem>> {
   using ReturnType = Ice::VerboseMask;
 };
 
+template <> struct ToSetterParam<cl::list<std::string>> {
+  using ReturnType = std::vector<std::string>;
+};
+
 template <typename T>
 typename ToSetterParam<T>::ReturnType toSetterParam(const T &Param) {
   return Param;
 }
 
 template <>
 ToSetterParam<cl::list<Ice::VerboseItem>>::ReturnType
 toSetterParam(const cl::list<Ice::VerboseItem> &Param) {
   Ice::VerboseMask VMask = Ice::IceV_None;
   // Don't generate verbose messages if routines to dump messages are not
   // available.
   if (BuildDefs::dump()) {
     for (unsigned i = 0; i != Param.size(); ++i)
       VMask |= Param[i];
   }
   return VMask;
 }
 
+template <>
+ToSetterParam<cl::list<std::string>>::ReturnType
+toSetterParam(const cl::list<std::string> &Param) {
+  return *&Param;
+}
+
 } // end of anonymous namespace
 
 void ClFlags::getParsedClFlags(ClFlags &OutFlags) {
 #define X(Name, Type, ClType, ...) OutFlags.set##Name(toSetterParam(Name##Obj));
   COMMAND_LINE_FLAGS
 #undef X
 
   // If any value needs a non-trivial parsed value, set it below.
   OutFlags.setAllowExternDefinedSymbols(AllowExternDefinedSymbolsObj ||
                                         DisableInternalObj);
   OutFlags.setDisableHybridAssembly(DisableHybridAssemblyObj ||
                                     (OutFileTypeObj != Ice::FT_Iasm));
   OutFlags.ForceO2.init(OutFlags.getForceO2String());
   OutFlags.TestStatus.init(OutFlags.getTestStatusString());
   OutFlags.TimingFocus.init(OutFlags.getTimingFocusOnString());
   OutFlags.TranslateOnly.init(OutFlags.getTranslateOnlyString());
   OutFlags.VerboseFocus.init(OutFlags.getVerboseFocusOnString());
 }
 
 } // end of namespace Ice