diff --git a/llvm/include/llvm/Support/CommandLine.h b/llvm/include/llvm/Support/CommandLine.h
--- a/llvm/include/llvm/Support/CommandLine.h
+++ b/llvm/include/llvm/Support/CommandLine.h
@@ -877,7 +877,7 @@
 //--------------------------------------------------
 // parser<bool>
 //
-template <> class parser<bool> final : public basic_parser<bool> {
+template <> class parser<bool> : public basic_parser<bool> {
 public:
   parser(Option &O) : basic_parser(O) {}
 
@@ -898,6 +898,8 @@
 
   // An out-of-line virtual method to provide a 'home' for this class.
   void anchor() override;
+
+  virtual ~parser() = default;
 };
 
 extern template class basic_parser<bool>;
@@ -905,7 +907,7 @@
 //--------------------------------------------------
 // parser<boolOrDefault>
 template <>
-class parser<boolOrDefault> final : public basic_parser<boolOrDefault> {
+class parser<boolOrDefault> : public basic_parser<boolOrDefault> {
 public:
   parser(Option &O) : basic_parser(O) {}
 
@@ -924,6 +926,8 @@
 
   // An out-of-line virtual method to provide a 'home' for this class.
   void anchor() override;
+
+  virtual ~parser() = default;
 };
 
 extern template class basic_parser<boolOrDefault>;
@@ -931,7 +935,7 @@
 //--------------------------------------------------
 // parser<int>
 //
-template <> class parser<int> final : public basic_parser<int> {
+template <> class parser<int> : public basic_parser<int> {
 public:
   parser(Option &O) : basic_parser(O) {}
 
@@ -946,6 +950,8 @@
 
   // An out-of-line virtual method to provide a 'home' for this class.
   void anchor() override;
+
+  virtual ~parser() = default;
 };
 
 extern template class basic_parser<int>;
@@ -953,7 +959,7 @@
 //--------------------------------------------------
 // parser<unsigned>
 //
-template <> class parser<unsigned> final : public basic_parser<unsigned> {
+template <> class parser<unsigned> : public basic_parser<unsigned> {
 public:
   parser(Option &O) : basic_parser(O) {}
 
@@ -968,6 +974,8 @@
 
   // An out-of-line virtual method to provide a 'home' for this class.
   void anchor() override;
+
+  virtual ~parser() = default;
 };
 
 extern template class basic_parser<unsigned>;
@@ -976,7 +984,7 @@
 // parser<unsigned long long>
 //
 template <>
-class parser<unsigned long long> final
+class parser<unsigned long long>
     : public basic_parser<unsigned long long> {
 public:
   parser(Option &O) : basic_parser(O) {}
@@ -993,6 +1001,8 @@
 
   // An out-of-line virtual method to provide a 'home' for this class.
   void anchor() override;
+
+  virtual ~parser() = default;
 };
 
 extern template class basic_parser<unsigned long long>;
@@ -1000,7 +1010,7 @@
 //--------------------------------------------------
 // parser<double>
 //
-template <> class parser<double> final : public basic_parser<double> {
+template <> class parser<double> : public basic_parser<double> {
 public:
   parser(Option &O) : basic_parser(O) {}
 
@@ -1015,6 +1025,8 @@
 
   // An out-of-line virtual method to provide a 'home' for this class.
   void anchor() override;
+
+  virtual ~parser() = default;
 };
 
 extern template class basic_parser<double>;
@@ -1022,7 +1034,7 @@
 //--------------------------------------------------
 // parser<float>
 //
-template <> class parser<float> final : public basic_parser<float> {
+template <> class parser<float> : public basic_parser<float> {
 public:
   parser(Option &O) : basic_parser(O) {}
 
@@ -1037,6 +1049,8 @@
 
   // An out-of-line virtual method to provide a 'home' for this class.
   void anchor() override;
+
+  virtual ~parser() = default;
 };
 
 extern template class basic_parser<float>;
@@ -1044,7 +1058,7 @@
 //--------------------------------------------------
 // parser<std::string>
 //
-template <> class parser<std::string> final : public basic_parser<std::string> {
+template <> class parser<std::string> : public basic_parser<std::string> {
 public:
   parser(Option &O) : basic_parser(O) {}
 
@@ -1062,6 +1076,8 @@
 
   // An out-of-line virtual method to provide a 'home' for this class.
   void anchor() override;
+
+  virtual ~parser() = default;
 };
 
 extern template class basic_parser<std::string>;
@@ -1069,7 +1085,7 @@
 //--------------------------------------------------
 // parser<char>
 //
-template <> class parser<char> final : public basic_parser<char> {
+template <> class parser<char> : public basic_parser<char> {
 public:
   parser(Option &O) : basic_parser(O) {}
 
@@ -1087,6 +1103,8 @@
 
   // An out-of-line virtual method to provide a 'home' for this class.
   void anchor() override;
+
+  virtual ~parser() = default;
 };
 
 extern template class basic_parser<char>;