diff --git a/llvm/include/llvm/Analysis/MemoryBuiltins.h b/llvm/include/llvm/Analysis/MemoryBuiltins.h
index 7df0b04192688..d080a5956a4d8 100644
--- a/llvm/include/llvm/Analysis/MemoryBuiltins.h
+++ b/llvm/include/llvm/Analysis/MemoryBuiltins.h
@@ -214,7 +214,7 @@ template <typename T, class C> class SizeOffsetType {
 /// SizeOffsetAPInt - Used by \p ObjectSizeOffsetVisitor, which works with
 /// \p APInts.
 class SizeOffsetAPInt : public SizeOffsetType<APInt, SizeOffsetAPInt> {
-  template <typename T, class C> friend class SizeOffsetType;
+  friend class SizeOffsetType;
   static bool known(APInt V) { return V.getBitWidth() > 1; }
 
 public:
@@ -276,7 +276,7 @@ class ObjectSizeOffsetVisitor
 /// \p Values.
 class SizeOffsetWeakTrackingVH;
 class SizeOffsetValue : public SizeOffsetType<Value *, SizeOffsetValue> {
-  template <typename T, class C> friend class SizeOffsetType;
+  friend class SizeOffsetType;
   static bool known(Value *V) { return V != nullptr; }
 
 public:
@@ -289,7 +289,7 @@ class SizeOffsetValue : public SizeOffsetType<Value *, SizeOffsetValue> {
 /// \p DenseMap.
 class SizeOffsetWeakTrackingVH
     : public SizeOffsetType<WeakTrackingVH, SizeOffsetWeakTrackingVH> {
-  template <typename T, class C> friend class SizeOffsetType;
+  friend class SizeOffsetType;
   static bool known(WeakTrackingVH V) { return V.pointsToAliveValue(); }
 
 public: