Merge pull request #7890 from hughbe/msvc-workaround

Author: swift-ci

include/swift/AST/Expr.h

@@ -25,7 +25,6 @@
 #include "swift/AST/TypeAlignments.h"
 #include "swift/AST/TypeLoc.h"
 #include "swift/AST/Availability.h"
-#include "swift/Basic/Compiler.h"
 #include "llvm/Support/TrailingObjects.h"
 
 namespace llvm {
@@ -659,6 +658,14 @@ class alignas(8) Expr {
 template<typename Derived>
 class TrailingCallArguments
     : private llvm::TrailingObjects<Derived, Identifier, SourceLoc> {
+  // We need to friend TrailingObjects twice here to work around an MSVC bug.
+  // If we have two functions of the same name with the parameter
+  // typename TrailingObjectsIdentifier::template OverloadToken<T> where T is
+  // different for each function, then MSVC reports a "member function already
+  // defined or declared" error, which is incorrect.
+  using TrailingObjectsIdentifier = llvm::TrailingObjects<Derived, Identifier>;
+  friend TrailingObjectsIdentifier;
+
   using TrailingObjects = llvm::TrailingObjects<Derived, Identifier, SourceLoc>;
   friend TrailingObjects;
 
@@ -671,12 +678,14 @@ class TrailingCallArguments
   }
 
   size_t numTrailingObjects(
-      SWIFT_TRAILING_OBJECTS_OVERLOAD_TOKEN(Identifier)) const {
+      typename TrailingObjectsIdentifier::template OverloadToken<Identifier>)
+      const {
     return asDerived().getNumArguments();
   }
 
   size_t numTrailingObjects(
-      SWIFT_TRAILING_OBJECTS_OVERLOAD_TOKEN(SourceLoc)) const {
+      typename TrailingObjectsIdentifier::template OverloadToken<SourceLoc>)
+      const {
     return asDerived().hasArgumentLabelLocs() ? asDerived().getNumArguments()
                                               : 0;
   }

include/swift/Basic/Compiler.h

@@ -24,17 +24,8 @@
 // https://connect.microsoft.com/VisualStudio/feedback/details/3116505
 #define SWIFT_DELETE_OPERATOR_DELETED                                          \
   { llvm_unreachable("Delete operator should not be called."); }
-
-// Work around MSVC bug: can't infer llvm::trailing_objects_internal,
-// even though we granted friend access to it.
-// https://connect.microsoft.com/VisualStudio/feedback/details/3116517
-#define SWIFT_TRAILING_OBJECTS_OVERLOAD_TOKEN(TokenType)                       \
-  llvm::trailing_objects_internal::TrailingObjectsBase::OverloadToken<TokenType>
 #else
 #define SWIFT_DELETE_OPERATOR_DELETED = delete;
-
-#define SWIFT_TRAILING_OBJECTS_OVERLOAD_TOKEN(TokenType)                       \
-  typename TrailingObjects::template OverloadToken<TokenType>
 #endif
 
 #endif // SWIFT_BASIC_COMPILER_H

include/swift/SIL/SILInstruction.h

@@ -461,8 +461,8 @@ class UnaryInstructionWithTypeDependentOperandsBase :
     }
   }
 
-  size_t
-      numTrailingObjects(SWIFT_TRAILING_OBJECTS_OVERLOAD_TOKEN(Operand)) const {
+  size_t numTrailingObjects(
+  	  typename TrailingObjects::template OverloadToken<Operand>) const {
     return NumOperands;
   }
 
@@ -2300,8 +2300,8 @@ class BindMemoryInst final :
   SILType getBoundType() const { return BoundType ; }
 
   // Implement llvm::TrailingObjects.
-  size_t
-      numTrailingObjects(SWIFT_TRAILING_OBJECTS_OVERLOAD_TOKEN(Operand)) const {
+  size_t numTrailingObjects(
+  	  typename TrailingObjects::template OverloadToken<Operand>) const {
     return NumOperands;
   }