Stop using SFINAE to detect whether a derived-class override of Traverse* can

take a queue; some supported versions of GCC believe that this substitution
failure is an error. Instead, use a partial specialization to detect the type
of a pointer to the corresponding member. This is less general, but good enough
for our uses.

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

diff --git a/include/clang/AST/RecursiveASTVisitor.h b/include/clang/AST/RecursiveASTVisitor.h
index 3c5a343e8d63531a09c71b72c723adde75ed2412..d94930f25b5b508ac1bd18f7aad831351896d077 100644 (file)
--- a/include/clang/AST/RecursiveASTVisitor.h
+++ b/include/clang/AST/RecursiveASTVisitor.h
@@ -276,14 +276,11 @@ public:
 // ---- Methods on Stmts ----
 
 private:
-  // Determine if the specified derived-class member M can be passed a
-  // DataRecursionQueue* argument.
-  template<typename P>
-  std::false_type callableWithQueue(...);
-  template<typename P, typename M>
-  std::true_type callableWithQueue(M m, Derived *d = nullptr, P *p = nullptr,
-                                   DataRecursionQueue *q = nullptr,
-                                   decltype((d->*m)(p, q)) = false);
+  template<typename T, typename U>
+  struct has_same_member_pointer_type : std::false_type {};
+  template<typename T, typename U, typename R, typename... P>
+  struct has_same_member_pointer_type<R (T::*)(P...), R (U::*)(P...)>
+      : std::true_type {};
 
   // Traverse the given statement. If the most-derived traverse function takes a
   // data recursion queue, pass it on; otherwise, discard it. Note that the
@@ -291,10 +288,13 @@ private:
   // class can take a queue, so if we're taking the second arm, make the first
   // arm call our function rather than the derived class version.
 #define TRAVERSE_STMT_BASE(NAME, CLASS, VAR, QUEUE)                            \
-  (decltype(callableWithQueue<CLASS>(&Derived::Traverse##NAME))::value         \
+  (has_same_member_pointer_type<decltype(                                      \
+                                    &RecursiveASTVisitor::Traverse##NAME),     \
+                                decltype(&Derived::Traverse##NAME)>::value     \
        ? static_cast<typename std::conditional<                                \
-             decltype(                                                         \
-                 callableWithQueue<CLASS>(&Derived::Traverse##NAME))::value,   \
+             has_same_member_pointer_type<                                     \
+                 decltype(&RecursiveASTVisitor::Traverse##NAME),               \
+                 decltype(&Derived::Traverse##NAME)>::value,                   \
              Derived &, RecursiveASTVisitor &>::type>(*this)                   \
              .Traverse##NAME(static_cast<CLASS *>(VAR), QUEUE)                 \
        : getDerived().Traverse##NAME(static_cast<CLASS *>(VAR)))