Index: include/llvm/Support/CommandLine.h
===================================================================
--- include/llvm/Support/CommandLine.h
+++ include/llvm/Support/CommandLine.h
@@ -22,7 +22,6 @@
 
 #include "llvm/ADT/ArrayRef.h"
 #include "llvm/ADT/SmallVector.h"
-#include "llvm/ADT/StringMap.h"
 #include "llvm/ADT/Twine.h"
 #include "llvm/Support/Compiler.h"
 #include <cassert>
@@ -34,6 +33,7 @@
 namespace llvm {
 
 class StringSaver;
+template <typename T, typename Allocator> class StringMap;
 
 /// cl Namespace - This namespace contains all of the command line option
 /// processing machinery.  It is intentionally a short name to make qualified
@@ -1669,7 +1669,7 @@
 /// Hopefully this API can be depricated soon. Any situation where options need
 /// to be modified by tools or libraries should be handled by sane APIs rather
 /// than just handing around a global list.
-StringMap<Option *> &getRegisteredOptions();
+StringMap<Option *, BumpPtrAllocator> &getRegisteredOptions();
 
 //===----------------------------------------------------------------------===//
 // Standalone command line processing utilities.
Index: lib/Support/CommandLine.cpp
===================================================================
--- lib/Support/CommandLine.cpp
+++ lib/Support/CommandLine.cpp
@@ -96,14 +96,15 @@
 
   SmallVector<Option *, 4> PositionalOpts;
   SmallVector<Option *, 4> SinkOpts;
-  StringMap<Option *> OptionsMap;
+  StringMap<Option *, BumpPtrAllocator> OptionsMap;
 
   Option *ConsumeAfterOpt; // The ConsumeAfter option if it exists.
 
   // This collects the different option categories that have been registered.
   SmallPtrSet<OptionCategory *, 16> RegisteredOptionCategories;
 
-  CommandLineParser() : ProgramOverview(nullptr), ConsumeAfterOpt(nullptr) {}
+  CommandLineParser()
+      : ProgramOverview(nullptr), OptionsMap(512), ConsumeAfterOpt(nullptr) {}
 
   void ParseCommandLineOptions(int argc, const char *const *argv,
                                const char *Overview);
@@ -277,9 +278,10 @@
 /// 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.
-static Option *LookupNearestOption(StringRef Arg,
-                                   const StringMap<Option *> &OptionsMap,
-                                   std::string &NearestString) {
+static Option *
+LookupNearestOption(StringRef Arg,
+                    const StringMap<Option *, BumpPtrAllocator> &OptionsMap,
+                    std::string &NearestString) {
   // Reject all dashes.
   if (Arg.empty())
     return nullptr;
@@ -428,9 +430,9 @@
 // see if there options that satisfy the predicate.  If we find one, return it,
 // otherwise return null.
 //
-static Option *getOptionPred(StringRef Name, size_t &Length,
-                             bool (*Pred)(const Option *),
-                             const StringMap<Option *> &OptionsMap) {
+static Option *
+getOptionPred(StringRef Name, size_t &Length, bool (*Pred)(const Option *),
+              const StringMap<Option *, BumpPtrAllocator> &OptionsMap) {
 
   StringMap<Option *>::const_iterator OMI = OptionsMap.find(Name);
 
@@ -453,10 +455,9 @@
 /// with at least one '-') does not fully match an available option.  Check to
 /// 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,
-                              bool &ErrorParsing,
-                              const StringMap<Option *> &OptionsMap) {
+static Option *HandlePrefixedOrGroupedOption(
+    StringRef &Arg, StringRef &Value, bool &ErrorParsing,
+    const StringMap<Option *, BumpPtrAllocator> &OptionsMap) {
   if (Arg.size() == 1)
     return nullptr;
 
@@ -1462,7 +1463,7 @@
 }
 
 // Copy Options into a vector so we can sort them as we like.
-static void sortOpts(StringMap<Option *> &OptMap,
+static void sortOpts(StringMap<Option *, BumpPtrAllocator> &OptMap,
                      SmallVectorImpl<std::pair<const char *, Option *>> &Opts,
                      bool ShowHidden) {
   SmallPtrSet<Option *, 32> OptionSet; // Duplicate option detection.
@@ -1845,7 +1846,7 @@
   ExtraVersionPrinters->push_back(func);
 }
 
-StringMap<Option *> &cl::getRegisteredOptions() {
+StringMap<Option *, BumpPtrAllocator> &cl::getRegisteredOptions() {
   return GlobalParser->OptionsMap;
 }