[llvm] r229324 - Remove LLVM_HAS_VARIADIC_TEMPLATES and all the faux variadic workarounds guarded by it.
Rafael Espíndola
rafael.espindola at gmail.com
Wed Feb 18 12:06:21 PST 2015
awesome!
On 15 February 2015 at 14:34, Benjamin Kramer <benny.kra at googlemail.com> wrote:
> Author: d0k
> Date: Sun Feb 15 13:34:28 2015
> New Revision: 229324
>
> URL: http://llvm.org/viewvc/llvm-project?rev=229324&view=rev
> Log:
> Remove LLVM_HAS_VARIADIC_TEMPLATES and all the faux variadic workarounds guarded by it.
>
> We no longer support compilers without variadic template support.
>
> Modified:
> llvm/trunk/docs/CodingStandards.rst
> llvm/trunk/include/llvm/ADT/Hashing.h
> llvm/trunk/include/llvm/ADT/Optional.h
> llvm/trunk/include/llvm/ADT/STLExtras.h
> llvm/trunk/include/llvm/ADT/SmallVector.h
> llvm/trunk/include/llvm/Support/Compiler.h
>
> Modified: llvm/trunk/docs/CodingStandards.rst
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/docs/CodingStandards.rst?rev=229324&r1=229323&r2=229324&view=diff
> ==============================================================================
> --- llvm/trunk/docs/CodingStandards.rst (original)
> +++ llvm/trunk/docs/CodingStandards.rst Sun Feb 15 13:34:28 2015
> @@ -123,6 +123,7 @@ unlikely to be supported by our host com
>
> * ``override`` and ``final``: N2928_, N3206_, N3272_
> * Atomic operations and the C++11 memory model: N2429_
> +* Variadic templates: N2242_
>
> .. _N2118: http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2006/n2118.html
> .. _N2439: http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2439.htm
> @@ -143,6 +144,7 @@ unlikely to be supported by our host com
> .. _N3206: http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2010/n3206.htm
> .. _N3272: http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2011/n3272.htm
> .. _N2429: http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2429.htm
> +.. _N2242: http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2242.pdf
> .. _MSVC-compatible RTTI: http://llvm.org/PR18951
>
> The supported features in the C++11 standard libraries are less well tracked,
>
> Modified: llvm/trunk/include/llvm/ADT/Hashing.h
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ADT/Hashing.h?rev=229324&r1=229323&r2=229324&view=diff
> ==============================================================================
> --- llvm/trunk/include/llvm/ADT/Hashing.h (original)
> +++ llvm/trunk/include/llvm/ADT/Hashing.h Sun Feb 15 13:34:28 2015
> @@ -55,12 +55,6 @@
> #include <iterator>
> #include <utility>
>
> -// Allow detecting C++11 feature availability when building with Clang without
> -// breaking other compilers.
> -#ifndef __has_feature
> -# define __has_feature(x) 0
> -#endif
> -
> namespace llvm {
>
> /// \brief An opaque object representing a hash code.
> @@ -553,8 +547,6 @@ public:
> return buffer_ptr;
> }
>
> -#if defined(__has_feature) && __has_feature(__cxx_variadic_templates__)
> -
> /// \brief Recursive, variadic combining method.
> ///
> /// This function recurses through each argument, combining that argument
> @@ -568,218 +560,6 @@ public:
> return combine(length, buffer_ptr, buffer_end, args...);
> }
>
> -#else
> - // Manually expanded recursive combining methods. See variadic above for
> - // documentation.
> -
> - template <typename T1, typename T2, typename T3, typename T4, typename T5,
> - typename T6, typename T7, typename T8, typename T9, typename T10,
> - typename T11, typename T12, typename T13, typename T14,
> - typename T15, typename T16, typename T17, typename T18>
> - hash_code combine(size_t length, char *buffer_ptr, char *buffer_end,
> - const T1 &arg1, const T2 &arg2, const T3 &arg3,
> - const T4 &arg4, const T5 &arg5, const T6 &arg6,
> - const T7 &arg7, const T8 &arg8, const T9 &arg9,
> - const T10 &arg10, const T11 &arg11, const T12 &arg12,
> - const T13 &arg13, const T14 &arg14, const T15 &arg15,
> - const T16 &arg16, const T17 &arg17, const T18 &arg18) {
> - buffer_ptr =
> - combine_data(length, buffer_ptr, buffer_end, get_hashable_data(arg1));
> - return combine(length, buffer_ptr, buffer_end, arg2, arg3, arg4, arg5, arg6,
> - arg7, arg8, arg9, arg10, arg11, arg12, arg13, arg14, arg15,
> - arg16, arg17, arg18);
> - }
> - template <typename T1, typename T2, typename T3, typename T4, typename T5,
> - typename T6, typename T7, typename T8, typename T9, typename T10,
> - typename T11, typename T12, typename T13, typename T14,
> - typename T15, typename T16, typename T17>
> - hash_code combine(size_t length, char *buffer_ptr, char *buffer_end,
> - const T1 &arg1, const T2 &arg2, const T3 &arg3,
> - const T4 &arg4, const T5 &arg5, const T6 &arg6,
> - const T7 &arg7, const T8 &arg8, const T9 &arg9,
> - const T10 &arg10, const T11 &arg11, const T12 &arg12,
> - const T13 &arg13, const T14 &arg14, const T15 &arg15,
> - const T16 &arg16, const T17 &arg17) {
> - buffer_ptr =
> - combine_data(length, buffer_ptr, buffer_end, get_hashable_data(arg1));
> - return combine(length, buffer_ptr, buffer_end, arg2, arg3, arg4, arg5, arg6,
> - arg7, arg8, arg9, arg10, arg11, arg12, arg13, arg14, arg15,
> - arg16, arg17);
> - }
> - template <typename T1, typename T2, typename T3, typename T4, typename T5,
> - typename T6, typename T7, typename T8, typename T9, typename T10,
> - typename T11, typename T12, typename T13, typename T14,
> - typename T15, typename T16>
> - hash_code combine(size_t length, char *buffer_ptr, char *buffer_end,
> - const T1 &arg1, const T2 &arg2, const T3 &arg3,
> - const T4 &arg4, const T5 &arg5, const T6 &arg6,
> - const T7 &arg7, const T8 &arg8, const T9 &arg9,
> - const T10 &arg10, const T11 &arg11, const T12 &arg12,
> - const T13 &arg13, const T14 &arg14, const T15 &arg15,
> - const T16 &arg16) {
> - buffer_ptr =
> - combine_data(length, buffer_ptr, buffer_end, get_hashable_data(arg1));
> - return combine(length, buffer_ptr, buffer_end, arg2, arg3, arg4, arg5, arg6,
> - arg7, arg8, arg9, arg10, arg11, arg12, arg13, arg14, arg15,
> - arg16);
> - }
> - template <typename T1, typename T2, typename T3, typename T4, typename T5,
> - typename T6, typename T7, typename T8, typename T9, typename T10,
> - typename T11, typename T12, typename T13, typename T14,
> - typename T15>
> - hash_code combine(size_t length, char *buffer_ptr, char *buffer_end,
> - const T1 &arg1, const T2 &arg2, const T3 &arg3,
> - const T4 &arg4, const T5 &arg5, const T6 &arg6,
> - const T7 &arg7, const T8 &arg8, const T9 &arg9,
> - const T10 &arg10, const T11 &arg11, const T12 &arg12,
> - const T13 &arg13, const T14 &arg14, const T15 &arg15) {
> - buffer_ptr =
> - combine_data(length, buffer_ptr, buffer_end, get_hashable_data(arg1));
> - return combine(length, buffer_ptr, buffer_end, arg2, arg3, arg4, arg5, arg6,
> - arg7, arg8, arg9, arg10, arg11, arg12, arg13, arg14, arg15);
> - }
> - template <typename T1, typename T2, typename T3, typename T4, typename T5,
> - typename T6, typename T7, typename T8, typename T9, typename T10,
> - typename T11, typename T12, typename T13, typename T14>
> - hash_code combine(size_t length, char *buffer_ptr, char *buffer_end,
> - const T1 &arg1, const T2 &arg2, const T3 &arg3,
> - const T4 &arg4, const T5 &arg5, const T6 &arg6,
> - const T7 &arg7, const T8 &arg8, const T9 &arg9,
> - const T10 &arg10, const T11 &arg11, const T12 &arg12,
> - const T13 &arg13, const T14 &arg14) {
> - buffer_ptr =
> - combine_data(length, buffer_ptr, buffer_end, get_hashable_data(arg1));
> - return combine(length, buffer_ptr, buffer_end, arg2, arg3, arg4, arg5, arg6,
> - arg7, arg8, arg9, arg10, arg11, arg12, arg13, arg14);
> - }
> - template <typename T1, typename T2, typename T3, typename T4, typename T5,
> - typename T6, typename T7, typename T8, typename T9, typename T10,
> - typename T11, typename T12, typename T13>
> - hash_code combine(size_t length, char *buffer_ptr, char *buffer_end,
> - const T1 &arg1, const T2 &arg2, const T3 &arg3,
> - const T4 &arg4, const T5 &arg5, const T6 &arg6,
> - const T7 &arg7, const T8 &arg8, const T9 &arg9,
> - const T10 &arg10, const T11 &arg11, const T12 &arg12,
> - const T13 &arg13) {
> - buffer_ptr =
> - combine_data(length, buffer_ptr, buffer_end, get_hashable_data(arg1));
> - return combine(length, buffer_ptr, buffer_end, arg2, arg3, arg4, arg5, arg6,
> - arg7, arg8, arg9, arg10, arg11, arg12, arg13);
> - }
> - template <typename T1, typename T2, typename T3, typename T4, typename T5,
> - typename T6, typename T7, typename T8, typename T9, typename T10,
> - typename T11, typename T12>
> - hash_code combine(size_t length, char *buffer_ptr, char *buffer_end,
> - const T1 &arg1, const T2 &arg2, const T3 &arg3,
> - const T4 &arg4, const T5 &arg5, const T6 &arg6,
> - const T7 &arg7, const T8 &arg8, const T9 &arg9,
> - const T10 &arg10, const T11 &arg11, const T12 &arg12) {
> - buffer_ptr =
> - combine_data(length, buffer_ptr, buffer_end, get_hashable_data(arg1));
> - return combine(length, buffer_ptr, buffer_end, arg2, arg3, arg4, arg5, arg6,
> - arg7, arg8, arg9, arg10, arg11, arg12);
> - }
> - template <typename T1, typename T2, typename T3, typename T4, typename T5,
> - typename T6, typename T7, typename T8, typename T9, typename T10,
> - typename T11>
> - hash_code combine(size_t length, char *buffer_ptr, char *buffer_end,
> - const T1 &arg1, const T2 &arg2, const T3 &arg3,
> - const T4 &arg4, const T5 &arg5, const T6 &arg6,
> - const T7 &arg7, const T8 &arg8, const T9 &arg9,
> - const T10 &arg10, const T11 &arg11) {
> - buffer_ptr =
> - combine_data(length, buffer_ptr, buffer_end, get_hashable_data(arg1));
> - return combine(length, buffer_ptr, buffer_end, arg2, arg3, arg4, arg5, arg6,
> - arg7, arg8, arg9, arg10, arg11);
> - }
> - template <typename T1, typename T2, typename T3, typename T4, typename T5,
> - typename T6, typename T7, typename T8, typename T9, typename T10>
> - hash_code combine(size_t length, char *buffer_ptr, char *buffer_end,
> - const T1 &arg1, const T2 &arg2, const T3 &arg3,
> - const T4 &arg4, const T5 &arg5, const T6 &arg6,
> - const T7 &arg7, const T8 &arg8, const T9 &arg9,
> - const T10 &arg10) {
> - buffer_ptr =
> - combine_data(length, buffer_ptr, buffer_end, get_hashable_data(arg1));
> - return combine(length, buffer_ptr, buffer_end, arg2, arg3, arg4, arg5, arg6,
> - arg7, arg8, arg9, arg10);
> - }
> - template <typename T1, typename T2, typename T3, typename T4, typename T5,
> - typename T6, typename T7, typename T8, typename T9>
> - hash_code combine(size_t length, char *buffer_ptr, char *buffer_end,
> - const T1 &arg1, const T2 &arg2, const T3 &arg3,
> - const T4 &arg4, const T5 &arg5, const T6 &arg6,
> - const T7 &arg7, const T8 &arg8, const T9 &arg9) {
> - buffer_ptr =
> - combine_data(length, buffer_ptr, buffer_end, get_hashable_data(arg1));
> - return combine(length, buffer_ptr, buffer_end, arg2, arg3, arg4, arg5, arg6,
> - arg7, arg8, arg9);
> - }
> - template <typename T1, typename T2, typename T3, typename T4, typename T5,
> - typename T6, typename T7, typename T8>
> - hash_code combine(size_t length, char *buffer_ptr, char *buffer_end,
> - const T1 &arg1, const T2 &arg2, const T3 &arg3,
> - const T4 &arg4, const T5 &arg5, const T6 &arg6,
> - const T7 &arg7, const T8 &arg8) {
> - buffer_ptr =
> - combine_data(length, buffer_ptr, buffer_end, get_hashable_data(arg1));
> - return combine(length, buffer_ptr, buffer_end, arg2, arg3, arg4, arg5, arg6,
> - arg7, arg8);
> - }
> - template <typename T1, typename T2, typename T3, typename T4, typename T5,
> - typename T6, typename T7>
> - hash_code combine(size_t length, char *buffer_ptr, char *buffer_end,
> - const T1 &arg1, const T2 &arg2, const T3 &arg3,
> - const T4 &arg4, const T5 &arg5, const T6 &arg6,
> - const T7 &arg7) {
> - buffer_ptr =
> - combine_data(length, buffer_ptr, buffer_end, get_hashable_data(arg1));
> - return combine(length, buffer_ptr, buffer_end, arg2, arg3, arg4, arg5, arg6,
> - arg7);
> - }
> - template <typename T1, typename T2, typename T3, typename T4, typename T5,
> - typename T6>
> - hash_code combine(size_t length, char *buffer_ptr, char *buffer_end,
> - const T1 &arg1, const T2 &arg2, const T3 &arg3,
> - const T4 &arg4, const T5 &arg5, const T6 &arg6) {
> - buffer_ptr = combine_data(length, buffer_ptr, buffer_end, get_hashable_data(arg1));
> - return combine(length, buffer_ptr, buffer_end, arg2, arg3, arg4, arg5, arg6);
> - }
> - template <typename T1, typename T2, typename T3, typename T4, typename T5>
> - hash_code combine(size_t length, char *buffer_ptr, char *buffer_end,
> - const T1 &arg1, const T2 &arg2, const T3 &arg3,
> - const T4 &arg4, const T5 &arg5) {
> - buffer_ptr = combine_data(length, buffer_ptr, buffer_end, get_hashable_data(arg1));
> - return combine(length, buffer_ptr, buffer_end, arg2, arg3, arg4, arg5);
> - }
> - template <typename T1, typename T2, typename T3, typename T4>
> - hash_code combine(size_t length, char *buffer_ptr, char *buffer_end,
> - const T1 &arg1, const T2 &arg2, const T3 &arg3,
> - const T4 &arg4) {
> - buffer_ptr = combine_data(length, buffer_ptr, buffer_end, get_hashable_data(arg1));
> - return combine(length, buffer_ptr, buffer_end, arg2, arg3, arg4);
> - }
> - template <typename T1, typename T2, typename T3>
> - hash_code combine(size_t length, char *buffer_ptr, char *buffer_end,
> - const T1 &arg1, const T2 &arg2, const T3 &arg3) {
> - buffer_ptr = combine_data(length, buffer_ptr, buffer_end, get_hashable_data(arg1));
> - return combine(length, buffer_ptr, buffer_end, arg2, arg3);
> - }
> - template <typename T1, typename T2>
> - hash_code combine(size_t length, char *buffer_ptr, char *buffer_end,
> - const T1 &arg1, const T2 &arg2) {
> - buffer_ptr = combine_data(length, buffer_ptr, buffer_end, get_hashable_data(arg1));
> - return combine(length, buffer_ptr, buffer_end, arg2);
> - }
> - template <typename T1>
> - hash_code combine(size_t length, char *buffer_ptr, char *buffer_end,
> - const T1 &arg1) {
> - buffer_ptr = combine_data(length, buffer_ptr, buffer_end, get_hashable_data(arg1));
> - return combine(length, buffer_ptr, buffer_end);
> - }
> -
> -#endif
> -
> /// \brief Base case for recursive, variadic combining.
> ///
> /// The base case when combining arguments recursively is reached when all
> @@ -808,9 +588,6 @@ public:
> } // namespace detail
> } // namespace hashing
>
> -
> -#if __has_feature(__cxx_variadic_templates__)
> -
> /// \brief Combine values into a single hash_code.
> ///
> /// This routine accepts a varying number of arguments of any type. It will
> @@ -828,196 +605,6 @@ template <typename ...Ts> hash_code hash
> return helper.combine(0, helper.buffer, helper.buffer + 64, args...);
> }
>
> -#else
> -
> -// What follows are manually exploded overloads for each argument width. See
> -// the above variadic definition for documentation and specification.
> -
> -template <typename T1, typename T2, typename T3, typename T4, typename T5,
> - typename T6, typename T7, typename T8, typename T9, typename T10,
> - typename T11, typename T12, typename T13, typename T14, typename T15,
> - typename T16, typename T17, typename T18>
> -hash_code hash_combine(const T1 &arg1, const T2 &arg2, const T3 &arg3,
> - const T4 &arg4, const T5 &arg5, const T6 &arg6,
> - const T7 &arg7, const T8 &arg8, const T9 &arg9,
> - const T10 &arg10, const T11 &arg11, const T12 &arg12,
> - const T13 &arg13, const T14 &arg14, const T15 &arg15,
> - const T16 &arg16, const T17 &arg17, const T18 &arg18) {
> - ::llvm::hashing::detail::hash_combine_recursive_helper helper;
> - return helper.combine(0, helper.buffer, helper.buffer + 64, arg1, arg2, arg3,
> - arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12,
> - arg13, arg14, arg15, arg16, arg17, arg18);
> -}
> -template <typename T1, typename T2, typename T3, typename T4, typename T5,
> - typename T6, typename T7, typename T8, typename T9, typename T10,
> - typename T11, typename T12, typename T13, typename T14, typename T15,
> - typename T16, typename T17>
> -hash_code hash_combine(const T1 &arg1, const T2 &arg2, const T3 &arg3,
> - const T4 &arg4, const T5 &arg5, const T6 &arg6,
> - const T7 &arg7, const T8 &arg8, const T9 &arg9,
> - const T10 &arg10, const T11 &arg11, const T12 &arg12,
> - const T13 &arg13, const T14 &arg14, const T15 &arg15,
> - const T16 &arg16, const T17 &arg17) {
> - ::llvm::hashing::detail::hash_combine_recursive_helper helper;
> - return helper.combine(0, helper.buffer, helper.buffer + 64, arg1, arg2, arg3,
> - arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12,
> - arg13, arg14, arg15, arg16, arg17);
> -}
> -template <typename T1, typename T2, typename T3, typename T4, typename T5,
> - typename T6, typename T7, typename T8, typename T9, typename T10,
> - typename T11, typename T12, typename T13, typename T14, typename T15,
> - typename T16>
> -hash_code hash_combine(const T1 &arg1, const T2 &arg2, const T3 &arg3,
> - const T4 &arg4, const T5 &arg5, const T6 &arg6,
> - const T7 &arg7, const T8 &arg8, const T9 &arg9,
> - const T10 &arg10, const T11 &arg11, const T12 &arg12,
> - const T13 &arg13, const T14 &arg14, const T15 &arg15,
> - const T16 &arg16) {
> - ::llvm::hashing::detail::hash_combine_recursive_helper helper;
> - return helper.combine(0, helper.buffer, helper.buffer + 64, arg1, arg2, arg3,
> - arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12,
> - arg13, arg14, arg15, arg16);
> -}
> -template <typename T1, typename T2, typename T3, typename T4, typename T5,
> - typename T6, typename T7, typename T8, typename T9, typename T10,
> - typename T11, typename T12, typename T13, typename T14, typename T15>
> -hash_code hash_combine(const T1 &arg1, const T2 &arg2, const T3 &arg3,
> - const T4 &arg4, const T5 &arg5, const T6 &arg6,
> - const T7 &arg7, const T8 &arg8, const T9 &arg9,
> - const T10 &arg10, const T11 &arg11, const T12 &arg12,
> - const T13 &arg13, const T14 &arg14, const T15 &arg15) {
> - ::llvm::hashing::detail::hash_combine_recursive_helper helper;
> - return helper.combine(0, helper.buffer, helper.buffer + 64, arg1, arg2, arg3,
> - arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12,
> - arg13, arg14, arg15);
> -}
> -template <typename T1, typename T2, typename T3, typename T4, typename T5,
> - typename T6, typename T7, typename T8, typename T9, typename T10,
> - typename T11, typename T12, typename T13, typename T14>
> -hash_code hash_combine(const T1 &arg1, const T2 &arg2, const T3 &arg3,
> - const T4 &arg4, const T5 &arg5, const T6 &arg6,
> - const T7 &arg7, const T8 &arg8, const T9 &arg9,
> - const T10 &arg10, const T11 &arg11, const T12 &arg12,
> - const T13 &arg13, const T14 &arg14) {
> - ::llvm::hashing::detail::hash_combine_recursive_helper helper;
> - return helper.combine(0, helper.buffer, helper.buffer + 64, arg1, arg2, arg3,
> - arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12,
> - arg13, arg14);
> -}
> -template <typename T1, typename T2, typename T3, typename T4, typename T5,
> - typename T6, typename T7, typename T8, typename T9, typename T10,
> - typename T11, typename T12, typename T13>
> -hash_code hash_combine(const T1 &arg1, const T2 &arg2, const T3 &arg3,
> - const T4 &arg4, const T5 &arg5, const T6 &arg6,
> - const T7 &arg7, const T8 &arg8, const T9 &arg9,
> - const T10 &arg10, const T11 &arg11, const T12 &arg12,
> - const T13 &arg13) {
> - ::llvm::hashing::detail::hash_combine_recursive_helper helper;
> - return helper.combine(0, helper.buffer, helper.buffer + 64, arg1, arg2, arg3,
> - arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12,
> - arg13);
> -}
> -template <typename T1, typename T2, typename T3, typename T4, typename T5,
> - typename T6, typename T7, typename T8, typename T9, typename T10,
> - typename T11, typename T12>
> -hash_code hash_combine(const T1 &arg1, const T2 &arg2, const T3 &arg3,
> - const T4 &arg4, const T5 &arg5, const T6 &arg6,
> - const T7 &arg7, const T8 &arg8, const T9 &arg9,
> - const T10 &arg10, const T11 &arg11, const T12 &arg12) {
> - ::llvm::hashing::detail::hash_combine_recursive_helper helper;
> - return helper.combine(0, helper.buffer, helper.buffer + 64, arg1, arg2, arg3,
> - arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11,
> - arg12);
> -}
> -template <typename T1, typename T2, typename T3, typename T4, typename T5,
> - typename T6, typename T7, typename T8, typename T9, typename T10,
> - typename T11>
> -hash_code hash_combine(const T1 &arg1, const T2 &arg2, const T3 &arg3,
> - const T4 &arg4, const T5 &arg5, const T6 &arg6,
> - const T7 &arg7, const T8 &arg8, const T9 &arg9,
> - const T10 &arg10, const T11 &arg11) {
> - ::llvm::hashing::detail::hash_combine_recursive_helper helper;
> - return helper.combine(0, helper.buffer, helper.buffer + 64, arg1, arg2, arg3,
> - arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11);
> -}
> -template <typename T1, typename T2, typename T3, typename T4, typename T5,
> - typename T6, typename T7, typename T8, typename T9, typename T10>
> -hash_code hash_combine(const T1 &arg1, const T2 &arg2, const T3 &arg3,
> - const T4 &arg4, const T5 &arg5, const T6 &arg6,
> - const T7 &arg7, const T8 &arg8, const T9 &arg9,
> - const T10 &arg10) {
> - ::llvm::hashing::detail::hash_combine_recursive_helper helper;
> - return helper.combine(0, helper.buffer, helper.buffer + 64, arg1, arg2, arg3,
> - arg4, arg5, arg6, arg7, arg8, arg9, arg10);
> -}
> -template <typename T1, typename T2, typename T3, typename T4, typename T5,
> - typename T6, typename T7, typename T8, typename T9>
> -hash_code hash_combine(const T1 &arg1, const T2 &arg2, const T3 &arg3,
> - const T4 &arg4, const T5 &arg5, const T6 &arg6,
> - const T7 &arg7, const T8 &arg8, const T9 &arg9) {
> - ::llvm::hashing::detail::hash_combine_recursive_helper helper;
> - return helper.combine(0, helper.buffer, helper.buffer + 64, arg1, arg2, arg3,
> - arg4, arg5, arg6, arg7, arg8, arg9);
> -}
> -template <typename T1, typename T2, typename T3, typename T4, typename T5,
> - typename T6, typename T7, typename T8>
> -hash_code hash_combine(const T1 &arg1, const T2 &arg2, const T3 &arg3,
> - const T4 &arg4, const T5 &arg5, const T6 &arg6,
> - const T7 &arg7, const T8 &arg8) {
> - ::llvm::hashing::detail::hash_combine_recursive_helper helper;
> - return helper.combine(0, helper.buffer, helper.buffer + 64, arg1, arg2, arg3,
> - arg4, arg5, arg6, arg7, arg8);
> -}
> -template <typename T1, typename T2, typename T3, typename T4, typename T5,
> - typename T6, typename T7>
> -hash_code hash_combine(const T1 &arg1, const T2 &arg2, const T3 &arg3,
> - const T4 &arg4, const T5 &arg5, const T6 &arg6,
> - const T7 &arg7) {
> - ::llvm::hashing::detail::hash_combine_recursive_helper helper;
> - return helper.combine(0, helper.buffer, helper.buffer + 64, arg1, arg2, arg3,
> - arg4, arg5, arg6, arg7);
> -}
> -template <typename T1, typename T2, typename T3, typename T4, typename T5,
> - typename T6>
> -hash_code hash_combine(const T1 &arg1, const T2 &arg2, const T3 &arg3,
> - const T4 &arg4, const T5 &arg5, const T6 &arg6) {
> - ::llvm::hashing::detail::hash_combine_recursive_helper helper;
> - return helper.combine(0, helper.buffer, helper.buffer + 64,
> - arg1, arg2, arg3, arg4, arg5, arg6);
> -}
> -template <typename T1, typename T2, typename T3, typename T4, typename T5>
> -hash_code hash_combine(const T1 &arg1, const T2 &arg2, const T3 &arg3,
> - const T4 &arg4, const T5 &arg5) {
> - ::llvm::hashing::detail::hash_combine_recursive_helper helper;
> - return helper.combine(0, helper.buffer, helper.buffer + 64,
> - arg1, arg2, arg3, arg4, arg5);
> -}
> -template <typename T1, typename T2, typename T3, typename T4>
> -hash_code hash_combine(const T1 &arg1, const T2 &arg2, const T3 &arg3,
> - const T4 &arg4) {
> - ::llvm::hashing::detail::hash_combine_recursive_helper helper;
> - return helper.combine(0, helper.buffer, helper.buffer + 64,
> - arg1, arg2, arg3, arg4);
> -}
> -template <typename T1, typename T2, typename T3>
> -hash_code hash_combine(const T1 &arg1, const T2 &arg2, const T3 &arg3) {
> - ::llvm::hashing::detail::hash_combine_recursive_helper helper;
> - return helper.combine(0, helper.buffer, helper.buffer + 64, arg1, arg2, arg3);
> -}
> -template <typename T1, typename T2>
> -hash_code hash_combine(const T1 &arg1, const T2 &arg2) {
> - ::llvm::hashing::detail::hash_combine_recursive_helper helper;
> - return helper.combine(0, helper.buffer, helper.buffer + 64, arg1, arg2);
> -}
> -template <typename T1>
> -hash_code hash_combine(const T1 &arg1) {
> - ::llvm::hashing::detail::hash_combine_recursive_helper helper;
> - return helper.combine(0, helper.buffer, helper.buffer + 64, arg1);
> -}
> -
> -#endif
> -
> -
> // Implementation details for implementations of hash_value overloads provided
> // here.
> namespace hashing {
>
> Modified: llvm/trunk/include/llvm/ADT/Optional.h
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ADT/Optional.h?rev=229324&r1=229323&r2=229324&view=diff
> ==============================================================================
> --- llvm/trunk/include/llvm/ADT/Optional.h (original)
> +++ llvm/trunk/include/llvm/ADT/Optional.h Sun Feb 15 13:34:28 2015
> @@ -70,8 +70,6 @@ public:
> return *this;
> }
>
> -#if LLVM_HAS_VARIADIC_TEMPLATES
> -
> /// Create a new object by constructing it in place with the given arguments.
> template<typename ...ArgTypes>
> void emplace(ArgTypes &&...Args) {
> @@ -80,51 +78,6 @@ public:
> new (storage.buffer) T(std::forward<ArgTypes>(Args)...);
> }
>
> -#else
> -
> - /// Create a new object by default-constructing it in place.
> - void emplace() {
> - reset();
> - hasVal = true;
> - new (storage.buffer) T();
> - }
> -
> - /// Create a new object by constructing it in place with the given arguments.
> - template<typename T1>
> - void emplace(T1 &&A1) {
> - reset();
> - hasVal = true;
> - new (storage.buffer) T(std::forward<T1>(A1));
> - }
> -
> - /// Create a new object by constructing it in place with the given arguments.
> - template<typename T1, typename T2>
> - void emplace(T1 &&A1, T2 &&A2) {
> - reset();
> - hasVal = true;
> - new (storage.buffer) T(std::forward<T1>(A1), std::forward<T2>(A2));
> - }
> -
> - /// Create a new object by constructing it in place with the given arguments.
> - template<typename T1, typename T2, typename T3>
> - void emplace(T1 &&A1, T2 &&A2, T3 &&A3) {
> - reset();
> - hasVal = true;
> - new (storage.buffer) T(std::forward<T1>(A1), std::forward<T2>(A2),
> - std::forward<T3>(A3));
> - }
> -
> - /// Create a new object by constructing it in place with the given arguments.
> - template<typename T1, typename T2, typename T3, typename T4>
> - void emplace(T1 &&A1, T2 &&A2, T3 &&A3, T4 &&A4) {
> - reset();
> - hasVal = true;
> - new (storage.buffer) T(std::forward<T1>(A1), std::forward<T2>(A2),
> - std::forward<T3>(A3), std::forward<T4>(A4));
> - }
> -
> -#endif // LLVM_HAS_VARIADIC_TEMPLATES
> -
> static inline Optional create(const T* y) {
> return y ? Optional(*y) : Optional();
> }
>
> Modified: llvm/trunk/include/llvm/ADT/STLExtras.h
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ADT/STLExtras.h?rev=229324&r1=229323&r2=229324&view=diff
> ==============================================================================
> --- llvm/trunk/include/llvm/ADT/STLExtras.h (original)
> +++ llvm/trunk/include/llvm/ADT/STLExtras.h Sun Feb 15 13:34:28 2015
> @@ -64,8 +64,6 @@ struct greater_ptr : public std::binary_
> /// a function_ref.
> template<typename Fn> class function_ref;
>
> -#if LLVM_HAS_VARIADIC_TEMPLATES
> -
> template<typename Ret, typename ...Params>
> class function_ref<Ret(Params...)> {
> Ret (*callback)(intptr_t callable, Params ...params);
> @@ -90,112 +88,6 @@ public:
> }
> };
>
> -#else
> -
> -template<typename Ret>
> -class function_ref<Ret()> {
> - Ret (*callback)(intptr_t callable);
> - intptr_t callable;
> -
> - template<typename Callable>
> - static Ret callback_fn(intptr_t callable) {
> - return (*reinterpret_cast<Callable*>(callable))();
> - }
> -
> -public:
> - template<typename Callable>
> - function_ref(Callable &&callable,
> - typename std::enable_if<
> - !std::is_same<typename std::remove_reference<Callable>::type,
> - function_ref>::value>::type * = nullptr)
> - : callback(callback_fn<typename std::remove_reference<Callable>::type>),
> - callable(reinterpret_cast<intptr_t>(&callable)) {}
> - Ret operator()() const { return callback(callable); }
> -};
> -
> -template<typename Ret, typename Param1>
> -class function_ref<Ret(Param1)> {
> - Ret (*callback)(intptr_t callable, Param1 param1);
> - intptr_t callable;
> -
> - template<typename Callable>
> - static Ret callback_fn(intptr_t callable, Param1 param1) {
> - return (*reinterpret_cast<Callable*>(callable))(
> - std::forward<Param1>(param1));
> - }
> -
> -public:
> - template<typename Callable>
> - function_ref(Callable &&callable,
> - typename std::enable_if<
> - !std::is_same<typename std::remove_reference<Callable>::type,
> - function_ref>::value>::type * = nullptr)
> - : callback(callback_fn<typename std::remove_reference<Callable>::type>),
> - callable(reinterpret_cast<intptr_t>(&callable)) {}
> - Ret operator()(Param1 param1) {
> - return callback(callable, std::forward<Param1>(param1));
> - }
> -};
> -
> -template<typename Ret, typename Param1, typename Param2>
> -class function_ref<Ret(Param1, Param2)> {
> - Ret (*callback)(intptr_t callable, Param1 param1, Param2 param2);
> - intptr_t callable;
> -
> - template<typename Callable>
> - static Ret callback_fn(intptr_t callable, Param1 param1, Param2 param2) {
> - return (*reinterpret_cast<Callable*>(callable))(
> - std::forward<Param1>(param1),
> - std::forward<Param2>(param2));
> - }
> -
> -public:
> - template<typename Callable>
> - function_ref(Callable &&callable,
> - typename std::enable_if<
> - !std::is_same<typename std::remove_reference<Callable>::type,
> - function_ref>::value>::type * = nullptr)
> - : callback(callback_fn<typename std::remove_reference<Callable>::type>),
> - callable(reinterpret_cast<intptr_t>(&callable)) {}
> - Ret operator()(Param1 param1, Param2 param2) {
> - return callback(callable,
> - std::forward<Param1>(param1),
> - std::forward<Param2>(param2));
> - }
> -};
> -
> -template<typename Ret, typename Param1, typename Param2, typename Param3>
> -class function_ref<Ret(Param1, Param2, Param3)> {
> - Ret (*callback)(intptr_t callable, Param1 param1, Param2 param2, Param3 param3);
> - intptr_t callable;
> -
> - template<typename Callable>
> - static Ret callback_fn(intptr_t callable, Param1 param1, Param2 param2,
> - Param3 param3) {
> - return (*reinterpret_cast<Callable*>(callable))(
> - std::forward<Param1>(param1),
> - std::forward<Param2>(param2),
> - std::forward<Param3>(param3));
> - }
> -
> -public:
> - template<typename Callable>
> - function_ref(Callable &&callable,
> - typename std::enable_if<
> - !std::is_same<typename std::remove_reference<Callable>::type,
> - function_ref>::value>::type * = nullptr)
> - : callback(callback_fn<typename std::remove_reference<Callable>::type>),
> - callable(reinterpret_cast<intptr_t>(&callable)) {}
> - Ret operator()(Param1 param1, Param2 param2, Param3 param3) {
> - return callback(callable,
> - std::forward<Param1>(param1),
> - std::forward<Param2>(param2),
> - std::forward<Param3>(param3));
> - }
> -};
> -
> -#endif
> -
> // deleter - Very very very simple method that is used to invoke operator
> // delete on something. It is used like this:
> //
> @@ -393,8 +285,6 @@ void DeleteContainerSeconds(Container &C
> // Extra additions to <memory>
> //===----------------------------------------------------------------------===//
>
> -#if LLVM_HAS_VARIADIC_TEMPLATES
> -
> // Implement make_unique according to N3656.
>
> /// \brief Constructs a `new T()` with the given args and returns a
> @@ -430,122 +320,6 @@ template <class T, class... Args>
> typename std::enable_if<std::extent<T>::value != 0>::type
> make_unique(Args &&...) LLVM_DELETED_FUNCTION;
>
> -#else
> -
> -template <class T>
> -typename std::enable_if<!std::is_array<T>::value, std::unique_ptr<T>>::type
> -make_unique() {
> - return std::unique_ptr<T>(new T());
> -}
> -
> -template <class T, class Arg1>
> -typename std::enable_if<!std::is_array<T>::value, std::unique_ptr<T>>::type
> -make_unique(Arg1 &&arg1) {
> - return std::unique_ptr<T>(new T(std::forward<Arg1>(arg1)));
> -}
> -
> -template <class T, class Arg1, class Arg2>
> -typename std::enable_if<!std::is_array<T>::value, std::unique_ptr<T>>::type
> -make_unique(Arg1 &&arg1, Arg2 &&arg2) {
> - return std::unique_ptr<T>(
> - new T(std::forward<Arg1>(arg1), std::forward<Arg2>(arg2)));
> -}
> -
> -template <class T, class Arg1, class Arg2, class Arg3>
> -typename std::enable_if<!std::is_array<T>::value, std::unique_ptr<T>>::type
> -make_unique(Arg1 &&arg1, Arg2 &&arg2, Arg3 &&arg3) {
> - return std::unique_ptr<T>(new T(std::forward<Arg1>(arg1),
> - std::forward<Arg2>(arg2),
> - std::forward<Arg3>(arg3)));
> -}
> -
> -template <class T, class Arg1, class Arg2, class Arg3, class Arg4>
> -typename std::enable_if<!std::is_array<T>::value, std::unique_ptr<T>>::type
> -make_unique(Arg1 &&arg1, Arg2 &&arg2, Arg3 &&arg3, Arg4 &&arg4) {
> - return std::unique_ptr<T>(
> - new T(std::forward<Arg1>(arg1), std::forward<Arg2>(arg2),
> - std::forward<Arg3>(arg3), std::forward<Arg4>(arg4)));
> -}
> -
> -template <class T, class Arg1, class Arg2, class Arg3, class Arg4, class Arg5>
> -typename std::enable_if<!std::is_array<T>::value, std::unique_ptr<T>>::type
> -make_unique(Arg1 &&arg1, Arg2 &&arg2, Arg3 &&arg3, Arg4 &&arg4, Arg5 &&arg5) {
> - return std::unique_ptr<T>(
> - new T(std::forward<Arg1>(arg1), std::forward<Arg2>(arg2),
> - std::forward<Arg3>(arg3), std::forward<Arg4>(arg4),
> - std::forward<Arg5>(arg5)));
> -}
> -
> -template <class T, class Arg1, class Arg2, class Arg3, class Arg4, class Arg5,
> - class Arg6>
> -typename std::enable_if<!std::is_array<T>::value, std::unique_ptr<T>>::type
> -make_unique(Arg1 &&arg1, Arg2 &&arg2, Arg3 &&arg3, Arg4 &&arg4, Arg5 &&arg5,
> - Arg6 &&arg6) {
> - return std::unique_ptr<T>(
> - new T(std::forward<Arg1>(arg1), std::forward<Arg2>(arg2),
> - std::forward<Arg3>(arg3), std::forward<Arg4>(arg4),
> - std::forward<Arg5>(arg5), std::forward<Arg6>(arg6)));
> -}
> -
> -template <class T, class Arg1, class Arg2, class Arg3, class Arg4, class Arg5,
> - class Arg6, class Arg7>
> -typename std::enable_if<!std::is_array<T>::value, std::unique_ptr<T>>::type
> -make_unique(Arg1 &&arg1, Arg2 &&arg2, Arg3 &&arg3, Arg4 &&arg4, Arg5 &&arg5,
> - Arg6 &&arg6, Arg7 &&arg7) {
> - return std::unique_ptr<T>(
> - new T(std::forward<Arg1>(arg1), std::forward<Arg2>(arg2),
> - std::forward<Arg3>(arg3), std::forward<Arg4>(arg4),
> - std::forward<Arg5>(arg5), std::forward<Arg6>(arg6),
> - std::forward<Arg7>(arg7)));
> -}
> -
> -template <class T, class Arg1, class Arg2, class Arg3, class Arg4, class Arg5,
> - class Arg6, class Arg7, class Arg8>
> -typename std::enable_if<!std::is_array<T>::value, std::unique_ptr<T>>::type
> -make_unique(Arg1 &&arg1, Arg2 &&arg2, Arg3 &&arg3, Arg4 &&arg4, Arg5 &&arg5,
> - Arg6 &&arg6, Arg7 &&arg7, Arg8 &&arg8) {
> - return std::unique_ptr<T>(
> - new T(std::forward<Arg1>(arg1), std::forward<Arg2>(arg2),
> - std::forward<Arg3>(arg3), std::forward<Arg4>(arg4),
> - std::forward<Arg5>(arg5), std::forward<Arg6>(arg6),
> - std::forward<Arg7>(arg7), std::forward<Arg8>(arg8)));
> -}
> -
> -template <class T, class Arg1, class Arg2, class Arg3, class Arg4, class Arg5,
> - class Arg6, class Arg7, class Arg8, class Arg9>
> -typename std::enable_if<!std::is_array<T>::value, std::unique_ptr<T>>::type
> -make_unique(Arg1 &&arg1, Arg2 &&arg2, Arg3 &&arg3, Arg4 &&arg4, Arg5 &&arg5,
> - Arg6 &&arg6, Arg7 &&arg7, Arg8 &&arg8, Arg9 &&arg9) {
> - return std::unique_ptr<T>(
> - new T(std::forward<Arg1>(arg1), std::forward<Arg2>(arg2),
> - std::forward<Arg3>(arg3), std::forward<Arg4>(arg4),
> - std::forward<Arg5>(arg5), std::forward<Arg6>(arg6),
> - std::forward<Arg7>(arg7), std::forward<Arg8>(arg8),
> - std::forward<Arg9>(arg9)));
> -}
> -
> -template <class T, class Arg1, class Arg2, class Arg3, class Arg4, class Arg5,
> - class Arg6, class Arg7, class Arg8, class Arg9, class Arg10>
> -typename std::enable_if<!std::is_array<T>::value, std::unique_ptr<T>>::type
> -make_unique(Arg1 &&arg1, Arg2 &&arg2, Arg3 &&arg3, Arg4 &&arg4, Arg5 &&arg5,
> - Arg6 &&arg6, Arg7 &&arg7, Arg8 &&arg8, Arg9 &&arg9, Arg10 &&arg10) {
> - return std::unique_ptr<T>(
> - new T(std::forward<Arg1>(arg1), std::forward<Arg2>(arg2),
> - std::forward<Arg3>(arg3), std::forward<Arg4>(arg4),
> - std::forward<Arg5>(arg5), std::forward<Arg6>(arg6),
> - std::forward<Arg7>(arg7), std::forward<Arg8>(arg8),
> - std::forward<Arg9>(arg9), std::forward<Arg10>(arg10)));
> -}
> -
> -template <class T>
> -typename std::enable_if<std::is_array<T>::value &&std::extent<T>::value == 0,
> - std::unique_ptr<T>>::type
> -make_unique(size_t n) {
> - return std::unique_ptr<T>(new typename std::remove_extent<T>::type[n]());
> -}
> -
> -#endif
> -
> struct FreeDeleter {
> void operator()(void* v) {
> ::free(v);
>
> Modified: llvm/trunk/include/llvm/ADT/SmallVector.h
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ADT/SmallVector.h?rev=229324&r1=229323&r2=229324&view=diff
> ==============================================================================
> --- llvm/trunk/include/llvm/ADT/SmallVector.h (original)
> +++ llvm/trunk/include/llvm/ADT/SmallVector.h Sun Feb 15 13:34:28 2015
> @@ -633,50 +633,12 @@ public:
> return I;
> }
>
> -#if LLVM_HAS_VARIADIC_TEMPLATES
> template <typename... ArgTypes> void emplace_back(ArgTypes &&... Args) {
> if (LLVM_UNLIKELY(this->EndX >= this->CapacityX))
> this->grow();
> ::new ((void *)this->end()) T(std::forward<ArgTypes>(Args)...);
> this->setEnd(this->end() + 1);
> }
> -#else
> -private:
> - template <typename Constructor> void emplace_back_impl(Constructor construct) {
> - if (LLVM_UNLIKELY(this->EndX >= this->CapacityX))
> - this->grow();
> - construct((void *)this->end());
> - this->setEnd(this->end() + 1);
> - }
> -
> -public:
> - void emplace_back() {
> - emplace_back_impl([](void *Mem) { ::new (Mem) T(); });
> - }
> - template <typename T1> void emplace_back(T1 &&A1) {
> - emplace_back_impl([&](void *Mem) { ::new (Mem) T(std::forward<T1>(A1)); });
> - }
> - template <typename T1, typename T2> void emplace_back(T1 &&A1, T2 &&A2) {
> - emplace_back_impl([&](void *Mem) {
> - ::new (Mem) T(std::forward<T1>(A1), std::forward<T2>(A2));
> - });
> - }
> - template <typename T1, typename T2, typename T3>
> - void emplace_back(T1 &&A1, T2 &&A2, T3 &&A3) {
> - T(std::forward<T1>(A1), std::forward<T2>(A2), std::forward<T3>(A3));
> - emplace_back_impl([&](void *Mem) {
> - ::new (Mem)
> - T(std::forward<T1>(A1), std::forward<T2>(A2), std::forward<T3>(A3));
> - });
> - }
> - template <typename T1, typename T2, typename T3, typename T4>
> - void emplace_back(T1 &&A1, T2 &&A2, T3 &&A3, T4 &&A4) {
> - emplace_back_impl([&](void *Mem) {
> - ::new (Mem) T(std::forward<T1>(A1), std::forward<T2>(A2),
> - std::forward<T3>(A3), std::forward<T4>(A4));
> - });
> - }
> -#endif // LLVM_HAS_VARIADIC_TEMPLATES
>
> SmallVectorImpl &operator=(const SmallVectorImpl &RHS);
>
>
> Modified: llvm/trunk/include/llvm/Support/Compiler.h
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/Compiler.h?rev=229324&r1=229323&r2=229324&view=diff
> ==============================================================================
> --- llvm/trunk/include/llvm/Support/Compiler.h (original)
> +++ llvm/trunk/include/llvm/Support/Compiler.h Sun Feb 15 13:34:28 2015
> @@ -82,16 +82,6 @@
> #define LLVM_HAS_RVALUE_REFERENCE_THIS 0
> #endif
>
> -/// \macro LLVM_HAS_VARIADIC_TEMPLATES
> -/// \brief Does this compiler support variadic templates.
> -///
> -/// Implies LLVM_HAS_RVALUE_REFERENCES and the existence of std::forward.
> -#if __has_feature(cxx_variadic_templates) || LLVM_MSC_PREREQ(1800)
> -# define LLVM_HAS_VARIADIC_TEMPLATES 1
> -#else
> -# define LLVM_HAS_VARIADIC_TEMPLATES 0
> -#endif
> -
> /// Expands to '&' if r-value references are supported.
> ///
> /// This can be used to provide l-value/r-value overrides of member functions.
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
More information about the llvm-commits
mailing list