From: John McCall <rjmccall@apple.com>
Date: Fri, 11 Mar 2016 04:55:21 +0000 (+0000)
Subject: Speculatively attempt to fix the MSVC build by making some
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=705009a24a15e569e7ff54214a7dc760b9eefbfb;p=clang

Speculatively attempt to fix the MSVC build by making some
methods non-private.

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

diff --git a/include/clang/CodeGen/CGFunctionInfo.h b/include/clang/CodeGen/CGFunctionInfo.h
index d8de16a110..b532c794b6 100644
--- a/include/clang/CodeGen/CGFunctionInfo.h
+++ b/include/clang/CodeGen/CGFunctionInfo.h
@@ -492,14 +492,6 @@ class CGFunctionInfo final
     return getTrailingObjects<ExtParameterInfo>();
   }
 
-  size_t numTrailingObjects(OverloadToken<ArgInfo>) const {
-    return NumArgs + 1;
-  }
-  size_t numTrailingObjects(OverloadToken<ExtParameterInfo>) const {
-    return (HasExtParameterInfos ? NumArgs : 0);
-  }
-  friend class TrailingObjects;
-
   CGFunctionInfo() : Required(RequiredArgs::All) {}
 
 public:
@@ -513,6 +505,15 @@ public:
                                 RequiredArgs required);
   void operator delete(void *p) { ::operator delete(p); }
 
+  // Friending class TrailingObjects is apparently not good enough for MSVC,
+  // so these have to be public.
+  size_t numTrailingObjects(OverloadToken<ArgInfo>) const {
+    return NumArgs + 1;
+  }
+  size_t numTrailingObjects(OverloadToken<ExtParameterInfo>) const {
+    return (HasExtParameterInfos ? NumArgs : 0);
+  }
+
   typedef const ArgInfo *const_arg_iterator;
   typedef ArgInfo *arg_iterator;