diff --git a/include/clang/ASTMatchers/Dynamic/VariantValue.h b/include/clang/ASTMatchers/Dynamic/VariantValue.h
index cf805c685f76cf87c7aa4be31f79c140d99f5575..d06b77cc04db0a45623b5edd043c8997e102a6a4 100644
--- a/include/clang/ASTMatchers/Dynamic/VariantValue.h
+++ b/include/clang/ASTMatchers/Dynamic/VariantValue.h
@@ -110,6 +110,9 @@ class VariantMatcher {
         ast_matchers::internal::VariadicOperatorFunction Func,
         ArrayRef<VariantMatcher> InnerMatchers) const;
 
+  protected:
+    ~MatcherOps() {}
+
   private:
     ast_type_traits::ASTNodeKind NodeKind;
   };
@@ -218,7 +221,7 @@ private:
 };
 
 template <typename T>
-struct VariantMatcher::TypedMatcherOps : VariantMatcher::MatcherOps {
+struct VariantMatcher::TypedMatcherOps final : VariantMatcher::MatcherOps {
   TypedMatcherOps()
       : MatcherOps(ast_type_traits::ASTNodeKind::getFromNodeKind<T>()) {}
   typedef ast_matchers::internal::Matcher<T> MatcherT;