diff --git a/clang/include/clang/Sema/ParsedAttr.h b/clang/include/clang/Sema/ParsedAttr.h
index 428d3111de80d..9e050ab9a620e 100644
--- a/clang/include/clang/Sema/ParsedAttr.h
+++ b/clang/include/clang/Sema/ParsedAttr.h
@@ -130,9 +130,6 @@ class ParsedAttr final
   size_t numTrailingObjects(OverloadToken<ParsedType>) const {
     return HasParsedType;
   }
-  size_t numTrailingObjects(OverloadToken<detail::PropertyData>) const {
-    return IsProperty;
-  }
 
 private:
   IdentifierInfo *MacroII = nullptr;
diff --git a/clang/include/clang/Sema/ParsedTemplate.h b/clang/include/clang/Sema/ParsedTemplate.h
index cff7f04666358..3a8050f9a0a3d 100644
--- a/clang/include/clang/Sema/ParsedTemplate.h
+++ b/clang/include/clang/Sema/ParsedTemplate.h
@@ -190,9 +190,7 @@ namespace clang {
     bool ArgsInvalid;
 
     /// Retrieves a pointer to the template arguments
-    ParsedTemplateArgument *getTemplateArgs() {
-      return getTrailingObjects<ParsedTemplateArgument>();
-    }
+    ParsedTemplateArgument *getTemplateArgs() { return getTrailingObjects(); }
 
     /// Creates a new TemplateIdAnnotation with NumArgs arguments and
     /// appends it to List.