diff -r d283aa33e131 -r 92717ce71105 components/llvm/patches/016-llvm-21851513-memory-corruption.patch
--- a/components/llvm/patches/016-llvm-21851513-memory-corruption.patch	Thu Jul 28 16:15:45 2016 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3107 +0,0 @@
-# 21851513 severe memory corruption in the LLVM command-line parsing module
-# 21870103 TableGen makes incorrect assumptions about anonymous namespace instantiation
-# 21870087 naming convention for the InputFile key is inconsistent across LLVM utilities
-# 21870099 128 bytes for a filesystem path is definitely not enough
-# clang makes incorrect assumptions about anonymous namespace instantiation order
-# For upstream - maybe.
---- include/llvm/Support/ThreadLocal.h	2014-12-14 17:04:45.000000000 -0800
-+++ include/llvm/Support/ThreadLocal.h	2015-09-16 14:08:58.000000000 -0700
-@@ -21,24 +21,22 @@
- namespace llvm {
-   namespace sys {
-     // ThreadLocalImpl - Common base class of all ThreadLocal instantiations.
-     // YOU SHOULD NEVER USE THIS DIRECTLY.
-     class ThreadLocalImpl {
-       typedef uint64_t ThreadLocalDataTy;
-       /// \brief Platform-specific thread local data.
-       ///
-       /// This is embedded in the class and we avoid malloc'ing/free'ing it,
-       /// to make this class more safe for use along with CrashRecoveryContext.
--      union {
--        char data[sizeof(ThreadLocalDataTy)];
--        ThreadLocalDataTy align_data;
--      };
-+      uint64_t data[2];
-+
-     public:
-       ThreadLocalImpl();
-       virtual ~ThreadLocalImpl();
-       void setInstance(const void* d);
-       void *getInstance();
-       void removeInstance();
-     };
- 
-     /// ThreadLocal - A class used to abstract thread-local storage.  It holds,
-     /// for each thread, a pointer a single object of type T.
---- lib/Support/MemoryBuffer.cpp	2014-12-12 14:27:53.000000000 -0800
-+++ lib/Support/MemoryBuffer.cpp	2015-09-19 14:20:06.472430028 -0700
-@@ -21,25 +21,29 @@
- #include "llvm/Support/Path.h"
- #include "llvm/Support/Process.h"
- #include "llvm/Support/Program.h"
- #include <cassert>
- #include <cerrno>
- #include <cstdio>
- #include <cstring>
- #include <new>
- #include <sys/types.h>
- #include <system_error>
-+
- #if !defined(_MSC_VER) && !defined(__MINGW32__)
- #include <unistd.h>
- #else
- #include <io.h>
- #endif
-+
-+#include <climits>
-+
- using namespace llvm;
- 
- //===----------------------------------------------------------------------===//
- // MemoryBuffer implementation itself.
- //===----------------------------------------------------------------------===//
- 
- MemoryBuffer::~MemoryBuffer() { }
- 
- /// init - Initialize this MemoryBuffer as a reference to externally allocated
- /// memory, memory that we know is already null terminated.
-@@ -63,21 +67,21 @@
- }
- 
- namespace {
- struct NamedBufferAlloc {
-   const Twine &Name;
-   NamedBufferAlloc(const Twine &Name) : Name(Name) {}
- };
- }
- 
- void *operator new(size_t N, const NamedBufferAlloc &Alloc) {
--  SmallString<256> NameBuf;
-+  SmallString<PATH_MAX> NameBuf;
-   StringRef NameRef = Alloc.Name.toStringRef(NameBuf);
- 
-   char *Mem = static_cast<char *>(operator new(N + NameRef.size() + 1));
-   CopyStringRef(Mem + N, NameRef);
-   return Mem;
- }
- 
- namespace {
- /// MemoryBufferMem - Named MemoryBuffer pointing to a block of memory.
- class MemoryBufferMem : public MemoryBuffer {
-@@ -156,21 +160,21 @@
- MemoryBuffer::getNewMemBuffer(size_t Size, StringRef BufferName) {
-   std::unique_ptr<MemoryBuffer> SB = getNewUninitMemBuffer(Size, BufferName);
-   if (!SB)
-     return nullptr;
-   memset(const_cast<char*>(SB->getBufferStart()), 0, Size);
-   return SB;
- }
- 
- ErrorOr<std::unique_ptr<MemoryBuffer>>
- MemoryBuffer::getFileOrSTDIN(const Twine &Filename, int64_t FileSize) {
--  SmallString<256> NameBuf;
-+  SmallString<PATH_MAX> NameBuf;
-   StringRef NameRef = Filename.toStringRef(NameBuf);
- 
-   if (NameRef == "-")
-     return getSTDIN();
-   return getFile(Filename, FileSize);
- }
- 
- ErrorOr<std::unique_ptr<MemoryBuffer>>
- MemoryBuffer::getFileSlice(const Twine &FilePath, uint64_t MapSize, 
-                            uint64_t Offset) {
---- lib/Support/Unix/Program.inc	2014-12-01 16:52:01.000000000 -0800
-+++ lib/Support/Unix/Program.inc	2015-09-19 15:34:57.144042911 -0700
-@@ -31,23 +31,20 @@
- #if HAVE_SIGNAL_H
- #include <signal.h>
- #endif
- #if HAVE_FCNTL_H
- #include <fcntl.h>
- #endif
- #if HAVE_UNISTD_H
- #include <unistd.h>
- #endif
- #ifdef HAVE_POSIX_SPAWN
--#ifdef __sun__
--#define  _RESTRICT_KYWD
--#endif
- #include <spawn.h>
- #if !defined(__APPLE__)
-   extern char **environ;
- #else
- #include <crt_externs.h> // _NSGetEnviron
- #endif
- #endif
- 
- namespace llvm {
- 
---- lib/TableGen/Main.cpp	2014-12-10 23:04:54.000000000 -0800
-+++ lib/TableGen/Main.cpp	2015-09-19 18:04:08.147911223 -0700
-@@ -21,97 +21,118 @@
- #include "llvm/Support/MemoryBuffer.h"
- #include "llvm/Support/ToolOutputFile.h"
- #include "llvm/TableGen/Error.h"
- #include "llvm/TableGen/Main.h"
- #include "llvm/TableGen/Record.h"
- #include <algorithm>
- #include <cstdio>
- #include <system_error>
- using namespace llvm;
- 
--namespace {
--  cl::opt<std::string>
--  OutputFilename("o", cl::desc("Output filename"), cl::value_desc("filename"),
--                 cl::init("-"));
--
--  cl::opt<std::string>
--  DependFilename("d",
--                 cl::desc("Dependency filename"),
--                 cl::value_desc("filename"),
--                 cl::init(""));
--
--  cl::opt<std::string>
--  InputFilename(cl::Positional, cl::desc("<input file>"), cl::init("-"));
--
--  cl::list<std::string>
--  IncludeDirs("I", cl::desc("Directory of include files"),
--              cl::value_desc("directory"), cl::Prefix);
--}
-+static cl::opt<std::string>
-+OutputFilename(cl::Prefix, "o",
-+               cl::desc("Output filename"),
-+               cl::value_desc("filename"),
-+               cl::NotHidden,
-+               cl::Optional,
-+               cl::init("-"),
-+               cl::ValueRequired);
-+
-+static cl::opt<std::string>
-+DependFilename(cl::Prefix, "d",
-+               cl::desc("Dependency filename"),
-+               cl::value_desc("filename"),
-+               cl::NotHidden,
-+               cl::Optional,
-+               cl::init(""),
-+               cl::ValueRequired);
-+
-+static cl::opt<std::string>
-+InputFilename(cl::Positional, "<input file>",
-+              cl::desc("<input file>"),
-+              cl::value_desc("Input filename"),
-+              cl::NotHidden,
-+              cl::Optional,
-+              cl::init("-"),
-+              cl::ValuePositionalNoArgs);
-+
-+static cl::list<std::string>
-+IncludeDirs(cl::Prefix, "I",
-+            cl::desc("Directory of include files"),
-+            cl::value_desc("directory"),
-+            cl::NotHidden,
-+            cl::ZeroOrMore,
-+            cl::ValueRequired);
- 
- /// \brief Create a dependency file for `-d` option.
- ///
- /// This functionality is really only for the benefit of the build system.
- /// It is similar to GCC's `-M*` family of options.
- static int createDependencyFile(const TGParser &Parser, const char *argv0) {
-   if (OutputFilename == "-") {
-     errs() << argv0 << ": the option -d must be used together with -o\n";
-     return 1;
-   }
-   std::error_code EC;
-   tool_output_file DepOut(DependFilename, EC, sys::fs::F_Text);
-   if (EC) {
-     errs() << argv0 << ": error opening " << DependFilename << ":"
-            << EC.message() << "\n";
-     return 1;
-   }
-+
-   DepOut.os() << OutputFilename << ":";
-+
-   for (const auto &Dep : Parser.getDependencies()) {
-     DepOut.os() << ' ' << Dep.first;
-   }
-   DepOut.os() << "\n";
-   DepOut.keep();
-   return 0;
- }
- 
- namespace llvm {
- 
- int TableGenMain(char *argv0, TableGenMainFn *MainFn) {
-   RecordKeeper Records;
- 
-   // Parse the input file.
-+  llvm::Twine TFN(InputFilename);
-   ErrorOr<std::unique_ptr<MemoryBuffer>> FileOrErr =
--      MemoryBuffer::getFileOrSTDIN(InputFilename);
-+      MemoryBuffer::getFileOrSTDIN(TFN);
-+
-   if (std::error_code EC = FileOrErr.getError()) {
-     errs() << "Could not open input file '" << InputFilename
--           << "': " << EC.message() << "\n";
-+      << "': " << EC.message() << "\n";
-     return 1;
-   }
- 
-   // Tell SrcMgr about this buffer, which is what TGParser will pick up.
-   SrcMgr.AddNewSourceBuffer(std::move(*FileOrErr), SMLoc());
- 
-   // Record the location of the include directory so that the lexer can find
-   // it later.
--  SrcMgr.setIncludeDirs(IncludeDirs);
-+  SrcMgr.setIncludeDirs(IncludeDirs.getStorage());
- 
-   TGParser Parser(SrcMgr, Records);
- 
-   if (Parser.ParseFile())
-     return 1;
- 
-   std::error_code EC;
-   tool_output_file Out(OutputFilename, EC, sys::fs::F_Text);
-   if (EC) {
-     errs() << argv0 << ": error opening " << OutputFilename << ":"
-            << EC.message() << "\n";
-     return 1;
-   }
-+
-   if (!DependFilename.empty()) {
-     if (int Ret = createDependencyFile(Parser, argv0))
-       return Ret;
-   }
- 
-   if (MainFn(Out.os(), Records))
-     return 1;
- 
-   if (ErrorsPrinted > 0) {
-     errs() << argv0 << ": " << ErrorsPrinted << " errors.\n";
---- utils/TableGen/TableGen.cpp	2014-12-10 23:04:54.000000000 -0800
-+++ utils/TableGen/TableGen.cpp	2015-09-14 16:23:45.000000000 -0700
-@@ -37,67 +37,67 @@
-   GenFastISel,
-   GenSubtarget,
-   GenIntrinsic,
-   GenTgtIntrinsic,
-   PrintEnums,
-   PrintSets,
-   GenOptParserDefs,
-   GenCTags
- };
- 
--namespace {
--  cl::opt<ActionType>
--  Action(cl::desc("Action to perform:"),
--         cl::values(clEnumValN(PrintRecords, "print-records",
--                               "Print all records to stdout (default)"),
--                    clEnumValN(GenEmitter, "gen-emitter",
--                               "Generate machine code emitter"),
--                    clEnumValN(GenRegisterInfo, "gen-register-info",
--                               "Generate registers and register classes info"),
--                    clEnumValN(GenInstrInfo, "gen-instr-info",
--                               "Generate instruction descriptions"),
--                    clEnumValN(GenCallingConv, "gen-callingconv",
--                               "Generate calling convention descriptions"),
--                    clEnumValN(GenAsmWriter, "gen-asm-writer",
--                               "Generate assembly writer"),
--                    clEnumValN(GenDisassembler, "gen-disassembler",
--                               "Generate disassembler"),
--                    clEnumValN(GenPseudoLowering, "gen-pseudo-lowering",
--                               "Generate pseudo instruction lowering"),
--                    clEnumValN(GenAsmMatcher, "gen-asm-matcher",
--                               "Generate assembly instruction matcher"),
--                    clEnumValN(GenDAGISel, "gen-dag-isel",
--                               "Generate a DAG instruction selector"),
--                    clEnumValN(GenDFAPacketizer, "gen-dfa-packetizer",
--                               "Generate DFA Packetizer for VLIW targets"),
--                    clEnumValN(GenFastISel, "gen-fast-isel",
--                               "Generate a \"fast\" instruction selector"),
--                    clEnumValN(GenSubtarget, "gen-subtarget",
--                               "Generate subtarget enumerations"),
--                    clEnumValN(GenIntrinsic, "gen-intrinsic",
--                               "Generate intrinsic information"),
--                    clEnumValN(GenTgtIntrinsic, "gen-tgt-intrinsic",
--                               "Generate target intrinsic information"),
--                    clEnumValN(PrintEnums, "print-enums",
--                               "Print enum values for a class"),
--                    clEnumValN(PrintSets, "print-sets",
--                               "Print expanded sets for testing DAG exprs"),
--                    clEnumValN(GenOptParserDefs, "gen-opt-parser-defs",
--                               "Generate option definitions"),
--                    clEnumValN(GenCTags, "gen-ctags",
--                               "Generate ctags-compatible index"),
--                    clEnumValEnd));
-+static cl::opt<ActionType>
-+Action(cl::desc("Action to perform:"),
-+       cl::values(clEnumValN(PrintRecords, "print-records",
-+                             "Print all records to stdout (default)"),
-+                  clEnumValN(GenEmitter, "gen-emitter",
-+                             "Generate machine code emitter"),
-+                  clEnumValN(GenRegisterInfo, "gen-register-info",
-+                             "Generate registers and register classes info"),
-+                  clEnumValN(GenInstrInfo, "gen-instr-info",
-+                             "Generate instruction descriptions"),
-+                  clEnumValN(GenCallingConv, "gen-callingconv",
-+                             "Generate calling convention descriptions"),
-+                  clEnumValN(GenAsmWriter, "gen-asm-writer",
-+                             "Generate assembly writer"),
-+                  clEnumValN(GenDisassembler, "gen-disassembler",
-+                             "Generate disassembler"),
-+                  clEnumValN(GenPseudoLowering, "gen-pseudo-lowering",
-+                             "Generate pseudo instruction lowering"),
-+                  clEnumValN(GenAsmMatcher, "gen-asm-matcher",
-+                             "Generate assembly instruction matcher"),
-+                  clEnumValN(GenDAGISel, "gen-dag-isel",
-+                             "Generate a DAG instruction selector"),
-+                  clEnumValN(GenDFAPacketizer, "gen-dfa-packetizer",
-+                             "Generate DFA Packetizer for VLIW targets"),
-+                  clEnumValN(GenFastISel, "gen-fast-isel",
-+                             "Generate a \"fast\" instruction selector"),
-+                  clEnumValN(GenSubtarget, "gen-subtarget",
-+                             "Generate subtarget enumerations"),
-+                  clEnumValN(GenIntrinsic, "gen-intrinsic",
-+                             "Generate intrinsic information"),
-+                  clEnumValN(GenTgtIntrinsic, "gen-tgt-intrinsic",
-+                             "Generate target intrinsic information"),
-+                  clEnumValN(PrintEnums, "print-enums",
-+                             "Print enum values for a class"),
-+                  clEnumValN(PrintSets, "print-sets",
-+                             "Print expanded sets for testing DAG exprs"),
-+                  clEnumValN(GenOptParserDefs, "gen-opt-parser-defs",
-+                             "Generate option definitions"),
-+                  clEnumValN(GenCTags, "gen-ctags",
-+                             "Generate ctags-compatible index"),
-+                  clEnumValEnd));
- 
--  cl::opt<std::string>
--  Class("class", cl::desc("Print Enum list for this class"),
--          cl::value_desc("class name"));
-+static cl::opt<std::string>
-+Class("class", cl::desc("Print Enum list for this class"),
-+      cl::value_desc("class name"));
- 
-+namespace {
- bool LLVMTableGenMain(raw_ostream &OS, RecordKeeper &Records) {
-   switch (Action) {
-   case PrintRecords:
-     OS << Records;           // No argument, dump all contents
-     break;
-   case GenEmitter:
-     EmitCodeEmitter(Records, OS);
-     break;
-   case GenRegisterInfo:
-     EmitRegisterInfo(Records, OS);
---- tools/clang/utils/TableGen/TableGen.cpp	2015-09-19 19:30:26.983452195 -0700
-+++ tools/clang/utils/TableGen/TableGen.cpp	2015-09-19 23:12:38.299907988 -0700
-@@ -48,101 +48,99 @@
-   GenClangCommentHTMLTagsProperties,
-   GenClangCommentHTMLNamedCharacterReferences,
-   GenClangCommentCommandInfo,
-   GenClangCommentCommandList,
-   GenArmNeon,
-   GenArmNeonSema,
-   GenArmNeonTest,
-   GenAttrDocs
- };
- 
--namespace {
--cl::opt<ActionType> Action(
--    cl::desc("Action to perform:"),
--    cl::values(
--        clEnumValN(GenClangAttrClasses, "gen-clang-attr-classes",
--                   "Generate clang attribute clases"),
--        clEnumValN(GenClangAttrParserStringSwitches,
--                   "gen-clang-attr-parser-string-switches",
--                   "Generate all parser-related attribute string switches"),
--        clEnumValN(GenClangAttrImpl, "gen-clang-attr-impl",
--                   "Generate clang attribute implementations"),
--        clEnumValN(GenClangAttrList, "gen-clang-attr-list",
--                   "Generate a clang attribute list"),
--        clEnumValN(GenClangAttrPCHRead, "gen-clang-attr-pch-read",
--                   "Generate clang PCH attribute reader"),
--        clEnumValN(GenClangAttrPCHWrite, "gen-clang-attr-pch-write",
--                   "Generate clang PCH attribute writer"),
--        clEnumValN(GenClangAttrHasAttributeImpl,
--                   "gen-clang-attr-has-attribute-impl",
--                   "Generate a clang attribute spelling list"),
--        clEnumValN(GenClangAttrSpellingListIndex,
--                   "gen-clang-attr-spelling-index",
--                   "Generate a clang attribute spelling index"),
--        clEnumValN(GenClangAttrASTVisitor,
--                   "gen-clang-attr-ast-visitor",
--                   "Generate a recursive AST visitor for clang attributes"),
--        clEnumValN(GenClangAttrTemplateInstantiate,
--                   "gen-clang-attr-template-instantiate",
--                   "Generate a clang template instantiate code"),
--        clEnumValN(GenClangAttrParsedAttrList,
--                   "gen-clang-attr-parsed-attr-list",
--                   "Generate a clang parsed attribute list"),
--        clEnumValN(GenClangAttrParsedAttrImpl,
--                   "gen-clang-attr-parsed-attr-impl",
--                   "Generate the clang parsed attribute helpers"),
--        clEnumValN(GenClangAttrParsedAttrKinds,
--                   "gen-clang-attr-parsed-attr-kinds",
--                   "Generate a clang parsed attribute kinds"),
--        clEnumValN(GenClangAttrDump, "gen-clang-attr-dump",
--                   "Generate clang attribute dumper"),
--        clEnumValN(GenClangDiagsDefs, "gen-clang-diags-defs",
--                   "Generate Clang diagnostics definitions"),
--        clEnumValN(GenClangDiagGroups, "gen-clang-diag-groups",
--                   "Generate Clang diagnostic groups"),
--        clEnumValN(GenClangDiagsIndexName, "gen-clang-diags-index-name",
--                   "Generate Clang diagnostic name index"),
--        clEnumValN(GenClangCommentNodes, "gen-clang-comment-nodes",
--                   "Generate Clang AST comment nodes"),
--        clEnumValN(GenClangDeclNodes, "gen-clang-decl-nodes",
--                   "Generate Clang AST declaration nodes"),
--        clEnumValN(GenClangStmtNodes, "gen-clang-stmt-nodes",
--                   "Generate Clang AST statement nodes"),
--        clEnumValN(GenClangSACheckers, "gen-clang-sa-checkers",
--                   "Generate Clang Static Analyzer checkers"),
--        clEnumValN(GenClangCommentHTMLTags, "gen-clang-comment-html-tags",
--                   "Generate efficient matchers for HTML tag "
--                   "names that are used in documentation comments"),
--        clEnumValN(GenClangCommentHTMLTagsProperties,
--                   "gen-clang-comment-html-tags-properties",
--                   "Generate efficient matchers for HTML tag "
--                   "properties"),
--        clEnumValN(GenClangCommentHTMLNamedCharacterReferences,
--                   "gen-clang-comment-html-named-character-references",
--                   "Generate function to translate named character "
--                   "references to UTF-8 sequences"),
--        clEnumValN(GenClangCommentCommandInfo, "gen-clang-comment-command-info",
--                   "Generate command properties for commands that "
--                   "are used in documentation comments"),
--        clEnumValN(GenClangCommentCommandList, "gen-clang-comment-command-list",
--                   "Generate list of commands that are used in "
--                   "documentation comments"),
--        clEnumValN(GenArmNeon, "gen-arm-neon", "Generate arm_neon.h for clang"),
--        clEnumValN(GenArmNeonSema, "gen-arm-neon-sema",
--                   "Generate ARM NEON sema support for clang"),
--        clEnumValN(GenArmNeonTest, "gen-arm-neon-test",
--                   "Generate ARM NEON tests for clang"),
--        clEnumValN(GenAttrDocs, "gen-attr-docs",
--                   "Generate attribute documentation"),
--        clEnumValEnd));
-+static cl::opt<ActionType>
-+Action(cl::desc("Action to perform:"),
-+       cl::values(clEnumValN(GenClangAttrClasses, "gen-clang-attr-classes",
-+                             "Generate clang attribute clases"),
-+                  clEnumValN(GenClangAttrParserStringSwitches,
-+                             "gen-clang-attr-parser-string-switches",
-+                             "Generate all parser-related attribute string switches"),
-+                  clEnumValN(GenClangAttrImpl, "gen-clang-attr-impl",
-+                             "Generate clang attribute implementations"),
-+                  clEnumValN(GenClangAttrList, "gen-clang-attr-list",
-+                             "Generate a clang attribute list"),
-+                  clEnumValN(GenClangAttrPCHRead, "gen-clang-attr-pch-read",
-+                             "Generate clang PCH attribute reader"),
-+                  clEnumValN(GenClangAttrPCHWrite, "gen-clang-attr-pch-write",
-+                             "Generate clang PCH attribute writer"),
-+                  clEnumValN(GenClangAttrHasAttributeImpl,
-+                             "gen-clang-attr-has-attribute-impl",
-+                             "Generate a clang attribute spelling list"),
-+                  clEnumValN(GenClangAttrSpellingListIndex,
-+                             "gen-clang-attr-spelling-index",
-+                             "Generate a clang attribute spelling index"),
-+                  clEnumValN(GenClangAttrASTVisitor,
-+                             "gen-clang-attr-ast-visitor",
-+                             "Generate a recursive AST visitor for clang attributes"),
-+                  clEnumValN(GenClangAttrTemplateInstantiate,
-+                             "gen-clang-attr-template-instantiate",
-+                             "Generate a clang template instantiate code"),
-+                  clEnumValN(GenClangAttrParsedAttrList,
-+                             "gen-clang-attr-parsed-attr-list",
-+                             "Generate a clang parsed attribute list"),
-+                  clEnumValN(GenClangAttrParsedAttrImpl,
-+                             "gen-clang-attr-parsed-attr-impl",
-+                             "Generate the clang parsed attribute helpers"),
-+                  clEnumValN(GenClangAttrParsedAttrKinds,
-+                             "gen-clang-attr-parsed-attr-kinds",
-+                             "Generate a clang parsed attribute kinds"),
-+                  clEnumValN(GenClangAttrDump, "gen-clang-attr-dump",
-+                             "Generate clang attribute dumper"),
-+                  clEnumValN(GenClangDiagsDefs, "gen-clang-diags-defs",
-+                             "Generate Clang diagnostics definitions"),
-+                  clEnumValN(GenClangDiagGroups, "gen-clang-diag-groups",
-+                             "Generate Clang diagnostic groups"),
-+                  clEnumValN(GenClangDiagsIndexName, "gen-clang-diags-index-name",
-+                             "Generate Clang diagnostic name index"),
-+                  clEnumValN(GenClangCommentNodes, "gen-clang-comment-nodes",
-+                             "Generate Clang AST comment nodes"),
-+                  clEnumValN(GenClangDeclNodes, "gen-clang-decl-nodes",
-+                             "Generate Clang AST declaration nodes"),
-+                  clEnumValN(GenClangStmtNodes, "gen-clang-stmt-nodes",
-+                             "Generate Clang AST statement nodes"),
-+                  clEnumValN(GenClangSACheckers, "gen-clang-sa-checkers",
-+                             "Generate Clang Static Analyzer checkers"),
-+                  clEnumValN(GenClangCommentHTMLTags, "gen-clang-comment-html-tags",
-+                             "Generate efficient matchers for HTML tag "
-+                             "names that are used in documentation comments"),
-+                  clEnumValN(GenClangCommentHTMLTagsProperties,
-+                             "gen-clang-comment-html-tags-properties",
-+                             "Generate efficient matchers for HTML tag "
-+                             "properties"),
-+                  clEnumValN(GenClangCommentHTMLNamedCharacterReferences,
-+                             "gen-clang-comment-html-named-character-references",
-+                             "Generate function to translate named character "
-+                             "references to UTF-8 sequences"),
-+                  clEnumValN(GenClangCommentCommandInfo, "gen-clang-comment-command-info",
-+                             "Generate command properties for commands that "
-+                             "are used in documentation comments"),
-+                  clEnumValN(GenClangCommentCommandList, "gen-clang-comment-command-list",
-+                             "Generate list of commands that are used in "
-+                             "documentation comments"),
-+                  clEnumValN(GenArmNeon, "gen-arm-neon", "Generate arm_neon.h for clang"),
-+                  clEnumValN(GenArmNeonSema, "gen-arm-neon-sema",
-+                             "Generate ARM NEON sema support for clang"),
-+                  clEnumValN(GenArmNeonTest, "gen-arm-neon-test",
-+                             "Generate ARM NEON tests for clang"),
-+                  clEnumValN(GenAttrDocs, "gen-attr-docs",
-+                             "Generate attribute documentation"),
-+                  clEnumValEnd));
- 
--cl::opt<std::string>
-+static cl::opt<std::string>
- ClangComponent("clang-component",
-                cl::desc("Only use warnings from specified component"),
-                cl::value_desc("component"), cl::Hidden);
- 
- bool ClangTableGenMain(raw_ostream &OS, RecordKeeper &Records) {
-   switch (Action) {
-   case GenClangAttrClasses:
-     EmitClangAttrClass(Records, OS);
-     break;
-   case GenClangAttrParserStringSwitches:
-@@ -230,21 +228,20 @@
-   case GenArmNeonTest:
-     EmitNeonTest(Records, OS);
-     break;
-   case GenAttrDocs:
-     EmitClangAttrDocs(Records, OS);
-     break;
-   }
- 
-   return false;
- }
--}
- 
- int main(int argc, char **argv) {
-   sys::PrintStackTraceOnErrorSignal();
-   PrettyStackTraceProgram X(argc, argv);
-   cl::ParseCommandLineOptions(argc, argv);
- 
-   return TableGenMain(argv[0], &ClangTableGenMain);
- }
- 
- #ifdef __has_feature
---- lib/IR/LegacyPassManager.cpp	2015-01-28 09:39:35.000000000 -0800
-+++ lib/IR/LegacyPassManager.cpp	2015-10-05 11:01:32.789436446 -0700
-@@ -40,15 +40,18 @@
- // pass name to be printed before it executes.
- //
- 
--namespace {
- // Different debug levels that can be enabled...
- enum PassDebugLevel {
--  Disabled, Arguments, Structure, Executions, Details
-+  Disabled,
-+  Arguments,
-+  Structure,
-+  Executions,
-+  Details
- };
--}
- 
- static cl::opt<enum PassDebugLevel>
--PassDebugging("debug-pass", cl::Hidden,
-+PassDebugging("debug-pass",
-+              cl::Hidden,
-                   cl::desc("Print PassManager debugging information"),
-                   cl::values(
-   clEnumVal(Disabled  , "disable debug output"),
-@@ -58,36 +61,44 @@
-   clEnumVal(Details   , "print pass details when it is executed"),
-                              clEnumValEnd));
- 
--namespace {
--typedef llvm::cl::list<const llvm::PassInfo *, bool, PassNameParser>
--PassOptionList;
--}
--
- // Print IR out before/after specified passes.
--static PassOptionList
--PrintBefore("print-before",
--            llvm::cl::desc("Print IR before specified passes"),
--            cl::Hidden);
--
--static PassOptionList
--PrintAfter("print-after",
--           llvm::cl::desc("Print IR after specified passes"),
--           cl::Hidden);
-+static llvm::cl::list<const llvm::PassInfo *, bool, PassNameParser>
-+PrintBefore(cl::Prefix, "print-before",
-+            cl::desc("Print IR before specified passes"),
-+            cl::value_desc("Print IR before specified passes"),
-+            cl::Hidden,
-+            cl::ZeroOrMore);
-+
-+static llvm::cl::list<const llvm::PassInfo *, bool, PassNameParser>
-+PrintAfter(cl::Prefix, "print-after",
-+           cl::desc("Print IR after specified passes"),
-+           cl::value_desc("Print IR after specified passes"),
-+           cl::Hidden,
-+           cl::ZeroOrMore);
- 
- static cl::opt<bool>
--PrintBeforeAll("print-before-all",
-+PrintBeforeAll(cl::NormalFormatting, "print-before-all",
-                llvm::cl::desc("Print IR before each pass"),
-+               llvm::cl::value_desc("Print IR before each pass"),
-+               cl::Hidden,
-+               cl::Optional,
-                cl::init(false));
-+
- static cl::opt<bool>
--PrintAfterAll("print-after-all",
-+PrintAfterAll(cl::NormalFormatting, "print-after-all",
-               llvm::cl::desc("Print IR after each pass"),
-+              llvm::cl::value_desc("Print IR after each pass"),
-+              cl::Hidden,
-+              cl::Optional,
-               cl::init(false));
- 
- /// This is a helper to determine whether to print IR before or
- /// after a pass.
- 
--static bool ShouldPrintBeforeOrAfterPass(const PassInfo *PI,
--                                         PassOptionList &PassesToPrint) {
-+static bool
-+ShouldPrintBeforeOrAfterPass(const PassInfo *PI,
-+                             llvm::cl::list<const llvm::PassInfo *, bool,
-+                                            PassNameParser> &PassesToPrint) {
-   for (unsigned i = 0, ie = PassesToPrint.size(); i < ie; ++i) {
-     const llvm::PassInfo *PassInf = PassesToPrint[i];
-     if (PassInf)
---- lib/Support/CommandLine.cpp	2015-01-13 11:14:20.000000000 -0800
-+++ lib/Support/CommandLine.cpp	2016-01-19 10:13:33.212967353 -0800
-@@ -41,6 +41,8 @@
- 
- #define DEBUG_TYPE "commandline"
- 
-+#include <iostream>
-+
- //===----------------------------------------------------------------------===//
- // Template instantiations and anchors.
- //
-@@ -85,7 +87,7 @@
- 
- // Globals for name and overview of program.  Program name is not a string to
- // avoid static ctor/dtor issues.
--static char ProgramName[80] = "<premain>";
-+static std::string ProgramName("<premain>");
- static const char *ProgramOverview = nullptr;
- 
- // This collects additional help to be printed.
-@@ -102,14 +104,14 @@
- 
- /// RegisteredOptionList - This is the list of the command line options that
- /// have statically constructed themselves.
--static Option *RegisteredOptionList = nullptr;
-+Option *Option::RegisteredOptionList = nullptr;
- 
- void Option::addArgument() {
-   assert(!NextRegistered && "argument multiply registered!");
-+  Option *O = dynamic_cast<Option*>(this);
-+  assert(O && "Cannot dynamic_cast to correct type!");
- 
--  NextRegistered = RegisteredOptionList;
--  RegisteredOptionList = this;
--  MarkOptionsChanged();
-+  Option::registerOption(O);
- }
- 
- void Option::removeArgument() {
-@@ -149,24 +151,26 @@
- 
- /// GetOptionInfo - Scan the list of registered options, turning them into data
- /// structures that are easier to handle.
--static void GetOptionInfo(SmallVectorImpl<Option *> &PositionalOpts,
--                          SmallVectorImpl<Option *> &SinkOpts,
-+static void GetOptionInfo(std::vector<Option *> &PositionalOpts,
-+                          std::vector<Option *> &SinkOpts,
-                           StringMap<Option *> &OptionsMap) {
-   bool HadErrors = false;
--  SmallVector<const char *, 16> OptionNames;
-+  std::vector<const char *> OptionNames;
-   Option *CAOpt = nullptr; // The ConsumeAfter option if it exists.
--  for (Option *O = RegisteredOptionList; O; O = O->getNextRegisteredOption()) {
-+  for (Option *O = Option::getRegisteredOptionList(); O;
-+       O = O->getNextRegisteredOption()) {
-     // If this option wants to handle multiple option names, get the full set.
-     // This handles enum options like "-O1 -O2" etc.
-     O->getExtraOptionNames(OptionNames);
--    if (O->ArgStr[0])
-+
-+    if (O->ArgStr && *O->ArgStr)
-       OptionNames.push_back(O->ArgStr);
- 
-     // Handle named options.
-     for (size_t i = 0, e = OptionNames.size(); i != e; ++i) {
-       // Add argument to the argument map!
-       if (!OptionsMap.insert(std::make_pair(OptionNames[i], O)).second) {
--        errs() << ProgramName << ": CommandLine Error: Option '"
-+        errs() << ProgramName.c_str() << ": CommandLine Error: Option '"
-                << OptionNames[i] << "' registered more than once!\n";
-         HadErrors = true;
-       }
-@@ -201,6 +205,24 @@
-     report_fatal_error("inconsistency in registered CommandLine options");
- }
- 
-+/// HandleSpecialPrefixOptions - certain options need special handling
-+/// of their Argyment/Value pair, because there will be no space separator
-+/// between the two. For example -O<N> (optimization level).
-+static void HandleSpecialPrefixOptions(StringRef &ArgName, StringRef &Value) {
-+  if (ArgName.empty())
-+    return;
-+
-+  char AN = ArgName.front();
-+  switch (AN) {
-+  default:
-+    break;
-+  case 'O':
-+    Value = ArgName.substr(1, 1);
-+    ArgName = ArgName.substr(0, 1);
-+    break;
-+  }
-+}
-+
- /// LookupOption - Lookup the option specified by the specified option on the
- /// command line.  If there is a value specified (after an equal sign) return
- /// that as well.  This assumes that leading dashes have already been stripped.
-@@ -210,12 +232,35 @@
-   if (Arg.empty())
-     return nullptr;
- 
-+  HandleSpecialPrefixOptions(Arg, Value);
-+
-   size_t EqualPos = Arg.find('=');
- 
-   // If we have an equals sign, remember the value.
-   if (EqualPos == StringRef::npos) {
-+    StringRef InputFile;
-+
-     // Look up the option.
-     StringMap<Option *>::const_iterator I = OptionsMap.find(Arg);
-+
-+    // TableGen
-+    if (I == OptionsMap.end()) {
-+      InputFile = "<input file>";
-+      I = OptionsMap.find(InputFile);
-+    }
-+
-+    // lli && llc
-+    if (I == OptionsMap.end()) {
-+      InputFile = "<input bitcode>";
-+      I = OptionsMap.find(InputFile);
-+    }
-+
-+    // opt
-+    if (I == OptionsMap.end()) {
-+      InputFile = "<input bitcode file>";
-+      I = OptionsMap.find(InputFile);
-+    }
-+
-     return I != OptionsMap.end() ? I->second : nullptr;
-   }
- 
-@@ -254,7 +299,7 @@
-                                            ie = OptionsMap.end();
-        it != ie; ++it) {
-     Option *O = it->second;
--    SmallVector<const char *, 16> OptionNames;
-+    std::vector<const char *> OptionNames;
-     O->getExtraOptionNames(OptionNames);
-     if (O->ArgStr[0])
-       OptionNames.push_back(O->ArgStr);
-@@ -322,9 +367,11 @@
-   // Enforce value requirements
-   switch (Handler->getValueExpectedFlag()) {
-   case ValueRequired:
--    if (!Value.data()) { // No value specified?
-+    if (Value.empty()) { // No value specified?
-       if (i + 1 >= argc)
--        return Handler->error("requires a value!");
-+        return
-+          Handler->error("argument requires a value but none was provided!");
-+
-       // Steal the next argument, like for '-o filename'
-       assert(argv && "null check");
-       Value = argv[++i];
-@@ -335,11 +382,17 @@
-       return Handler->error("multi-valued option specified"
-                             " with ValueDisallowed modifier!");
- 
--    if (Value.data())
-+    if (!Value.empty())
-       return Handler->error("does not allow a value! '" + Twine(Value) +
-                             "' specified.");
-     break;
-   case ValueOptional:
-+  case ValuePositionalNoArgs:
-+    break;
-+  case ValuePositionalWithArgs:
-+    break;
-+  default:
-+    return Handler->error("Unknown/invalid Option type!");
-     break;
-   }
- 
-@@ -373,7 +426,15 @@
- 
- static bool ProvidePositionalOption(Option *Handler, StringRef Arg, int i) {
-   int Dummy = i;
--  return ProvideOption(Handler, Handler->ArgStr, Arg, 0, nullptr, Dummy);
-+  bool R = ProvideOption(Handler, Handler->ArgStr, Arg, 0, nullptr, Dummy);
-+  return R;
-+}
-+
-+static bool ProvidePositionalOptionWithArgs(Option *Handler, StringRef Arg,
-+                                            int i, unsigned &ValNo,
-+                                            unsigned &NumPositionsRequired) {
-+  // FIXME: IMPLEMENT
-+  return false;
- }
- 
- // Option predicates...
-@@ -416,7 +477,7 @@
- /// see if this is a prefix or grouped option.  If so, split arg into output an
- /// Arg/Value pair and return the Option to parse it with.
- static Option *
--HandlePrefixedOrGroupedOption(StringRef &Arg, StringRef &Value,
-+HandlePrefixedOrGroupedOption(std::string &Arg, std::string &Value,
-                               bool &ErrorParsing,
-                               const StringMap<Option *> &OptionsMap) {
-   if (Arg.size() == 1)
-@@ -465,7 +526,10 @@
- 
- static bool RequiresValue(const Option *O) {
-   return O->getNumOccurrencesFlag() == cl::Required ||
--         O->getNumOccurrencesFlag() == cl::OneOrMore;
-+         O->getNumOccurrencesFlag() == cl::OneOrMore ||
-+         O->getValueExpectedFlag() == cl::ValueRequired ||
-+         O->getValueExpectedFlag() == cl::ValuePositionalNoArgs ||
-+         O->getValueExpectedFlag() == cl::ValuePositionalWithArgs;
- }
- 
- static bool EatsUnboundedNumberOfValues(const Option *O) {
-@@ -480,9 +544,9 @@
- static bool isGNUSpecial(char C) { return strchr("\\\"\' ", C); }
- 
- void cl::TokenizeGNUCommandLine(StringRef Src, StringSaver &Saver,
--                                SmallVectorImpl<const char *> &NewArgv,
-+                                std::vector<const char *> &NewArgv,
-                                 bool MarkEOLs) {
--  SmallString<128> Token;
-+  SmallString<PATH_MAX> Token;
-   for (size_t I = 0, E = Src.size(); I != E; ++I) {
-     // Consume runs of whitespace.
-     if (Token.empty()) {
-@@ -556,7 +620,7 @@
- ///    consumed in this case.
- ///
- ///  * Otherwise, backslashes are interpreted literally.
--static size_t parseBackslash(StringRef Src, size_t I, SmallString<128> &Token) {
-+static size_t parseBackslash(StringRef Src, size_t I, SmallString<256> &Token) {
-   size_t E = Src.size();
-   int BackslashCount = 0;
-   // Skip the backslashes.
-@@ -578,9 +642,9 @@
- }
- 
- void cl::TokenizeWindowsCommandLine(StringRef Src, StringSaver &Saver,
--                                    SmallVectorImpl<const char *> &NewArgv,
-+                                    std::vector<const char *> &NewArgv,
-                                     bool MarkEOLs) {
--  SmallString<128> Token;
-+  SmallString<256> Token;
- 
-   // This is a small state machine to consume characters until it reaches the
-   // end of the source string.
-@@ -657,7 +721,7 @@
- 
- static bool ExpandResponseFile(const char *FName, StringSaver &Saver,
-                                TokenizerCallback Tokenizer,
--                               SmallVectorImpl<const char *> &NewArgv,
-+                               std::vector<const char *> &NewArgv,
-                                bool MarkEOLs = false) {
-   ErrorOr<std::unique_ptr<MemoryBuffer>> MemBufOrErr =
-       MemoryBuffer::getFile(FName);
-@@ -684,7 +748,7 @@
- /// \brief Expand response files on a command line recursively using the given
- /// StringSaver and tokenization strategy.
- bool cl::ExpandResponseFiles(StringSaver &Saver, TokenizerCallback Tokenizer,
--                             SmallVectorImpl<const char *> &Argv,
-+                             std::vector<const char *> &Argv,
-                              bool MarkEOLs) {
-   unsigned RspFiles = 0;
-   bool AllExpanded = true;
-@@ -711,7 +775,7 @@
-     // contents.  Nested response files are expanded in subsequent iterations.
-     // FIXME: If a nested response file uses a relative path, is it relative to
-     // the cwd of the process or the response file?
--    SmallVector<const char *, 0> ExpandedArgv;
-+    std::vector<const char *> ExpandedArgv;
-     if (!ExpandResponseFile(Arg + 1, Saver, Tokenizer, ExpandedArgv,
-                             MarkEOLs)) {
-       // We couldn't read this file, so we leave it in the argument stream and
-@@ -764,7 +828,7 @@
- 
-   // Get program's "name", which we wouldn't know without the caller
-   // telling us.
--  SmallVector<const char *, 20> newArgv;
-+  std::vector<const char *> newArgv;
-   StrDupSaver Saver;
-   newArgv.push_back(Saver.SaveString(progName));
- 
-@@ -778,27 +842,25 @@
- void cl::ParseCommandLineOptions(int argc, const char *const *argv,
-                                  const char *Overview) {
-   // Process all registered options.
--  SmallVector<Option *, 4> PositionalOpts;
--  SmallVector<Option *, 4> SinkOpts;
-+  std::vector<Option*> PositionalOpts;
-+  std::vector<Option*> SinkOpts;
-   StringMap<Option *> Opts;
-   GetOptionInfo(PositionalOpts, SinkOpts, Opts);
- 
-   assert((!Opts.empty() || !PositionalOpts.empty()) && "No options specified!");
- 
-   // Expand response files.
--  SmallVector<const char *, 20> newArgv;
-+  std::vector<const char*> newArgv;
-+
-   for (int i = 0; i != argc; ++i)
-     newArgv.push_back(argv[i]);
-+
-   StrDupSaver Saver;
-   ExpandResponseFiles(Saver, TokenizeGNUCommandLine, newArgv);
-   argv = &newArgv[0];
-   argc = static_cast<int>(newArgv.size());
- 
--  // Copy the program name into ProgName, making sure not to overflow it.
--  StringRef ProgName = sys::path::filename(argv[0]);
--  size_t Len = std::min(ProgName.size(), size_t(79));
--  memcpy(ProgramName, ProgName.data(), Len);
--  ProgramName[Len] = '\0';
-+  ProgramName = sys::path::filename(argv[0]).str();
- 
-   ProgramOverview = Overview;
-   bool ErrorParsing = false;
-@@ -810,6 +872,7 @@
-   bool HasUnlimitedPositionals = false;
- 
-   Option *ConsumeAfterOpt = nullptr;
-+
-   if (!PositionalOpts.empty()) {
-     if (PositionalOpts[0]->getNumOccurrencesFlag() == cl::ConsumeAfter) {
-       assert(PositionalOpts.size() > 1 &&
-@@ -819,8 +882,7 @@
- 
-     // Calculate how many positional values are _required_.
-     bool UnboundedFound = false;
--    for (size_t i = ConsumeAfterOpt ? 1 : 0, e = PositionalOpts.size(); i != e;
--         ++i) {
-+    for (size_t i = 0, e = PositionalOpts.size(); i != e; ++i) {
-       Option *Opt = PositionalOpts[i];
-       if (RequiresValue(Opt))
-         ++NumPositionalRequired;
-@@ -844,13 +906,14 @@
-       }
-       UnboundedFound |= EatsUnboundedNumberOfValues(Opt);
-     }
-+
-     HasUnlimitedPositionals = UnboundedFound || ConsumeAfterOpt;
-   }
- 
-   // PositionalVals - A vector of "positional" arguments we accumulate into
-   // the process at the end.
-   //
--  SmallVector<std::pair<StringRef, unsigned>, 4> PositionalVals;
-+  std::vector<std::pair<StringRef, unsigned> > PositionalVals;
- 
-   // If the program has named positional arguments, and the name has been run
-   // across, keep track of which positional argument was named.  Otherwise put
-@@ -862,39 +925,25 @@
-   for (int i = 1; i < argc; ++i) {
-     Option *Handler = nullptr;
-     Option *NearestHandler = nullptr;
-+    Option *PrefixOrGroupHandler = nullptr;
-     std::string NearestHandlerString;
--    StringRef Value;
-+    StringRef Value = "";
-     StringRef ArgName = "";
- 
--    // If the option list changed, this means that some command line
--    // option has just been registered or deregistered.  This can occur in
--    // response to things like -load, etc.  If this happens, rescan the options.
--    if (OptionListChanged) {
--      PositionalOpts.clear();
--      SinkOpts.clear();
--      Opts.clear();
--      GetOptionInfo(PositionalOpts, SinkOpts, Opts);
--      OptionListChanged = false;
--    }
--
-     // Check to see if this is a positional argument.  This argument is
-     // considered to be positional if it doesn't start with '-', if it is "-"
-     // itself, or if we have seen "--" already.
-     //
--    if (argv[i][0] != '-' || argv[i][1] == 0 || DashDashFound) {
--      // Positional argument!
--      if (ActivePositionalArg) {
--        ProvidePositionalOption(ActivePositionalArg, argv[i], i);
--        continue; // We are done!
--      }
--
-+    if (((argv[i][0] != '-') && (argv[i][1] != '\0')) ||
-+        ((argv[i][0] == '-') && (argv[i][1] == '\0')) || DashDashFound) {
-       if (!PositionalOpts.empty()) {
-         PositionalVals.push_back(std::make_pair(argv[i], i));
- 
-         // All of the positional arguments have been fulfulled, give the rest to
-         // the consume after option... if it's specified...
-         //
--        if (PositionalVals.size() >= NumPositionalRequired && ConsumeAfterOpt) {
-+        if ((PositionalVals.size() >= NumPositionalRequired) &&
-+            ConsumeAfterOpt) {
-           for (++i; i < argc; ++i)
-             PositionalVals.push_back(std::make_pair(argv[i], i));
-           break; // Handle outside of the argument processing loop...
-@@ -913,6 +962,7 @@
-       // option is another positional argument.  If so, treat it as an argument,
-       // otherwise feed it to the eating positional.
-       ArgName = argv[i] + 1;
-+
-       // Eat leading dashes.
-       while (!ArgName.empty() && ArgName[0] == '-')
-         ArgName = ArgName.substr(1);
-@@ -924,17 +974,32 @@
-       }
- 
-     } else { // We start with a '-', must be an argument.
--      ArgName = argv[i] + 1;
-+      // ArgName = i == (argc - 1) ? argv[i] : argv[i] + 1;
-+      ArgName = argv[i];
-+
-       // Eat leading dashes.
-       while (!ArgName.empty() && ArgName[0] == '-')
-         ArgName = ArgName.substr(1);
- 
-       Handler = LookupOption(ArgName, Value, Opts);
--
--      // Check to see if this "option" is really a prefixed or grouped argument.
--      if (!Handler)
--        Handler =
--            HandlePrefixedOrGroupedOption(ArgName, Value, ErrorParsing, Opts);
-+      if (Handler) {
-+        enum FormattingFlags FF = Handler->getFormattingFlag();
-+        if ((FF == llvm::cl::Prefix) || (FF == llvm::cl::Grouping)) {
-+          if (Value.empty())
-+            Value = argv[++i];
-+
-+          std::string SA = ArgName.str();
-+          std::string SV = Value.str();
-+          SA.append(SV);
-+
-+          // Check to see if this "option" is really a prefixed or
-+          // grouped argument.
-+          PrefixOrGroupHandler =
-+            HandlePrefixedOrGroupedOption(SA, SV, ErrorParsing, Opts);
-+          if (PrefixOrGroupHandler)
-+            Handler = PrefixOrGroupHandler;
-+        }
-+      }
- 
-       // Otherwise, look for the closest available option to report to the user
-       // in the upcoming error.
-@@ -945,22 +1010,23 @@
- 
-     if (!Handler) {
-       if (SinkOpts.empty()) {
--        errs() << ProgramName << ": Unknown command line argument '" << argv[i]
--               << "'.  Try: '" << argv[0] << " -help'\n";
-+        errs() << ProgramName.c_str()
-+          << ": Unknown command line argument '" << argv[i]
-+          << "'.  Try: '" << argv[0] << " -help'\n";
- 
-         if (NearestHandler) {
-           // If we know a near match, report it as well.
--          errs() << ProgramName << ": Did you mean '-" << NearestHandlerString
--                 << "'?\n";
-+          errs() << ProgramName.c_str()
-+            << ": Did you mean '-" << NearestHandlerString << "'?\n";
-         }
- 
-         ErrorParsing = true;
-       } else {
--        for (SmallVectorImpl<Option *>::iterator I = SinkOpts.begin(),
--                                                 E = SinkOpts.end();
--             I != E; ++I)
-+        for (std::vector<Option *>::iterator I = SinkOpts.begin(),
-+             E = SinkOpts.end(); I != E; ++I)
-           (*I)->addOccurrence(i, "", argv[i]);
-       }
-+
-       continue;
-     }
- 
-@@ -974,50 +1040,77 @@
- 
-   // Check and handle positional arguments now...
-   if (NumPositionalRequired > PositionalVals.size()) {
--    errs() << ProgramName
--           << ": Not enough positional command line arguments specified!\n"
--           << "Must specify at least " << NumPositionalRequired
--           << " positional arguments: See: " << argv[0] << " -help\n";
-+    errs() << ProgramName.c_str()
-+      << ": Not enough positional command line arguments specified!\n"
-+      << "Must specify at least " << NumPositionalRequired
-+      << " positional arguments: See: " << argv[0] << " -help\n";
- 
-     ErrorParsing = true;
-   } else if (!HasUnlimitedPositionals &&
-              PositionalVals.size() > PositionalOpts.size()) {
--    errs() << ProgramName << ": Too many positional arguments specified!\n"
--           << "Can specify at most " << PositionalOpts.size()
--           << " positional arguments: See: " << argv[0] << " -help\n";
-+    errs() << ProgramName.c_str()
-+      << ": Too many positional arguments specified!\n"
-+      << "Can specify at most " << PositionalOpts.size()
-+      << " positional arguments: See: " << argv[0] << " -help\n";
-     ErrorParsing = true;
- 
-   } else if (!ConsumeAfterOpt) {
-     // Positional args have already been handled if ConsumeAfter is specified.
--    unsigned ValNo = 0, NumVals = static_cast<unsigned>(PositionalVals.size());
-+    unsigned ValNo = 0;
-+    unsigned NumVals = static_cast<unsigned>(PositionalVals.size());
-     for (size_t i = 0, e = PositionalOpts.size(); i != e; ++i) {
--      if (RequiresValue(PositionalOpts[i])) {
--        ProvidePositionalOption(PositionalOpts[i], PositionalVals[ValNo].first,
-+      Option *PO = PositionalOpts[i];
-+      if (RequiresValue(PO)) {
-+        ProvidePositionalOption(PO, PositionalVals[ValNo].first,
-                                 PositionalVals[ValNo].second);
-         ValNo++;
-         --NumPositionalRequired; // We fulfilled our duty...
-       }
- 
-+      enum llvm::cl::ValueExpected VE = PO->getValueExpectedFlag();
-+
-+      // If it's a positional argument, provide it.
-+      if ((NumVals - ValNo) > NumPositionalRequired) {
-+        if (VE == llvm::cl::ValuePositionalNoArgs) {
-+          ProvidePositionalOption(PO, PositionalVals[ValNo].first,
-+                                  PositionalVals[ValNo].second);
-+          ++ValNo;
-+          --NumPositionalRequired;
-+          continue;
-+        } else if (VE == llvm::cl::ValuePositionalWithArgs) {
-+          ProvidePositionalOptionWithArgs(PO, PositionalVals[ValNo].first,
-+                                          PositionalVals[ValNo].second,
-+                                          ValNo,
-+                                          NumPositionalRequired);
-+          continue;
-+        }
-+      }
-+
-       // If we _can_ give this option more arguments, do so now, as long as we
-       // do not give it values that others need.  'Done' controls whether the
-       // option even _WANTS_ any more.
-       //
--      bool Done = PositionalOpts[i]->getNumOccurrencesFlag() == cl::Required;
--      while (NumVals - ValNo > NumPositionalRequired && !Done) {
--        switch (PositionalOpts[i]->getNumOccurrencesFlag()) {
-+      bool Done =
-+        ((PO->getNumOccurrencesFlag() == cl::Required) &&
-+         (VE != llvm::cl::ValuePositionalNoArgs));
-+
-+      while (((NumVals - ValNo) > NumPositionalRequired)  && !Done) {
-+        switch (PO->getNumOccurrencesFlag()) {
-         case cl::Optional:
-           Done = true; // Optional arguments want _at most_ one value
-         // FALL THROUGH
-+          break;
-         case cl::ZeroOrMore: // Zero or more will take all they can get...
-         case cl::OneOrMore:  // One or more will take all they can get...
--          ProvidePositionalOption(PositionalOpts[i],
--                                  PositionalVals[ValNo].first,
-+          ProvidePositionalOption(PO, PositionalVals[ValNo].first,
-                                   PositionalVals[ValNo].second);
-           ValNo++;
-           break;
-         default:
--          llvm_unreachable("Internal error, unexpected NumOccurrences flag in "
--                           "positional argument processing!");
-+          assert(0 && "Internal Compiler Error: "
-+                 "unexpected NumOccurrences flag "
-+                 "in positional argument processing!");
-+          break;
-         }
-       }
-     }
-@@ -1029,7 +1122,7 @@
-         ErrorParsing |= ProvidePositionalOption(PositionalOpts[j],
-                                                 PositionalVals[ValNo].first,
-                                                 PositionalVals[ValNo].second);
--        ValNo++;
-+        ++ValNo;
-       }
- 
-     // Handle the case where there is just one positional option, and it's
-@@ -1041,7 +1134,7 @@
-       ErrorParsing |= ProvidePositionalOption(PositionalOpts[1],
-                                               PositionalVals[ValNo].first,
-                                               PositionalVals[ValNo].second);
--      ValNo++;
-+      ++ValNo;
-     }
- 
-     // Handle over all of the rest of the arguments to the
-@@ -1061,7 +1154,7 @@
-         Opt.second->error("must be specified at least once!");
-         ErrorParsing = true;
-       }
--    // Fall through
-+      break;
-     default:
-       break;
-     }
-@@ -1095,7 +1188,7 @@
-   if (ArgName.empty())
-     errs() << HelpStr; // Be nice for positional arguments
-   else
--    errs() << ProgramName << ": for the -" << ArgName;
-+    errs() << ProgramName.c_str() << ": for the -" << ArgName;
- 
-   errs() << " option: " << Message << "\n";
-   return true;
-@@ -1106,7 +1199,9 @@
-   if (!MultiArg)
-     NumOccurrences++; // Increment the number of times we have been seen
- 
--  switch (getNumOccurrencesFlag()) {
-+  llvm::cl::NumOccurrencesFlag NOF = getNumOccurrencesFlag();
-+
-+  switch (NOF) {
-   case Optional:
-     if (NumOccurrences > 1)
-       return error("may only occur zero or one times!", ArgName);
-@@ -1121,7 +1216,11 @@
-     break;
-   }
- 
--  return handleOccurrence(pos, ArgName, Value);
-+  std::string SAN = ArgName;
-+  std::string SV = Value;
-+
-+  bool R = handleOccurrence(pos, SAN.c_str(), SV.c_str());
-+  return R;
- }
- 
- // getValueStr - Get the value description string, using "DefaultMsg" if nothing
-@@ -1402,11 +1501,12 @@
- PRINT_OPT_DIFF(float)
- PRINT_OPT_DIFF(char)
- 
--void parser<std::string>::printOptionDiff(const Option &O, StringRef V,
-+void parser<std::string>::printOptionDiff(const Option &O,
-+                                          const std::string &V,
-                                           OptionValue<std::string> D,
-                                           size_t GlobalWidth) const {
-   printOptionName(O, GlobalWidth);
--  outs() << "= " << V;
-+  outs() << "= " << V.c_str();
-   size_t NumSpaces = MaxOptWidth > V.size() ? MaxOptWidth - V.size() : 0;
-   outs().indent(NumSpaces) << " (default: ";
-   if (D.hasValue())
-@@ -1427,20 +1527,22 @@
- // -help and -help-hidden option implementation
- //
- 
--static int OptNameCompare(const void *LHS, const void *RHS) {
--  typedef std::pair<const char *, Option *> pair_ty;
--
--  return strcmp(((const pair_ty *)LHS)->first, ((const pair_ty *)RHS)->first);
--}
-+template<typename Ty>
-+struct OptNameCompare : public std::binary_function<Ty, Ty, bool> {
-+  inline bool operator()(const Ty& LHS, const Ty& RHS) const {
-+    return std::strcmp(LHS.first, RHS.first) <= 0;
-+  }
-+};
- 
- // Copy Options into a vector so we can sort them as we like.
- static void sortOpts(StringMap<Option *> &OptMap,
--                     SmallVectorImpl<std::pair<const char *, Option *>> &Opts,
-+                     std::vector<std::pair<const char*, Option*> > &Opts,
-                      bool ShowHidden) {
-   SmallPtrSet<Option *, 128> OptionSet; // Duplicate option detection.
- 
-   for (StringMap<Option *>::iterator I = OptMap.begin(), E = OptMap.end();
-        I != E; ++I) {
-+
-     // Ignore really-hidden options.
-     if (I->second->getOptionHiddenFlag() == ReallyHidden)
-       continue;
-@@ -1453,12 +1555,13 @@
-     if (!OptionSet.insert(I->second).second)
-       continue;
- 
--    Opts.push_back(
--        std::pair<const char *, Option *>(I->getKey().data(), I->second));
-+    std::pair<const char*, Option*> KVP(I->getKey().data(), I->second);
-+    Opts.push_back(KVP);
-   }
- 
-   // Sort the options list alphabetically.
--  qsort(Opts.data(), Opts.size(), sizeof(Opts[0]), OptNameCompare);
-+  OptNameCompare<std::pair<const char*, Option*> >  ONC;
-+  std::sort(Opts.begin(), Opts.end(), ONC);
- }
- 
- namespace {
-@@ -1466,8 +1569,9 @@
- class HelpPrinter {
- protected:
-   const bool ShowHidden;
--  typedef SmallVector<std::pair<const char *, Option *>, 128>
-+  typedef std::vector<std::pair<const char *, Option *> >
-       StrOptionPairVector;
-+
-   // Print the options. Opts is assumed to be alphabetically sorted.
-   virtual void printOptions(StrOptionPairVector &Opts, size_t MaxArgLen) {
-     for (size_t i = 0, e = Opts.size(); i != e; ++i)
-@@ -1484,8 +1588,8 @@
-       return;
- 
-     // Get all the options.
--    SmallVector<Option *, 4> PositionalOpts;
--    SmallVector<Option *, 4> SinkOpts;
-+    std::vector<Option *> PositionalOpts;
-+    std::vector<Option *> SinkOpts;
-     StringMap<Option *> OptMap;
-     GetOptionInfo(PositionalOpts, SinkOpts, OptMap);
- 
-@@ -1495,7 +1599,7 @@
-     if (ProgramOverview)
-       outs() << "OVERVIEW: " << ProgramOverview << "\n";
- 
--    outs() << "USAGE: " << ProgramName << " [options]";
-+    outs() << "USAGE: " << ProgramName.c_str() << " [options]";
- 
-     // Print out the positional options.
-     Option *CAOpt = nullptr; // The cl::ConsumeAfter option, if it exists...
-@@ -1710,12 +1814,12 @@
-     return;
- 
-   // Get all the options.
--  SmallVector<Option *, 4> PositionalOpts;
--  SmallVector<Option *, 4> SinkOpts;
-+  std::vector<Option *> PositionalOpts;
-+  std::vector<Option *> SinkOpts;
-   StringMap<Option *> OptMap;
-   GetOptionInfo(PositionalOpts, SinkOpts, OptMap);
- 
--  SmallVector<std::pair<const char *, Option *>, 128> Opts;
-+  std::vector<std::pair<const char *, Option *> > Opts;
-   sortOpts(OptMap, Opts, /*ShowHidden*/ true);
- 
-   // Compute the maximum argument length...
-@@ -1825,8 +1929,8 @@
- 
- void cl::getRegisteredOptions(StringMap<Option *> &Map) {
-   // Get all the options.
--  SmallVector<Option *, 4> PositionalOpts; // NOT USED
--  SmallVector<Option *, 4> SinkOpts; // NOT USED
-+  std::vector<Option *> PositionalOpts; // NOT USED
-+  std::vector<Option *> SinkOpts; // NOT USED
-   assert(Map.size() == 0 && "StringMap must be empty");
-   GetOptionInfo(PositionalOpts, SinkOpts, Map);
-   return;
---- lib/Support/PluginLoader.cpp	2012-12-03 08:50:05.000000000 -0800
-+++ lib/Support/PluginLoader.cpp	2016-01-24 11:02:33.000000000 -0800
-@@ -34,6 +34,21 @@
-   }
- }
- 
-+bool PluginLoader::operator==(const std::string &Filename) const {
-+  sys::SmartScopedLock<true> Lock(*PluginsLock);
-+  for (std::vector<std::string>::const_iterator I = Plugins->begin(),
-+       E = Plugins->end(); I != E; ++I) {
-+    if (*I == Filename)
-+      return true;
-+  }
-+
-+  return false;
-+}
-+
-+bool PluginLoader::operator!=(const std::string &Filename) const {
-+  return !this->operator==(Filename);
-+}
-+
- unsigned PluginLoader::getNumPlugins() {
-   sys::SmartScopedLock<true> Lock(*PluginsLock);
-   return Plugins.isConstructed() ? Plugins->size() : 0;
---- include/llvm/Support/CommandLine.h	2015-01-13 11:14:20.000000000 -0800
-+++ include/llvm/Support/CommandLine.h	2016-01-19 11:56:32.087336770 -0800
-@@ -24,6 +24,7 @@
- #include "llvm/ADT/StringMap.h"
- #include "llvm/ADT/Twine.h"
- #include "llvm/Support/Compiler.h"
-+#include "llvm/Support/raw_ostream.h"
- #include <cassert>
- #include <climits>
- #include <cstdarg>
-@@ -97,9 +98,11 @@
- 
- enum ValueExpected { // Is a value required for the option?
-   // zero reserved for the unspecified value
--  ValueOptional = 0x01,  // The value can appear... or not
--  ValueRequired = 0x02,  // The value is required to appear!
--  ValueDisallowed = 0x03 // A value may not be specified (for flags)
-+  ValueOptional = 0x01,           // The value can appear... or not
-+  ValueRequired = 0x02,           // The value is required to appear!
-+  ValueDisallowed = 0x03,         // A value may not be specified (for flags)
-+  ValuePositionalNoArgs = 0x04,   // Positional Argument, no additional args
-+  ValuePositionalWithArgs = 0x05  // Positional Argument, with additional args
- };
- 
- enum OptionHidden {   // Control whether -help shows this option
-@@ -137,6 +140,36 @@
- };
- 
- //===----------------------------------------------------------------------===//
-+// Generic Filename Locations
-+//
-+struct GenericFilenameLocation {
-+  GenericFilenameLocation() : Value("") { }
-+  GenericFilenameLocation(const std::string &S) : Value(S) { }
-+
-+  void operator=(const std::string &S) {
-+    if (!S.empty())
-+      Value = S;
-+  }
-+
-+  std::string Value;
-+};
-+
-+struct GenericFilenameLocations {
-+  GenericFilenameLocations() : Value() { }
-+  GenericFilenameLocations(const std::string &S)
-+  : Value() {
-+    Value.push_back(S);
-+  }
-+
-+  void operator=(const std::string &S) {
-+    if (!S.empty())
-+      Value.push_back(S);
-+  }
-+
-+  std::vector<std::string> Value;
-+};
-+
-+//===----------------------------------------------------------------------===//
- // Option Category class
- //
- class OptionCategory {
-@@ -162,9 +195,15 @@
- // Option Base class
- //
- class alias;
-+
- class Option {
-   friend class alias;
- 
-+protected:
-+  /// RegisteredOptionList - This is the list of the command line options
-+  /// that have statically constructed themselves.
-+  static Option *RegisteredOptionList;
-+
-   // handleOccurrences - Overriden by subclasses to handle the value passed into
-   // an argument.  Should return true if there was an error processing the
-   // argument and the program should exit.
-@@ -182,13 +221,13 @@
-   int NumOccurrences; // The number of times specified
-   // Occurrences, HiddenFlag, and Formatting are all enum types but to avoid
-   // problems with signed enums in bitfields.
--  unsigned Occurrences : 3; // enum NumOccurrencesFlag
-+  unsigned Occurrences; // enum NumOccurrencesFlag
-   // not using the enum type for 'Value' because zero is an implementation
-   // detail representing the non-value
--  unsigned Value : 2;
--  unsigned HiddenFlag : 2; // enum OptionHidden
--  unsigned Formatting : 2; // enum FormattingFlags
--  unsigned Misc : 3;
-+  unsigned Value;
-+  unsigned HiddenFlag; // enum OptionHidden
-+  unsigned Formatting; // enum FormattingFlags
-+  unsigned Misc;
-   unsigned Position;       // Position of last occurrence of the option
-   unsigned AdditionalVals; // Greater than 0 for multi-valued option.
-   Option *NextRegistered;  // Singly linked list of registered options.
-@@ -200,23 +239,28 @@
-   OptionCategory *Category; // The Category this option belongs to
- 
-   inline enum NumOccurrencesFlag getNumOccurrencesFlag() const {
--    return (enum NumOccurrencesFlag)Occurrences;
-+    return static_cast<enum NumOccurrencesFlag>(Occurrences);
-   }
-+
-   inline enum ValueExpected getValueExpectedFlag() const {
--    return Value ? ((enum ValueExpected)Value) : getValueExpectedFlagDefault();
-+    return Value ?  static_cast<enum ValueExpected>(Value) :
-+      static_cast<enum ValueExpected>(getValueExpectedFlagDefault());
-   }
-+
-   inline enum OptionHidden getOptionHiddenFlag() const {
--    return (enum OptionHidden)HiddenFlag;
-+    return static_cast<enum OptionHidden>(HiddenFlag);
-   }
-+
-   inline enum FormattingFlags getFormattingFlag() const {
--    return (enum FormattingFlags)Formatting;
-+    return static_cast<enum FormattingFlags>(Formatting);
-   }
-+
-   inline unsigned getMiscFlags() const { return Misc; }
-   inline unsigned getPosition() const { return Position; }
-   inline unsigned getNumAdditionalVals() const { return AdditionalVals; }
- 
-   // hasArgStr - Return true if the argstr != ""
--  bool hasArgStr() const { return ArgStr[0] != 0; }
-+  bool hasArgStr() const { return ArgStr && *ArgStr != '\0'; }
- 
-   //-------------------------------------------------------------------------===
-   // Accessor functions set by OptionModifiers
-@@ -233,16 +277,78 @@
-   void setCategory(OptionCategory &C) { Category = &C; }
- 
- protected:
-+  Option() : NumOccurrences(0), Occurrences(0), Value(0), HiddenFlag(0),
-+  Formatting(0), Misc(0), Position(0), AdditionalVals(0),
-+  NextRegistered(0), ArgStr(""), HelpStr(""), ValueStr(""),
-+  Category(0) { }
-   explicit Option(enum NumOccurrencesFlag OccurrencesFlag,
-                   enum OptionHidden Hidden)
--      : NumOccurrences(0), Occurrences(OccurrencesFlag), Value(0),
--        HiddenFlag(Hidden), Formatting(NormalFormatting), Misc(0), Position(0),
--        AdditionalVals(0), NextRegistered(nullptr), ArgStr(""), HelpStr(""),
--        ValueStr(""), Category(&GeneralCategory) {}
-+    : NumOccurrences(0), Occurrences(OccurrencesFlag), Value(0),
-+    HiddenFlag(Hidden), Formatting(NormalFormatting), Misc(0), Position(0),
-+    AdditionalVals(0), NextRegistered(nullptr), ArgStr(""), HelpStr(""),
-+    ValueStr(""), Category(&GeneralCategory) {}
- 
-   inline void setNumAdditionalVals(unsigned n) { AdditionalVals = n; }
- 
- public:
-+  Option(const Option &RHS)
-+  : NumOccurrences(RHS.NumOccurrences), Occurrences(RHS.Occurrences),
-+  Value(RHS.Value), HiddenFlag(RHS.HiddenFlag),
-+  Formatting(RHS.Formatting), Misc(RHS.Misc),
-+  Position(RHS.Position), AdditionalVals(RHS.AdditionalVals),
-+  NextRegistered(RHS.NextRegistered), ArgStr(RHS.ArgStr),
-+  HelpStr(RHS.HelpStr), ValueStr(RHS.ValueStr),
-+  Category(RHS.Category) { }
-+
-+  Option(Option &&RHS)
-+  : NumOccurrences(RHS.NumOccurrences), Occurrences(RHS.Occurrences),
-+  Value(RHS.Value), HiddenFlag(RHS.HiddenFlag),
-+  Formatting(RHS.Formatting), Misc(RHS.Misc),
-+  Position(RHS.Position), AdditionalVals(RHS.AdditionalVals),
-+  NextRegistered(RHS.NextRegistered), ArgStr(RHS.ArgStr),
-+  HelpStr(RHS.HelpStr), ValueStr(RHS.ValueStr),
-+  Category(RHS.Category) { }
-+
-+  Option &operator=(const Option &RHS) {
-+    if (this != &RHS) {
-+      NumOccurrences = RHS.NumOccurrences;
-+      Occurrences = RHS.Occurrences;
-+      Value = RHS.Value;
-+      HiddenFlag = RHS.HiddenFlag;
-+      Formatting = RHS.Formatting;
-+      Misc = RHS.Misc;
-+      Position = RHS.Position;
-+      AdditionalVals = RHS.AdditionalVals;
-+      NextRegistered = RHS.NextRegistered;
-+      ArgStr = RHS.ArgStr;
-+      HelpStr = RHS.HelpStr;
-+      ValueStr = RHS.ValueStr;
-+      Category = RHS.Category;
-+    }
-+
-+    return *this;
-+  }
-+
-+  const Option &operator=(Option &&RHS) {
-+    if (this != &RHS) {
-+      NumOccurrences = RHS.NumOccurrences;
-+      Occurrences = RHS.Occurrences;
-+      Value = RHS.Value;
-+      HiddenFlag = RHS.HiddenFlag;
-+      Formatting = RHS.Formatting;
-+      Misc = RHS.Misc;
-+      Position = RHS.Position;
-+      AdditionalVals = RHS.AdditionalVals;
-+      NextRegistered = RHS.NextRegistered;
-+      ArgStr = RHS.ArgStr;
-+      HelpStr = RHS.HelpStr;
-+      ValueStr = RHS.ValueStr;
-+      Category = RHS.Category;
-+    }
-+
-+    return *this;
-+  }
-+
-   // addArgument - Register this argument with the commandline system.
-   //
-   void addArgument();
-@@ -253,8 +359,20 @@
-   /// For testing purposes only.
-   void removeArgument();
- 
-+  static void registerOption(Option *O) {
-+    assert(O && "Invalid argument!");
-+
-+    O->NextRegistered = RegisteredOptionList;
-+    RegisteredOptionList = O;
-+    MarkOptionsChanged();
-+  }
-+
-   Option *getNextRegisteredOption() const { return NextRegistered; }
- 
-+  static Option *getRegisteredOptionList() {
-+    return Option::RegisteredOptionList;
-+  }
-+
-   // Return the width of the option tag for printing...
-   virtual size_t getOptionWidth() const = 0;
- 
-@@ -265,7 +383,7 @@
- 
-   virtual void printOptionValue(size_t GlobalWidth, bool Force) const = 0;
- 
--  virtual void getExtraOptionNames(SmallVectorImpl<const char *> &) {}
-+  virtual void getExtraOptionNames(std::vector<const char*> &V) { }
- 
-   // addOccurrence - Wrapper around handleOccurrence that enforces Flags.
-   //
-@@ -277,7 +395,7 @@
- 
- public:
-   inline int getNumOccurrences() const { return NumOccurrences; }
--  virtual ~Option() {}
-+  virtual ~Option() { }
- };
- 
- //===----------------------------------------------------------------------===//
-@@ -304,29 +422,39 @@
- // the default constructor for the argument type does not give you what you
- // want.  This is only valid on "opt" arguments, not on "list" arguments.
- //
--template <class Ty> struct initializer {
-+template <typename Ty> struct initializer {
-   const Ty &Init;
--  initializer(const Ty &Val) : Init(Val) {}
- 
--  template <class Opt> void apply(Opt &O) const { O.setInitialValue(Init); }
-+  initializer(const Ty &Val) : Init(Val) { }
-+  initializer(const initializer &RHS) : Init(RHS.Init) { }
-+  initializer(initializer &&RHS) : Init(RHS.Init) { }
-+
-+  template <typename Opt>
-+  void apply(Opt &O) const { O.setInitialValue(Init); }
- };
- 
--template <class Ty> initializer<Ty> init(const Ty &Val) {
--  return initializer<Ty>(Val);
-+template<typename Ty>
-+initializer<Ty> init(const Ty &Val) {
-+  llvm::cl::initializer<Ty> I(Val);
-+  return I;
- }
- 
- // location - Allow the user to specify which external variable they want to
- // store the results of the command line argument processing into, if they don't
- // want to store it in the option itself.
- //
--template <class Ty> struct LocationClass {
-+template <typename Ty> struct LocationClass {
-   Ty &Loc;
--  LocationClass(Ty &L) : Loc(L) {}
- 
--  template <class Opt> void apply(Opt &O) const { O.setLocation(O, Loc); }
-+  LocationClass(Ty &L) : Loc(L) { }
-+  LocationClass(const LocationClass &RHS) : Loc(RHS.Loc) { }
-+  LocationClass(LocationClass &&RHS) : Loc(RHS.Loc) { }
-+
-+  template<typename Opt>
-+  void apply(Opt &O) const { O.setLocation(O, Loc); }
- };
- 
--template <class Ty> LocationClass<Ty> location(Ty &L) {
-+template <typename Ty> LocationClass<Ty> location(Ty &L) {
-   return LocationClass<Ty>(L);
- }
- 
-@@ -334,17 +462,22 @@
- // to.
- struct cat {
-   OptionCategory &Category;
--  cat(OptionCategory &c) : Category(c) {}
- 
--  template <class Opt> void apply(Opt &O) const { O.setCategory(Category); }
-+  cat(OptionCategory &c) : Category(c) { }
-+  cat(const cat &RHS) : Category(RHS.Category) { }
-+  virtual ~cat() { }
-+
-+  template <typename Opt>
-+  void apply(Opt &O) const { O.setCategory(Category); }
- };
- 
- //===----------------------------------------------------------------------===//
- // OptionValue class
- 
- // Support value comparison outside the template.
--struct GenericOptionValue {
--  virtual ~GenericOptionValue() {}
-+class GenericOptionValue {
-+public:
-+  virtual ~GenericOptionValue() { }
-   virtual bool compare(const GenericOptionValue &V) const = 0;
- 
- private:
-@@ -458,57 +591,6 @@
- };
- 
- //===----------------------------------------------------------------------===//
--// Enum valued command line option
--//
--#define clEnumVal(ENUMVAL, DESC) #ENUMVAL, int(ENUMVAL), DESC
--#define clEnumValN(ENUMVAL, FLAGNAME, DESC) FLAGNAME, int(ENUMVAL), DESC
--#define clEnumValEnd (reinterpret_cast<void *>(0))
--
--// values - For custom data types, allow specifying a group of values together
--// as the values that go into the mapping that the option handler uses.  Note
--// that the values list must always have a 0 at the end of the list to indicate
--// that the list has ended.
--//
--template <class DataType> class ValuesClass {
--  // Use a vector instead of a map, because the lists should be short,
--  // the overhead is less, and most importantly, it keeps them in the order
--  // inserted so we can print our option out nicely.
--  SmallVector<std::pair<const char *, std::pair<int, const char *>>, 4> Values;
--  void processValues(va_list Vals);
--
--public:
--  ValuesClass(const char *EnumName, DataType Val, const char *Desc,
--              va_list ValueArgs) {
--    // Insert the first value, which is required.
--    Values.push_back(std::make_pair(EnumName, std::make_pair(Val, Desc)));
--
--    // Process the varargs portion of the values...
--    while (const char *enumName = va_arg(ValueArgs, const char *)) {
--      DataType EnumVal = static_cast<DataType>(va_arg(ValueArgs, int));
--      const char *EnumDesc = va_arg(ValueArgs, const char *);
--      Values.push_back(std::make_pair(enumName, // Add value to value map
--                                      std::make_pair(EnumVal, EnumDesc)));
--    }
--  }
--
--  template <class Opt> void apply(Opt &O) const {
--    for (size_t i = 0, e = Values.size(); i != e; ++i)
--      O.getParser().addLiteralOption(Values[i].first, Values[i].second.first,
--                                     Values[i].second.second);
--  }
--};
--
--template <class DataType>
--ValuesClass<DataType> LLVM_END_WITH_NULL
--values(const char *Arg, DataType Val, const char *Desc, ...) {
--  va_list ValueArgs;
--  va_start(ValueArgs, Desc);
--  ValuesClass<DataType> Vals(Arg, Val, Desc, ValueArgs);
--  va_end(ValueArgs);
--  return Vals;
--}
--
--//===----------------------------------------------------------------------===//
- // parser class - Parameterizable parser for different data types.  By default,
- // known data types (string, int, bool) have specialized parsers, that do what
- // you would expect.  The default parser, used for data types that are not
-@@ -519,18 +601,23 @@
- // generic_parser_base - This class holds all the non-generic code that we do
- // not need replicated for every instance of the generic parser.  This also
- // allows us to put stuff into CommandLine.cpp
-+// Moved here for an obvious reason.
- //
- class generic_parser_base {
- protected:
-   class GenericOptionInfo {
-   public:
-     GenericOptionInfo(const char *name, const char *helpStr)
--        : Name(name), HelpStr(helpStr) {}
-+      : Name(name), HelpStr(helpStr) {}
-+    virtual ~GenericOptionInfo() { }
-+
-     const char *Name;
-     const char *HelpStr;
-   };
- 
- public:
-+  generic_parser_base() : hasArgStr(false) { }
-+
-   virtual ~generic_parser_base() {} // Base class should have virtual-dtor
- 
-   // getNumOptions - Virtual function implemented by generic subclass to
-@@ -576,7 +663,7 @@
-     hasArgStr = O.hasArgStr();
-   }
- 
--  void getExtraOptionNames(SmallVectorImpl<const char *> &OptionNames) {
-+  void getExtraOptionNames(std::vector<const char *> &OptionNames) {
-     // If there has been no argstr specified, that means that we need to add an
-     // argument for every possible option.  This ensures that our options are
-     // vectored to us.
-@@ -612,34 +699,48 @@
-   bool hasArgStr;
- };
- 
-+
- // Default parser implementation - This implementation depends on having a
- // mapping of recognized options to values of some sort.  In addition to this,
- // each entry in the mapping also tracks a help message that is printed with the
- // command line option for -help.  Because this is a simple mapping parser, the
- // data type can be any unsupported type.
- //
--template <class DataType> class parser : public generic_parser_base {
-+template <typename DataType>
-+class parser : public generic_parser_base {
- protected:
-   class OptionInfo : public GenericOptionInfo {
-   public:
--    OptionInfo(const char *name, DataType v, const char *helpStr)
--        : GenericOptionInfo(name, helpStr), V(v) {}
-+    OptionInfo(const char *Name, DataType DT, const char *helpStr)
-+      : GenericOptionInfo(Name, helpStr), V(DT) {}
-+    ~OptionInfo() { }
-+
-     OptionValue<DataType> V;
-   };
--  SmallVector<OptionInfo, 8> Values;
-+
-+  std::vector<OptionInfo> Values;
- 
- public:
-   typedef DataType parser_data_type;
- 
-+  parser<DataType>() : generic_parser_base(), Values() { }
-+  virtual ~parser<DataType>() { }
-+
-   // Implement virtual functions needed by generic_parser_base
--  unsigned getNumOptions() const override { return unsigned(Values.size()); }
--  const char *getOption(unsigned N) const override { return Values[N].Name; }
--  const char *getDescription(unsigned N) const override {
-+  virtual unsigned getNumOptions() const override {
-+    return static_cast<unsigned>(Values.size());
-+  }
-+
-+  virtual const char *getOption(unsigned N) const override {
-+    return Values[N].Name;
-+  }
-+
-+  virtual const char *getDescription(unsigned N) const override {
-     return Values[N].HelpStr;
-   }
- 
-   // getOptionValue - Return the value of option name N.
--  const GenericOptionValue &getOptionValue(unsigned N) const override {
-+  virtual const GenericOptionValue &getOptionValue(unsigned N) const override {
-     return Values[N].V;
-   }
- 
-@@ -662,7 +763,7 @@
- 
-   /// addLiteralOption - Add an entry to the mapping table.
-   ///
--  template <class DT>
-+  template<typename DT>
-   void addLiteralOption(const char *Name, const DT &V, const char *HelpStr) {
-     assert(findOption(Name) == Values.size() && "Option already exists!");
-     OptionInfo X(Name, static_cast<DataType>(V), HelpStr);
-@@ -670,6 +771,14 @@
-     MarkOptionsChanged();
-   }
- 
-+  void addLiteralOption(const char *Name, const DataType &V,
-+                        const char *HelpStr) {
-+    assert(findOption(Name) == Values.size() && "Option already exists!");
-+    OptionInfo X(Name, V, HelpStr);
-+    Values.push_back(X);
-+    MarkOptionsChanged();
-+  }
-+
-   /// removeLiteralOption - Remove the specified option.
-   ///
-   void removeLiteralOption(const char *Name) {
-@@ -679,18 +788,95 @@
-   }
- };
- 
-+//===----------------------------------------------------------------------===//
-+// Enum valued command line option
-+//
-+#define clEnumVal(ENUMVAL, DESC) #ENUMVAL, int(ENUMVAL), DESC
-+#define clEnumValN(ENUMVAL, FLAGNAME, DESC) FLAGNAME, int(ENUMVAL), DESC
-+#define clEnumValEnd (reinterpret_cast<void *>(0))
-+
-+// values - For custom data types, allow specifying a group of values together
-+// as the values that go into the mapping that the option handler uses.  Note
-+// that the values list must always have a 0 at the end of the list to indicate
-+// that the list has ended.
-+//
-+template <typename DataType>
-+class ValuesClass {
-+  // Use a vector instead of a map, because the lists should be short,
-+  // the overhead is less, and most importantly, it keeps them in the order
-+  // inserted so we can print our option out nicely.
-+  std::vector<std::pair<const char*, std::pair<int, const char*> > > Values;
-+  void processValues(va_list Vals);
-+
-+public:
-+  ValuesClass(const char *EnumName, DataType Val, const char *Desc,
-+              va_list ValueArgs) : Values() {
-+    // Insert the first value, which is required.
-+    Values.push_back(std::make_pair(EnumName, std::make_pair(Val, Desc)));
-+
-+    // Process the varargs portion of the values...
-+    while (const char *enumName = va_arg(ValueArgs, const char *)) {
-+      DataType EnumVal = static_cast<DataType>(va_arg(ValueArgs, int));
-+      const char *EnumDesc = va_arg(ValueArgs, const char *);
-+
-+      Values.push_back(std::make_pair(enumName, // Add value to value map
-+                                      std::make_pair(EnumVal, EnumDesc)));
-+    }
-+  }
-+
-+  ValuesClass(const ValuesClass &RHS)
-+  : Values(RHS.Values) { }
-+
-+  ValuesClass(ValuesClass &&RHS)
-+  : Values(RHS.Values) { }
-+
-+  ValuesClass &operator=(const ValuesClass &RHS) {
-+    if (this != &RHS)
-+      Values.operator=(RHS.Values);
-+
-+    return *this;
-+  }
-+
-+  ValuesClass &operator=(ValuesClass &&RHS) {
-+    if (this != &RHS)
-+      Values.operator=(RHS.Values);
-+
-+    return *this;
-+  }
-+
-+  ~ValuesClass() { }
-+
-+  template <typename Opt> void apply(Opt &O) const {
-+    for (size_t i = 0, e = Values.size(); i != e; ++i) {
-+      O.getParser().addLiteralOption(Values[i].first, Values[i].second.first,
-+                                     Values[i].second.second);
-+    }
-+  }
-+};
-+
-+template <class DataType>
-+ValuesClass<DataType> LLVM_END_WITH_NULL
-+values(const char *Arg, DataType Val, const char *Desc, ...) {
-+  va_list ValueArgs;
-+  va_start(ValueArgs, Desc);
-+  ValuesClass<DataType> Vals(Arg, Val, Desc, ValueArgs);
-+  va_end(ValueArgs);
-+  return Vals;
-+}
-+
- //--------------------------------------------------
- // basic_parser - Super class of parsers to provide boilerplate code
- //
- class basic_parser_impl { // non-template implementation of basic_parser<t>
- public:
-+  basic_parser_impl() { }
-   virtual ~basic_parser_impl() {}
- 
-   enum ValueExpected getValueExpectedFlagDefault() const {
-     return ValueRequired;
-   }
- 
--  void getExtraOptionNames(SmallVectorImpl<const char *> &) {}
-+  void getExtraOptionNames(std::vector<const char *> &V) { }
- 
-   void initialize(Option &) {}
- 
-@@ -720,10 +906,46 @@
- // basic_parser - The real basic parser is just a template wrapper that provides
- // a typedef for the provided data type.
- //
--template <class DataType> class basic_parser : public basic_parser_impl {
-+template <typename DataType>
-+class basic_parser : public basic_parser_impl {
- public:
-+  basic_parser<DataType>() : basic_parser_impl(), Values() { }
-+  ~basic_parser<DataType>() { }
-+
-+  unsigned getNumOptions() const {
-+    return static_cast<unsigned>(Values.size());
-+  }
-+
-+  const char *getOption(unsigned I) {
-+    assert(I < static_cast<unsigned>(Values.size()) &&
-+           "Index is out-of-range!");
-+    return Values[I].Name;
-+  }
-+
-+  const char *getDescription(unsigned I) {
-+    assert(I < static_cast<unsigned>(Values.size()) &&
-+           "Index is out-of-range!");
-+    return Values[I].Help;
-+  }
-+
-   typedef DataType parser_data_type;
-   typedef OptionValue<DataType> OptVal;
-+
-+protected:
-+  template<typename SameDataType>
-+  class OptionInfo {
-+  public:
-+    OptionInfo(const char *NameStr, SameDataType DT, const char *HelpStr)
-+    : Name(NameStr), Help(HelpStr), V(DT) { }
-+
-+    ~OptionInfo() { }
-+
-+    const char *Name;
-+    const char *Help;
-+    OptionValue<SameDataType> V;
-+  };
-+
-+  std::vector<OptionInfo<DataType> > Values;
- };
- 
- //--------------------------------------------------
-@@ -733,6 +955,9 @@
-   const char *ArgStr;
- 
- public:
-+  parser<bool>() : basic_parser<bool>() { }
-+  virtual ~parser<bool>() { }
-+
-   // parse - Return true on error.
-   bool parse(Option &O, StringRef ArgName, StringRef Arg, bool &Val);
- 
-@@ -745,11 +970,17 @@
-   // getValueName - Do not print =<value> at all.
-   const char *getValueName() const override { return nullptr; }
- 
-+  void addLiteralOption(const char *Name, bool V, const char *HelpStr) {
-+    OptionInfo<bool> OI(Name, V, HelpStr);
-+    Values.push_back(OI);
-+    MarkOptionsChanged();
-+  }
-+
-   void printOptionDiff(const Option &O, bool V, OptVal Default,
-                        size_t GlobalWidth) const;
- 
-   // An out-of-line virtual method to provide a 'home' for this class.
--  void anchor() override;
-+  virtual void anchor() override;
- };
- 
- EXTERN_TEMPLATE_INSTANTIATION(class basic_parser<bool>);
-@@ -758,6 +989,9 @@
- // parser<boolOrDefault>
- template <> class parser<boolOrDefault> : public basic_parser<boolOrDefault> {
- public:
-+  parser<boolOrDefault>() : basic_parser<boolOrDefault>() { }
-+  virtual ~parser<boolOrDefault>() { }
-+
-   // parse - Return true on error.
-   bool parse(Option &O, StringRef ArgName, StringRef Arg, boolOrDefault &Val);
- 
-@@ -772,7 +1006,7 @@
-                        size_t GlobalWidth) const;
- 
-   // An out-of-line virtual method to provide a 'home' for this class.
--  void anchor() override;
-+  virtual void anchor() override;
- };
- 
- EXTERN_TEMPLATE_INSTANTIATION(class basic_parser<boolOrDefault>);
-@@ -782,12 +1016,21 @@
- //
- template <> class parser<int> : public basic_parser<int> {
- public:
-+  parser<int>() : basic_parser<int>() { }
-+  virtual ~parser<int>() { }
-+
-   // parse - Return true on error.
-   bool parse(Option &O, StringRef ArgName, StringRef Arg, int &Val);
- 
-   // getValueName - Overload in subclass to provide a better default value.
-   const char *getValueName() const override { return "int"; }
- 
-+  void addLiteralOption(const char *Name, int V, const char *HelpStr) {
-+    OptionInfo<int> OI(Name, V, HelpStr);
-+    Values.push_back(OI);
-+    MarkOptionsChanged();
-+  }
-+
-   void printOptionDiff(const Option &O, int V, OptVal Default,
-                        size_t GlobalWidth) const;
- 
-@@ -802,12 +1045,21 @@
- //
- template <> class parser<unsigned> : public basic_parser<unsigned> {
- public:
-+  parser<unsigned>() : basic_parser<unsigned>() { }
-+  virtual ~parser<unsigned>() { }
-+
-   // parse - Return true on error.
-   bool parse(Option &O, StringRef ArgName, StringRef Arg, unsigned &Val);
- 
-   // getValueName - Overload in subclass to provide a better default value.
-   const char *getValueName() const override { return "uint"; }
- 
-+  void addLiteralOption(const char *Name, unsigned V, const char *HelpStr) {
-+    OptionInfo<unsigned> OI(Name, V, HelpStr);
-+    Values.push_back(OI);
-+    MarkOptionsChanged();
-+  }
-+
-   void printOptionDiff(const Option &O, unsigned V, OptVal Default,
-                        size_t GlobalWidth) const;
- 
-@@ -823,6 +1075,9 @@
- template <>
- class parser<unsigned long long> : public basic_parser<unsigned long long> {
- public:
-+  parser<unsigned long long>() : basic_parser<unsigned long long>() { }
-+  virtual ~parser<unsigned long long>() { }
-+
-   // parse - Return true on error.
-   bool parse(Option &O, StringRef ArgName, StringRef Arg,
-              unsigned long long &Val);
-@@ -844,6 +1099,9 @@
- //
- template <> class parser<double> : public basic_parser<double> {
- public:
-+  parser<double>() : basic_parser<double>() { }
-+  virtual ~parser<double>() { }
-+
-   // parse - Return true on error.
-   bool parse(Option &O, StringRef ArgName, StringRef Arg, double &Val);
- 
-@@ -864,6 +1122,9 @@
- //
- template <> class parser<float> : public basic_parser<float> {
- public:
-+  parser<float>() : basic_parser<float>() { }
-+  virtual ~parser<float>() { }
-+
-   // parse - Return true on error.
-   bool parse(Option &O, StringRef ArgName, StringRef Arg, float &Val);
- 
-@@ -884,6 +1145,9 @@
- //
- template <> class parser<std::string> : public basic_parser<std::string> {
- public:
-+  parser<std::string>() : basic_parser<std::string>() { }
-+  virtual ~parser<std::string>() { }
-+
-   // parse - Return true on error.
-   bool parse(Option &, StringRef, StringRef Arg, std::string &Value) {
-     Value = Arg.str();
-@@ -893,7 +1157,13 @@
-   // getValueName - Overload in subclass to provide a better default value.
-   const char *getValueName() const override { return "string"; }
- 
--  void printOptionDiff(const Option &O, StringRef V, OptVal Default,
-+  void addLiteralOption(const char *Name, int V, const char *HelpStr) {
-+    OptionInfo<std::string> OI(Name, std::to_string(V), HelpStr);
-+    Values.push_back(OI);
-+    MarkOptionsChanged();
-+  }
-+
-+  void printOptionDiff(const Option &O, const std::string &V, OptVal Default,
-                        size_t GlobalWidth) const;
- 
-   // An out-of-line virtual method to provide a 'home' for this class.
-@@ -907,6 +1177,9 @@
- //
- template <> class parser<char> : public basic_parser<char> {
- public:
-+  parser<char>() : basic_parser<char>() { }
-+  virtual ~parser<char>() { }
-+
-   // parse - Return true on error.
-   bool parse(Option &, StringRef, StringRef Arg, char &Value) {
-     Value = Arg[0];
-@@ -916,6 +1189,12 @@
-   // getValueName - Overload in subclass to provide a better default value.
-   const char *getValueName() const override { return "char"; }
- 
-+  void addLiteralOption(const char *Name, char V, const char *HelpStr) {
-+    OptionInfo<char> OI(Name, V, HelpStr);
-+    Values.push_back(OI);
-+    MarkOptionsChanged();
-+  }
-+
-   void printOptionDiff(const Option &O, char V, OptVal Default,
-                        size_t GlobalWidth) const;
- 
-@@ -976,8 +1255,9 @@
- // not correctly respond to the apply method).  Because the syntax to use this
- // is a pain, we have the 'apply' method below to handle the nastiness...
- //
--template <class Mod> struct applicator {
--  template <class Opt> static void opt(const Mod &M, Opt &O) { M.apply(O); }
-+template <typename Mod> struct applicator {
-+  template <typename Opt>
-+  static void opt(const Mod &M, Opt &O) { M.apply(O); }
- };
- 
- // Handle const char* as a special case...
-@@ -1039,11 +1319,16 @@
-   }
- 
- public:
--  opt_storage() : Location(nullptr) {}
-+  opt_storage() : Location(nullptr), Default() { }
-+  opt_storage(const opt_storage &RHS)
-+  : Location(RHS.Location), Default(RHS.Default) { }
-+  opt_storage(opt_storage &&RHS)
-+  : Location(RHS.Location), Default(RHS.Default) { }
- 
-   bool setLocation(Option &O, DataType &L) {
-     if (Location)
-       return O.error("cl::location(x) specified more than once!");
-+
-     Location = &L;
-     Default = L;
-     return false;
-@@ -1077,8 +1362,47 @@
- template <class DataType>
- class opt_storage<DataType, false, true> : public DataType {
- public:
-+  opt_storage() : DataType(), Location(nullptr), Default() { }
-+  opt_storage(const opt_storage &RHS)
-+  : DataType(RHS), Location(RHS.Location), Default(RHS.Default) { }
-+  opt_storage(opt_storage &&RHS)
-+  : DataType(RHS), Location(RHS.Location), Default(RHS.Default) { }
-+
-+  opt_storage<DataType, false, true>
-+  &operator=(const opt_storage<DataType, false, true> &RHS) {
-+    if (this != &RHS) {
-+      DataType::operator=(RHS);
-+      Location = RHS.Location;
-+      Default = RHS.Default;
-+    }
-+
-+    return *this;
-+  }
-+
-+  opt_storage<DataType, false, true>
-+  &operator=(opt_storage<DataType, false, true> &&RHS) {
-+    if (this != &RHS) {
-+      DataType::operator=(RHS);
-+      Location = RHS.Location;
-+      Default = RHS.Default;
-+    }
-+
-+    return *this;
-+  }
-+
-+
-+  DataType *Location;
-   OptionValue<DataType> Default;
- 
-+  bool setLocation(Option &O, DataType &L) {
-+    if (Location)
-+      return O.error("cl::location(x) specified more than once!");
-+
-+    Location = &L;
-+    Default = L;
-+    return false;
-+  }
-+
-   template <class T> void setValue(const T &V, bool initial = false) {
-     DataType::operator=(V);
-     if (initial)
-@@ -1102,13 +1426,45 @@
- 
-   // Make sure we initialize the value with the default constructor for the
-   // type.
--  opt_storage() : Value(DataType()), Default(DataType()) {}
-+  opt_storage() : Value(DataType()), Default(DataType()) { }
-+  opt_storage(const opt_storage &RHS)
-+  : Value(RHS.Value), Default(RHS.Default) { }
-+  opt_storage(opt_storage &&RHS)
-+  : Value(RHS.Location), Default(RHS.Default) { }
-+
-+  opt_storage<DataType, false, false>
-+  &operator=(const opt_storage<DataType, false, false> &RHS) {
-+    if (this != &RHS) {
-+      Value = RHS.Value;
-+      Default = RHS.Default;
-+    }
-+
-+    return *this;
-+  }
-+
-+  opt_storage<DataType, false, false>
-+  &operator=(opt_storage<DataType, false, false> &&RHS) {
-+    if (this != &RHS) {
-+      Value = RHS.Value;
-+      Default = RHS.Default;
-+    }
-+
-+    return *this;
-+  }
-+
-+
-+  bool setLocation(Option &O, DataType &L) {
-+    Value = L;
-+    Default = Value;
-+    return false;
-+  }
- 
-   template <class T> void setValue(const T &V, bool initial = false) {
-     Value = V;
-     if (initial)
-       Default = V;
-   }
-+
-   DataType &getValue() { return Value; }
-   DataType getValue() const { return Value; }
- 
-@@ -1123,19 +1479,21 @@
- //===----------------------------------------------------------------------===//
- // opt - A scalar command line option.
- //
--template <class DataType, bool ExternalStorage = false,
--          class ParserClass = parser<DataType>>
-+template <typename DataType, bool ExternalStorage = false,
-+          typename ParserClass = parser<DataType> >
- class opt : public Option,
-             public opt_storage<DataType, ExternalStorage,
-                                std::is_class<DataType>::value> {
-   ParserClass Parser;
- 
--  bool handleOccurrence(unsigned pos, StringRef ArgName,
--                        StringRef Arg) override {
-+protected:
-+  virtual bool handleOccurrence(unsigned pos, StringRef ArgName,
-+                                StringRef Arg) override {
-     typename ParserClass::parser_data_type Val =
-         typename ParserClass::parser_data_type();
-     if (Parser.parse(*this, ArgName, Arg, Val))
-       return true; // Parse error!
-+
-     this->setValue(Val);
-     this->setPosition(pos);
-     return false;
-@@ -1145,7 +1503,7 @@
-     return Parser.getValueExpectedFlagDefault();
-   }
-   void
--  getExtraOptionNames(SmallVectorImpl<const char *> &OptionNames) override {
-+  getExtraOptionNames(std::vector<const char *> &OptionNames) override {
-     return Parser.getExtraOptionNames(OptionNames);
-   }
- 
-@@ -1170,11 +1528,33 @@
-   }
- 
- public:
-+  opt() : Option(), opt_storage<DataType, ExternalStorage,
-+                                std::is_class<DataType>::value>(),
-+          Parser() { }
-+
-+  opt(const opt &RHS) : Option(RHS),
-+  opt_storage<DataType, ExternalStorage,
-+              std::is_class<DataType>::value>(RHS),
-+  Parser(RHS.Parser) { }
-+
-+  ~opt() { }
-+
-   // setInitialValue - Used by the cl::init modifier...
-   void setInitialValue(const DataType &V) { this->setValue(V, true); }
- 
-   ParserClass &getParser() { return Parser; }
- 
-+  bool setLocation(Option &O, DataType &L) {
-+    bool R = opt_storage<DataType, ExternalStorage,
-+                         std::is_class<DataType>::value>::setLocation(O, L);
-+    return R;
-+  }
-+
-+  void addArgument() {
-+    assert(!NextRegistered && "argument multiply registered!");
-+    Option::registerOption(this);
-+  }
-+
-   template <class T> DataType &operator=(const T &Val) {
-     this->setValue(Val);
-     return this->getValue();
-@@ -1271,6 +1651,23 @@
-     apply(M7, this);
-     done();
-   }
-+  // Nine options...
-+  template <class M0t, class M1t, class M2t, class M3t, class M4t, class M5t,
-+            class M6t, class M7t, class M8t>
-+  opt(const M0t &M0, const M1t &M1, const M2t &M2, const M3t &M3, const M4t &M4,
-+      const M5t &M5, const M6t &M6, const M7t &M7, const M8t &M8)
-+      : Option(Optional, NotHidden) {
-+    apply(M0, this);
-+    apply(M1, this);
-+    apply(M2, this);
-+    apply(M3, this);
-+    apply(M4, this);
-+    apply(M5, this);
-+    apply(M6, this);
-+    apply(M7, this);
-+    apply(M8, this);
-+    done();
-+  }
- };
- 
- EXTERN_TEMPLATE_INSTANTIATION(class opt<unsigned>);
-@@ -1291,10 +1688,12 @@
- 
- public:
-   list_storage() : Location(0) {}
-+  virtual ~list_storage() { }
- 
-   bool setLocation(Option &O, StorageClass &L) {
-     if (Location)
-       return O.error("cl::location(x) specified more than once!");
-+
-     Location = &L;
-     return false;
-   }
-@@ -1312,9 +1711,38 @@
- //
- template <class DataType>
- class list_storage<DataType, bool> : public std::vector<DataType> {
-+private:
-+  list_storage<DataType, bool>(list_storage<DataType, bool> &&RHS) LLVM_DELETED_FUNCTION;
-+  list_storage<DataType, bool>
-+  &&operator=(list_storage<DataType, bool> &&RHS) LLVM_DELETED_FUNCTION;
-+
- public:
-+  list_storage<DataType, bool>() : std::vector<DataType>() { }
-+  list_storage<DataType, bool>(const list_storage<DataType, bool> &RHS)
-+    : std::vector<DataType>(RHS) { }
-+  list_storage<DataType, bool>
-+  &operator=(const list_storage<DataType, bool> &RHS) {
-+    if (this != &RHS)
-+      std::vector<DataType>::operator=(RHS);
-+
-+    return *this;
-+  }
-+
-+  virtual ~list_storage<DataType, bool>() { }
-+
-   template <class T> void addValue(const T &V) {
--    std::vector<DataType>::push_back(V);
-+    T LV(V);
-+    this->push_back(LV);
-+  }
-+
-+  void addValue(const DataType &V) {
-+    DataType LV(V);
-+    std::vector<DataType> &VEC = static_cast<std::vector<DataType>& >(*this);
-+    VEC.push_back(LV);
-+  }
-+
-+  const std::vector<DataType> &getStorage() const {
-+    return static_cast<const std::vector<DataType>& >(*this);
-   }
- };
- 
-@@ -1324,40 +1752,47 @@
- template <class DataType, class Storage = bool,
-           class ParserClass = parser<DataType>>
- class list : public Option, public list_storage<DataType, Storage> {
-+  friend class Option;
-+
-   std::vector<unsigned> Positions;
-   ParserClass Parser;
- 
--  enum ValueExpected getValueExpectedFlagDefault() const override {
-+protected:
-+  virtual enum ValueExpected getValueExpectedFlagDefault() const override {
-     return Parser.getValueExpectedFlagDefault();
-   }
--  void
--  getExtraOptionNames(SmallVectorImpl<const char *> &OptionNames) override {
-+
-+  virtual void
-+  getExtraOptionNames(std::vector<const char *> &OptionNames) override {
-     return Parser.getExtraOptionNames(OptionNames);
-   }
- 
--  bool handleOccurrence(unsigned pos, StringRef ArgName,
--                        StringRef Arg) override {
-+  virtual bool handleOccurrence(unsigned pos, StringRef ArgName,
-+                                StringRef Arg) override {
-     typename ParserClass::parser_data_type Val =
-         typename ParserClass::parser_data_type();
-+
-     if (Parser.parse(*this, ArgName, Arg, Val))
-       return true; // Parse Error!
--    list_storage<DataType, Storage>::addValue(Val);
-+
-+    this->addValue(Val);
-     setPosition(pos);
-     Positions.push_back(pos);
-     return false;
-   }
- 
-   // Forward printing stuff to the parser...
--  size_t getOptionWidth() const override {
-+  virtual size_t getOptionWidth() const override {
-     return Parser.getOptionWidth(*this);
-   }
--  void printOptionInfo(size_t GlobalWidth) const override {
-+
-+  virtual void printOptionInfo(size_t GlobalWidth) const override {
-     Parser.printOptionInfo(*this, GlobalWidth);
-   }
- 
-   // Unimplemented: list options don't currently store their default value.
--  void printOptionValue(size_t /*GlobalWidth*/, bool /*Force*/) const override {
--  }
-+  virtual void
-+  printOptionValue(size_t GlobalWidth, bool Force) const override { }
- 
-   void done() {
-     addArgument();
-@@ -1365,8 +1800,26 @@
-   }
- 
- public:
-+  list() : Option(), list_storage<DataType, Storage>(),
-+  Positions(), Parser(ParserClass()) { }
-+
-+  list(const Option &O)
-+  : Option(O), list_storage<DataType, Storage>(),
-+  Positions(), Parser(ParserClass()) { }
-+
-+  list(Option *O)
-+  : Option(*O), list_storage<DataType, Storage>(),
-+  Positions(), Parser(ParserClass()) { }
-+
-+  ~list() { }
-+
-   ParserClass &getParser() { return Parser; }
- 
-+  void addArgument() {
-+    assert(!NextRegistered && "argument multiply registered!");
-+    Option::registerOption(this);
-+  }
-+
-   unsigned getPosition(unsigned optnum) const {
-     assert(optnum < this->size() && "Invalid option index");
-     return Positions[optnum];
-@@ -1500,6 +1953,7 @@
-   bool setLocation(Option &O, unsigned &L) {
-     if (Location)
-       return O.error("cl::location(x) specified more than once!");
-+
-     Location = &L;
-     return false;
-   }
-@@ -1551,12 +2005,12 @@
-     return Parser.getValueExpectedFlagDefault();
-   }
-   void
--  getExtraOptionNames(SmallVectorImpl<const char *> &OptionNames) override {
-+  getExtraOptionNames(std::vector<const char *> &OptionNames) override {
-     return Parser.getExtraOptionNames(OptionNames);
-   }
- 
--  bool handleOccurrence(unsigned pos, StringRef ArgName,
--                        StringRef Arg) override {
-+  virtual bool handleOccurrence(unsigned pos, StringRef ArgName,
-+                                StringRef Arg) override {
-     typename ParserClass::parser_data_type Val =
-         typename ParserClass::parser_data_type();
-     if (Parser.parse(*this, ArgName, Arg, Val))
-@@ -1690,14 +2144,17 @@
- 
- class alias : public Option {
-   Option *AliasFor;
--  bool handleOccurrence(unsigned pos, StringRef /*ArgName*/,
--                        StringRef Arg) override {
-+  virtual bool handleOccurrence(unsigned pos, StringRef ArgName,
-+                                StringRef Arg) override {
-+
-     return AliasFor->handleOccurrence(pos, AliasFor->ArgStr, Arg);
-   }
--  bool addOccurrence(unsigned pos, StringRef /*ArgName*/, StringRef Value,
--                     bool MultiArg = false) override {
-+
-+  virtual bool addOccurrence(unsigned pos, StringRef ArgName, StringRef Value,
-+                             bool MultiArg = false) override {
-     return AliasFor->addOccurrence(pos, AliasFor->ArgStr, Value, MultiArg);
-   }
-+
-   // Handle printing stuff...
-   size_t getOptionWidth() const override;
-   void printOptionInfo(size_t GlobalWidth) const override;
-@@ -1847,7 +2304,7 @@
- /// lines and end of the response file to be marked with a nullptr string.
- /// \param [out] NewArgv All parsed strings are appended to NewArgv.
- void TokenizeGNUCommandLine(StringRef Source, StringSaver &Saver,
--                            SmallVectorImpl<const char *> &NewArgv,
-+                            std::vector<const char *> &NewArgv,
-                             bool MarkEOLs = false);
- 
- /// \brief Tokenizes a Windows command line which may contain quotes and escaped
-@@ -1862,13 +2319,13 @@
- /// lines and end of the response file to be marked with a nullptr string.
- /// \param [out] NewArgv All parsed strings are appended to NewArgv.
- void TokenizeWindowsCommandLine(StringRef Source, StringSaver &Saver,
--                                SmallVectorImpl<const char *> &NewArgv,
-+                                std::vector<const char *> &NewArgv,
-                                 bool MarkEOLs = false);
- 
- /// \brief String tokenization function type.  Should be compatible with either
- /// Windows or Unix command line tokenizers.
- typedef void (*TokenizerCallback)(StringRef Source, StringSaver &Saver,
--                                  SmallVectorImpl<const char *> &NewArgv,
-+                                  std::vector<const char *> &NewArgv,
-                                   bool MarkEOLs);
- 
- /// \brief Expand response files on a command line recursively using the given
-@@ -1886,7 +2343,7 @@
- /// with nullptrs in the Argv vector.
- /// \return true if all @files were expanded successfully or there were none.
- bool ExpandResponseFiles(StringSaver &Saver, TokenizerCallback Tokenizer,
--                         SmallVectorImpl<const char *> &Argv,
-+                         std::vector<const char *> &Argv,
-                          bool MarkEOLs = false);
- 
- } // End namespace cl
---- include/llvm/Support/FileSystem.h	2014-12-15 19:10:29.000000000 -0800
-+++ include/llvm/Support/FileSystem.h	2016-01-24 21:14:49.000000000 -0800
-@@ -680,10 +680,35 @@
- 
- public:
-   explicit directory_entry(const Twine &path, file_status st = file_status())
--    : Path(path.str())
--    , Status(st) {}
-+    : Path(path.str()), Status(st) { }
- 
--  directory_entry() {}
-+  directory_entry() : Path(""), Status(file_status()) { }
-+
-+  directory_entry(const directory_entry &rhs)
-+  : Path(rhs.Path), Status(rhs.Status) { }
-+
-+  directory_entry(directory_entry &&rhs)
-+  : Path(rhs.Path), Status(rhs.Status) { }
-+
-+  ~directory_entry() { }
-+
-+  directory_entry &operator=(const directory_entry &rhs) {
-+    if (this != &rhs) {
-+      Path = rhs.Path;
-+      Status = rhs.Status;
-+    }
-+
-+    return *this;
-+  }
-+
-+  directory_entry &operator=(directory_entry &&rhs) {
-+    if (this != &rhs) {
-+      Path = rhs.Path;
-+      Status = rhs.Status;
-+    }
-+
-+    return *this;
-+  }
- 
-   void assign(const Twine &path, file_status st = file_status()) {
-     Path = path.str();
---- include/llvm/Support/PluginLoader.h	2007-12-29 11:59:42.000000000 -0800
-+++ include/llvm/Support/PluginLoader.h	2016-01-24 11:01:53.000000000 -0800
-@@ -22,6 +22,8 @@
- namespace llvm {
-   struct PluginLoader {
-     void operator=(const std::string &Filename);
-+    bool operator==(const std::string &Filename) const;
-+    bool operator!=(const std::string &Filename) const;
-     static unsigned getNumPlugins();
-     static std::string& getPlugin(unsigned num);
-   };
---- utils/TableGen/AsmMatcherEmitter.cpp	2015-01-03 00:16:29.000000000 -0800
-+++ utils/TableGen/AsmMatcherEmitter.cpp	2016-01-26 14:57:52.000000000 -0800
-@@ -121,7 +121,7 @@
- #define DEBUG_TYPE "asm-matcher-emitter"
- 
- static cl::opt<std::string>
--MatchPrefix("match-prefix", cl::init(""),
-+MatchPrefix("match-prefix", cl::init(std::string("")),
-             cl::desc("Only match instructions with the given prefix"));
- 
- namespace {
---- tools/llc/llc.cpp	2014-12-11 23:52:06.000000000 -0800
-+++ tools/llc/llc.cpp	2016-01-26 14:44:02.000000000 -0800
-@@ -50,13 +50,14 @@
- // and back-end code generation options are specified with the target machine.
- //
- static cl::opt<std::string>
--InputFilename(cl::Positional, cl::desc("<input bitcode>"), cl::init("-"));
-+InputFilename(cl::Positional, cl::desc("<input bitcode>"),
-+              cl::init(std::string("-")));
- 
- static cl::opt<std::string>
- OutputFilename("o", cl::desc("Output filename"), cl::value_desc("filename"));
- 
- static cl::opt<unsigned>
--TimeCompilations("time-compilations", cl::Hidden, cl::init(1u),
-+TimeCompilations("time-compilations", cl::Hidden, cl::init(1U),
-                  cl::value_desc("N"),
-                  cl::desc("Repeat compilation N times for timing"));
- 
-@@ -65,13 +66,15 @@
-                       cl::desc("Disable integrated assembler"));
- 
- // Determine optimization level.
-+// ORIGINAL:
- static cl::opt<char>
- OptLevel("O",
-          cl::desc("Optimization level. [-O0, -O1, -O2, or -O3] "
-                   "(default = '-O2')"),
-          cl::Prefix,
--         cl::ZeroOrMore,
--         cl::init(' '));
-+         cl::Optional,
-+         cl::ValueRequired,
-+         cl::init('2'));
- 
- static cl::opt<std::string>
- TargetTriple("mtriple", cl::desc("Override target triple for module"));
---- tools/llvm-as/llvm-as.cpp	2014-08-25 11:16:47.000000000 -0700
-+++ tools/llvm-as/llvm-as.cpp	2016-01-26 15:07:18.000000000 -0800
-@@ -15,6 +15,8 @@
- //
- //===----------------------------------------------------------------------===//
- 
-+#include "llvm/Support/CommandLine.h"
-+
- #include "llvm/IR/LLVMContext.h"
- #include "llvm/AsmParser/Parser.h"
- #include "llvm/Bitcode/ReaderWriter.h"
-@@ -28,11 +30,21 @@
- #include "llvm/Support/SourceMgr.h"
- #include "llvm/Support/SystemUtils.h"
- #include "llvm/Support/ToolOutputFile.h"
--#include <memory>
- using namespace llvm;
- 
-+#include <memory>
-+#include <string>
-+
-+static cl::opt<std::string>
-+HiddenOption("h", cl::Hidden, cl::desc("hidden option"),
-+             cl::init(""));
-+
- static cl::opt<std::string>
--InputFilename(cl::Positional, cl::desc("<input .llvm file>"), cl::init("-"));
-+InputFilename(cl::Positional, cl::desc("<input file>"),
-+              cl::NotHidden,
-+              cl::Optional,
-+              cl::init(std::string("-")),
-+              cl::ValuePositionalNoArgs);
- 
- static cl::opt<std::string>
- OutputFilename("o", cl::desc("Override output filename"),
---- tools/llvm-dis/llvm-dis.cpp	2015-01-09 16:07:30.000000000 -0800
-+++ tools/llvm-dis/llvm-dis.cpp	2016-02-01 12:08:04.531107200 -0800
-@@ -38,7 +38,8 @@
- using namespace llvm;
- 
- static cl::opt<std::string>
--InputFilename(cl::Positional, cl::desc("<input bitcode>"), cl::init("-"));
-+InputFilename(cl::Positional, cl::desc("<input bitcode>"),
-+              cl::init(std::string("-")));
- 
- static cl::opt<std::string>
- OutputFilename("o", cl::desc("Override output filename"),
---- tools/bugpoint/OptimizerDriver.cpp	2014-11-07 13:30:36.000000000 -0800
-+++ tools/bugpoint/OptimizerDriver.cpp	2016-01-26 15:51:53.000000000 -0800
-@@ -46,7 +46,7 @@
-   // ChildOutput - This option captures the name of the child output file that
-   // is set up by the parent bugpoint process
-   cl::opt<std::string> ChildOutput("child-output", cl::ReallyHidden);
--  cl::opt<std::string> OptCmd("opt-command", cl::init(""),
-+  cl::opt<std::string> OptCmd("opt-command", cl::init(std::string("")),
-                               cl::desc("Path to opt. (default: search path "
-                                        "for 'opt'.)"));
- }
---- tools/opt/opt.cpp	2014-12-11 23:52:14.000000000 -0800
-+++ tools/opt/opt.cpp	2016-01-26 14:43:37.000000000 -0800
-@@ -72,7 +72,7 @@
- //
- static cl::opt<std::string>
- InputFilename(cl::Positional, cl::desc("<input bitcode file>"),
--    cl::init("-"), cl::value_desc("filename"));
-+    cl::init(std::string("-")), cl::value_desc("filename"));
- 
- static cl::opt<std::string>
- OutputFilename("o", cl::desc("Override output filename"),
-@@ -175,7 +175,7 @@
- static cl::opt<std::string>
- DefaultDataLayout("default-data-layout",
-           cl::desc("data layout string to use if not specified by module"),
--          cl::value_desc("layout-string"), cl::init(""));
-+          cl::value_desc("layout-string"), cl::init(std::string("")));
- 
- 
- 
---- unittests/Support/CommandLineTest.cpp	2014-08-22 12:29:17.000000000 -0700
-+++ unittests/Support/CommandLineTest.cpp	2016-01-27 11:20:39.000000000 -0800
-@@ -7,12 +7,17 @@
- //
- //===----------------------------------------------------------------------===//
- 
-+#ifndef SKIP_ENVIRONMENT_TESTS
-+#define SKIP_ENVIRONMENT_TESTS 1
-+#endif
-+
- #include "llvm/ADT/STLExtras.h"
- #include "llvm/Config/config.h"
- #include "llvm/Support/CommandLine.h"
- #include "gtest/gtest.h"
- #include <stdlib.h>
- #include <string>
-+#include <vector>
- 
- using namespace llvm;
- 
-@@ -47,21 +52,23 @@
-   typedef cl::opt<T> Base;
- public:
-   // One option...
--  template<class M0t>
--  explicit StackOption(const M0t &M0) : Base(M0) {}
-+  template<typename T0>
-+  explicit StackOption(const T0 &M0) : cl::opt<T>(M0) { }
- 
-   // Two options...
--  template<class M0t, class M1t>
--  StackOption(const M0t &M0, const M1t &M1) : Base(M0, M1) {}
-+  template<typename T0, typename T1>
-+  explicit StackOption(const T0 &M0, const T1 &M1) : cl::opt<T>(M0, M1) { }
- 
-   // Three options...
--  template<class M0t, class M1t, class M2t>
--  StackOption(const M0t &M0, const M1t &M1, const M2t &M2) : Base(M0, M1, M2) {}
-+  template<typename T0, typename T1, typename T2>
-+  explicit StackOption(const T0 &M0, const T1 &M1, const T2 &M2)
-+  : cl::opt<T>(M0, M1, M2) { }
- 
-   // Four options...
--  template<class M0t, class M1t, class M2t, class M3t>
--  StackOption(const M0t &M0, const M1t &M1, const M2t &M2, const M3t &M3)
--    : Base(M0, M1, M2, M3) {}
-+  template<typename T0, typename T1, typename T2, typename T3>
-+  explicit StackOption(const T0 &M0, const T1 &M1,
-+                       const T2 &M2, const T3 &M3)
-+  : cl::opt<T>(M0, M1, M2, M3) { }
- 
-   ~StackOption() {
-     this->removeArgument();
-@@ -112,7 +119,7 @@
- 
- const char test_env_var[] = "LLVM_TEST_COMMAND_LINE_FLAGS";
- 
--cl::opt<std::string> EnvironmentTestOption("env-test-opt");
-+static cl::opt<std::string> EnvironmentTestOption("env-test-opt");
- TEST(CommandLineTest, ParseEnvironment) {
-   TempEnvVar TEV(test_env_var, "-env-test-opt=hello");
-   EXPECT_EQ("", EnvironmentTestOption);
-@@ -153,12 +160,13 @@
- };
- 
- typedef void ParserFunction(StringRef Source, llvm::cl::StringSaver &Saver,
--                            SmallVectorImpl<const char *> &NewArgv,
-+                            std::vector<const char*> &NewArgv,
-                             bool MarkEOLs);
- 
- void testCommandLineTokenizer(ParserFunction *parse, const char *Input,
--                              const char *const Output[], size_t OutputSize) {
--  SmallVector<const char *, 0> Actual;
-+                              std::vector<const char*> &Output,
-+                              size_t OutputSize) {
-+  std::vector<const char*> Actual;
-   StrDupSaver Saver;
-   parse(Input, Saver, Actual, /*MarkEOLs=*/false);
-   EXPECT_EQ(OutputSize, Actual.size());
-@@ -175,7 +183,12 @@
-   const char *const Output[] = { "foo bar", "foo bar", "foo bar", "foo\\bar",
-                                  "foobarbaz", "C:\\src\\foo.cpp",
-                                  "C:\\src\\foo.cpp" };
--  testCommandLineTokenizer(cl::TokenizeGNUCommandLine, Input, Output,
-+
-+  std::vector<const char*> OutputVector;
-+  for (unsigned I = 0; I < array_lengthof(Output); ++I)
-+    OutputVector.push_back(Output[I]);
-+
-+  testCommandLineTokenizer(cl::TokenizeGNUCommandLine, Input, OutputVector,
-                            array_lengthof(Output));
- }
- 
-@@ -184,10 +197,17 @@
-                       "\"st \\\"u\" \\v";
-   const char *const Output[] = { "a\\b", "c\\\\d", "e\\f g", "h\"i", "j\\\"k",
-                                  "lmn", "o", "pqr", "st \"u", "\\v" };
--  testCommandLineTokenizer(cl::TokenizeWindowsCommandLine, Input, Output,
-+
-+  std::vector<const char*> OutputVector;
-+  for (unsigned I = 0; I < array_lengthof(Output); ++I)
-+    OutputVector.push_back(Output[I]);
-+
-+  testCommandLineTokenizer(cl::TokenizeWindowsCommandLine, Input, OutputVector,
-                            array_lengthof(Output));
- }
- 
-+#ifndef ALIAS_WITH_ARGUMENT_TESTS_ARE_BROKEN
-+// This test case is 100% broken.
- TEST(CommandLineTest, AliasesWithArguments) {
-   static const size_t ARGC = 3;
-   const char *const Inputs[][ARGC] = {
-@@ -201,7 +221,6 @@
-     StackOption<std::string> Actual("actual");
-     StackOption<bool> Extra("extra");
-     StackOption<std::string> Input(cl::Positional);
--
-     cl::alias Alias("alias", llvm::cl::aliasopt(Actual));
- 
-     cl::ParseCommandLineOptions(ARGC, Inputs[i]);
-@@ -211,6 +230,7 @@
-     Alias.removeArgument();
-   }
- }
-+#endif
- 
- void testAliasRequired(int argc, const char *const *argv) {
-   StackOption<std::string> Option("option", cl::Required);
---- utils/FileCheck/FileCheck.cpp	2014-11-18 18:56:00.000000000 -0800
-+++ utils/FileCheck/FileCheck.cpp	2016-02-01 13:52:04.699904440 -0800
-@@ -40,7 +40,8 @@
- 
- static cl::opt<std::string>
- InputFilename("input-file", cl::desc("File to check (defaults to stdin)"),
--              cl::init("-"), cl::value_desc("filename"));
-+              cl::value_desc("filename"),
-+              cl::init(std::string("-")));
- 
- static cl::list<std::string>
- CheckPrefixes("check-prefix",
---- include/llvm/LinkAllPasses.h	2015-01-14 03:23:27.000000000 -0800
-+++ include/llvm/LinkAllPasses.h	2016-02-01 09:24:47.493918163 -0800
-@@ -15,6 +15,7 @@
- #ifndef LLVM_LINKALLPASSES_H
- #define LLVM_LINKALLPASSES_H
- 
-+#include "llvm/Analysis/AliasAnalysis.h"
- #include "llvm/Analysis/AliasSetTracker.h"
- #include "llvm/Analysis/CallPrinter.h"
- #include "llvm/Analysis/DomPrinter.h"
-@@ -35,10 +36,12 @@
- #include "llvm/Transforms/Utils/SymbolRewriter.h"
- #include "llvm/Transforms/Utils/UnifyFunctionExitNodes.h"
- #include "llvm/Transforms/Vectorize.h"
-+
- #include <cstdlib>
- 
- namespace {
-   struct ForcePassLinking {
-+    __attribute__((used, noinline))
-     ForcePassLinking() {
-       // We must reference the passes in such a way that compilers will not
-       // delete it all as dead code, even with whole program optimization,
-@@ -47,6 +50,8 @@
-       if (std::getenv("bar") != (char*) -1)
-         return;
- 
-+      asm("");
-+
-       (void) llvm::createAAEvalPass();
-       (void) llvm::createAggressiveDCEPass();
-       (void) llvm::createAliasAnalysisCounterPass();
-@@ -148,9 +153,13 @@
-       (void) llvm::createMetaRenamerPass();
-       (void) llvm::createFunctionAttrsPass();
-       (void) llvm::createMergeFunctionsPass();
--      (void) llvm::createPrintModulePass(*(llvm::raw_ostream*)nullptr);
--      (void) llvm::createPrintFunctionPass(*(llvm::raw_ostream*)nullptr);
--      (void) llvm::createPrintBasicBlockPass(*(llvm::raw_ostream*)nullptr);
-+
-+      std::string S;
-+      llvm::raw_string_ostream RSO(S);
-+
-+      (void) llvm::createPrintModulePass(RSO);
-+      (void) llvm::createPrintFunctionPass(RSO);
-+      (void) llvm::createPrintBasicBlockPass(RSO);
-       (void) llvm::createModuleDebugInfoPrinterPass();
-       (void) llvm::createPartialInliningPass();
-       (void) llvm::createLintPass();
-@@ -167,13 +176,20 @@
-       (void) llvm::createSeparateConstOffsetFromGEPPass();
-       (void) llvm::createRewriteSymbolsPass();
- 
--      (void)new llvm::IntervalPartition();
--      (void)new llvm::ScalarEvolution();
--      ((llvm::Function*)nullptr)->viewCFGOnly();
-+      llvm::IntervalPartition *LIP = new llvm::IntervalPartition();
-+      (void) LIP;
-+
-+      llvm::ScalarEvolution *LSE = new llvm::ScalarEvolution();
-+      (void) LSE;
-+
-+      llvm::Function *F =
-+        llvm::Function::Create(nullptr, llvm::GlobalValue::ExternalLinkage);
-+      F->viewCFGOnly();
-+
-       llvm::RGPassManager RGM;
--      ((llvm::RegionPass*)nullptr)->runOnRegion((llvm::Region*)nullptr, RGM);
--      llvm::AliasSetTracker X(*(llvm::AliasAnalysis*)nullptr);
--      X.add(nullptr, 0, llvm::AAMDNodes()); // for -print-alias-sets
-+      llvm::AliasAnalysis LAA;
-+      llvm::AliasSetTracker LAST(LAA);
-+      LAST.add(nullptr, 0, llvm::AAMDNodes()); // for -print-alias-sets
-     }
-   } ForcePassLinking; // Force link by creating a global definition.
- }