Skip to content

Commit f8a44a5

Browse files
committed
Dont pass type information to __libcpp_operator_new
1 parent 961dba8 commit f8a44a5

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

libcxx/include/__new/allocate.h

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ _LIBCPP_CONSTEXPR inline _LIBCPP_HIDE_FROM_ABI bool __is_overaligned_for_new(siz
2929
#endif
3030
}
3131

32-
template <class _Tp, class... _Args>
32+
template <class... _Args>
3333
_LIBCPP_HIDE_FROM_ABI void* __libcpp_operator_new(_Args... __args) {
3434
#if __has_builtin(__builtin_operator_new) && __has_builtin(__builtin_operator_delete)
3535
return __builtin_operator_new(__args...);
@@ -38,7 +38,7 @@ _LIBCPP_HIDE_FROM_ABI void* __libcpp_operator_new(_Args... __args) {
3838
#endif
3939
}
4040

41-
template <class _Tp, class... _Args>
41+
template <class... _Args>
4242
_LIBCPP_HIDE_FROM_ABI void __libcpp_operator_delete(_Args... __args) _NOEXCEPT {
4343
#if __has_builtin(__builtin_operator_new) && __has_builtin(__builtin_operator_delete)
4444
__builtin_operator_delete(__args...);
@@ -52,12 +52,12 @@ inline _LIBCPP_HIDE_FROM_ABI void* __libcpp_allocate(size_t __size, size_t __ali
5252
#if _LIBCPP_HAS_ALIGNED_ALLOCATION
5353
if (__is_overaligned_for_new(__align)) {
5454
const align_val_t __align_val = static_cast<align_val_t>(__align);
55-
return std::__libcpp_operator_new<_Tp>(__size, __align_val);
55+
return std::__libcpp_operator_new(__size, __align_val);
5656
}
5757
#endif
5858

5959
(void)__align;
60-
return std::__libcpp_operator_new<_Tp>(__size);
60+
return std::__libcpp_operator_new(__size);
6161
}
6262

6363
#if _LIBCPP_HAS_SIZED_DEALLOCATION
@@ -71,13 +71,13 @@ inline _LIBCPP_HIDE_FROM_ABI void __libcpp_deallocate(void* __ptr, size_t __size
7171
(void)__size;
7272
#if !_LIBCPP_HAS_ALIGNED_ALLOCATION
7373
(void)__align;
74-
return std::__libcpp_operator_delete<_Tp>(__ptr _LIBCPP_ONLY_IF_SIZED_DEALLOCATION(, __size));
74+
return std::__libcpp_operator_delete(__ptr _LIBCPP_ONLY_IF_SIZED_DEALLOCATION(, __size));
7575
#else
7676
if (__is_overaligned_for_new(__align)) {
7777
const align_val_t __align_val = static_cast<align_val_t>(__align);
78-
return std::__libcpp_operator_delete<_Tp>(__ptr _LIBCPP_ONLY_IF_SIZED_DEALLOCATION(, __size), __align_val);
78+
return std::__libcpp_operator_delete(__ptr _LIBCPP_ONLY_IF_SIZED_DEALLOCATION(, __size), __align_val);
7979
} else {
80-
return std::__libcpp_operator_delete<_Tp>(__ptr _LIBCPP_ONLY_IF_SIZED_DEALLOCATION(, __size));
80+
return std::__libcpp_operator_delete(__ptr _LIBCPP_ONLY_IF_SIZED_DEALLOCATION(, __size));
8181
}
8282
#endif
8383
}
@@ -95,13 +95,13 @@ template <class _Tp>
9595
inline _LIBCPP_HIDE_FROM_ABI void __libcpp_deallocate_unsized(void* __ptr, size_t __align) _NOEXCEPT {
9696
#if !_LIBCPP_HAS_ALIGNED_ALLOCATION
9797
(void)__align;
98-
return std::__libcpp_operator_delete<_Tp>(__ptr);
98+
return std::__libcpp_operator_delete(__ptr);
9999
#else
100100
if (__is_overaligned_for_new(__align)) {
101101
const align_val_t __align_val = static_cast<align_val_t>(__align);
102-
return std::__libcpp_operator_delete<_Tp>(__ptr, __align_val);
102+
return std::__libcpp_operator_delete(__ptr, __align_val);
103103
} else {
104-
return std::__libcpp_operator_delete<_Tp>(__ptr);
104+
return std::__libcpp_operator_delete(__ptr);
105105
}
106106
#endif
107107
}

0 commit comments

Comments
 (0)