Fix and recommit r339382 based on solution from RSmith:

As sent on cfe-commits:
 "You need to use "friend TrailingObjects;" here, not
 "friend class TrailingObjects;", to avoid breaking MSVC
 (which doesn't implement injected-class-names quite according to spec)."

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@339389 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/clang/Sema/ParsedAttr.h b/include/clang/Sema/ParsedAttr.h
index 1c7d001f036f10cf6af7ddcb73d7b4e37281cd35..34eb59eb43345f4fdb7d1d3c8a994cc9aaf80bb5 100644 (file)
--- a/include/clang/Sema/ParsedAttr.h
+++ b/include/clang/Sema/ParsedAttr.h
@@ -118,9 +118,7 @@ class ParsedAttr final
     : private llvm::TrailingObjects<
           ParsedAttr, ArgsUnion, detail::AvailabilityData,
           detail::TypeTagForDatatypeData, ParsedType, detail::PropertyData> {
-  friend class llvm::TrailingObjects<
-      ParsedAttr, ArgsUnion, detail::AvailabilityData,
-      detail::TypeTagForDatatypeData, ParsedType, detail::PropertyData>;
+  friend TrailingObjects;
 
   size_t numTrailingObjects(OverloadToken<ArgsUnion>) const { return NumArgs; }
   size_t numTrailingObjects(OverloadToken<detail::AvailabilityData>) const {