fix (cppfastio#1174)

* fix

* fix

* f

* fix

* fix

* fix

* fix

Author: MacroModel

include/fast_io_core_impl/allocation/adapters.h

@@ -286,13 +286,13 @@ class generic_allocator_adapter
 		{
 			return allocator_type::reallocate_at_least(p, n).ptr;
 		}
-		else if constexpr (::fast_io::details::has_reallocate_aligned_impl<alloc>)
+		else if constexpr (::fast_io::details::has_reallocate_aligned_n_impl<alloc>)
 		{
-			return allocator_type::reallocate_aligned_n(p, default_alignment, n);
+			return allocator_type::reallocate_aligned_n(p, oldn, default_alignment, n);
 		}
-		else if constexpr (::fast_io::details::has_reallocate_aligned_at_least_impl<alloc>)
+		else if constexpr (::fast_io::details::has_reallocate_aligned_n_at_least_impl<alloc>)
 		{
-			return allocator_type::reallocate_aligned_n_at_least(p, default_alignment, n).ptr;
+			return allocator_type::reallocate_aligned_n_at_least(p, oldn, default_alignment, n).ptr;
 		}
 		else if constexpr (::fast_io::details::has_reallocate_zero_impl<alloc>)
 		{
@@ -304,11 +304,11 @@ class generic_allocator_adapter
 		}
 		else if constexpr (::fast_io::details::has_reallocate_aligned_zero_impl<alloc>)
 		{
-			return allocator_type::reallocate_aligned_zero_n(p, default_alignment, n);
+			return allocator_type::reallocate_aligned_zero_n(p, oldn, default_alignment, n);
 		}
 		else if constexpr (::fast_io::details::has_reallocate_aligned_zero_at_least_impl<alloc>)
 		{
-			return allocator_type::reallocate_aligned_zero_n_at_least(p, default_alignment, n).ptr;
+			return allocator_type::reallocate_aligned_zero_n_at_least(p, oldn, default_alignment, n).ptr;
 		}
 		else
 		{
@@ -683,7 +683,7 @@ class generic_allocator_adapter
 		}
 		else if constexpr (::fast_io::details::has_reallocate_aligned_zero_n_impl<alloc>)
 		{
-			return allocator_type::reallocate_aligned_zero_n(p, alignment, n).ptr;
+			return allocator_type::reallocate_aligned_zero_n(p, oldn, alignment, n).ptr;
 		}
 		else
 		{
@@ -981,31 +981,31 @@ class generic_allocator_adapter
 	{
 		if constexpr (::fast_io::details::has_reallocate_aligned_n_at_least_impl<alloc>)
 		{
-			return allocator_type::reallocate_aligned_n_at_least(p, alignment, n);
+			return allocator_type::reallocate_aligned_n_at_least(p, oldn, alignment, n);
 		}
 		else if constexpr (::fast_io::details::has_reallocate_aligned_at_least_impl<alloc>)
 		{
 			return allocator_type::reallocate_aligned_at_least(p, alignment, n);
 		}
 		else if constexpr (::fast_io::details::has_reallocate_aligned_zero_n_at_least_impl<alloc>)
 		{
-			return allocator_type::reallocate_aligned_zero_n_at_least(p, alignment, n);
+			return allocator_type::reallocate_aligned_zero_n_at_least(p, oldn, alignment, n);
 		}
 		else if constexpr (::fast_io::details::has_reallocate_aligned_zero_at_least_impl<alloc>)
 		{
 			return allocator_type::reallocate_aligned_zero_at_least(p, alignment, n);
 		}
 		else if constexpr (::fast_io::details::has_reallocate_aligned_impl<alloc>)
 		{
-			return allocator_type::reallocate_aligned_n(p, alignment, n);
+			return allocator_type::reallocate_aligned_n(p, oldn, alignment, n);
 		}
 		else if constexpr (::fast_io::details::has_reallocate_aligned_impl<alloc>)
 		{
 			return allocator_type::reallocate_aligned(p, alignment, n);
 		}
 		else if constexpr (::fast_io::details::has_reallocate_aligned_zero_n_impl<alloc>)
 		{
-			return allocator_type::reallocate_aligned_zero_n(p, alignment, n);
+			return allocator_type::reallocate_aligned_zero_n(p, oldn, alignment, n);
 		}
 		else if constexpr (::fast_io::details::has_reallocate_aligned_zero_impl<alloc>)
 		{
@@ -1046,11 +1046,11 @@ class generic_allocator_adapter
 	{
 		if constexpr (::fast_io::details::has_reallocate_aligned_zero_n_at_least_impl<alloc>)
 		{
-			return allocator_type::reallocate_aligned_zero_n_at_least(p, alignment, n);
+			return allocator_type::reallocate_aligned_zero_n_at_least(p, oldn, alignment, n);
 		}
 		else if constexpr (::fast_io::details::has_reallocate_aligned_zero_n_impl<alloc>)
 		{
-			return {allocator_type::reallocate_aligned_zero_n(p, alignment, n), n};
+			return {allocator_type::reallocate_aligned_zero_n(p, oldn, alignment, n), n};
 		}
 		else
 		{

include/fast_io_core_impl/allocation/c_malloc.h

@@ -204,8 +204,9 @@ class c_malloc_allocator
 		{
 			return;
 		}
+		
 #if FAST_IO_HAS_BUILTIN(__builtin_free)
-                __builtin_free
+        __builtin_free
 #else
 		::std::free
 #endif

include/fast_io_core_impl/allocation/linux_kernel.h

@@ -60,7 +60,7 @@ class linux_kmalloc_allocator
 	}
 	static inline void deallocate(void *p) noexcept
 	{
-		if (p == nullptr)
+		if (p == nullptr) [[unlikely]]
 		{
 			return;
 		}

include/fast_io_core_impl/allocation/mimalloc_driver.h

@@ -343,7 +343,7 @@ class mimalloc_allocator
 
 	inline static void deallocate_aligned(void *p, ::std::size_t alignment) noexcept
 	{
-		if (p == nullptr)
+		if (p == nullptr) [[unlikely]]
 		{
 			return;
 		}

include/fast_io_core_impl/allocation/nt_rtlheapalloc.h

@@ -19,6 +19,9 @@ inline void *nt_rtlallocate_heap_handle_common_impl(void *heaphandle, ::std::siz
 	}
 	auto p{::fast_io::win32::nt::RtlAllocateHeap(heaphandle, flag, n)};
 	if (p == nullptr)
+#if __has_cpp_attribute(unlikely)
+		[[unlikely]]
+#endif
 	{
 		::fast_io::fast_terminate();
 	}
@@ -108,7 +111,7 @@ class nt_rtlallocateheap_allocator
 	}
 	static inline void deallocate(void *addr) noexcept
 	{
-		if (addr == nullptr)
+		if (addr == nullptr) [[unlikely]]
 		{
 			return;
 		}

include/fast_io_core_impl/allocation/win32_heapalloc.h

@@ -164,7 +164,7 @@ class win32_heapalloc_allocator
 	}
 	static inline void deallocate(void *addr) noexcept
 	{
-		if (addr == nullptr)
+		if (addr == nullptr) [[unlikely]]
 		{
 			return;
 		}

include/fast_io_core_impl/allocation/wincrt_malloc_dbg.h

@@ -58,7 +58,7 @@ class wincrt_malloc_dbg_allocator
 	}
 	static inline void deallocate(void *p) noexcept
 	{
-		if (p == nullptr)
+		if (p == nullptr) [[unlikely]]
 		{
 			return;
 		}

include/fast_io_core_impl/bitops/rtz.h

@@ -118,6 +118,7 @@ inline constexpr ::fast_io::bitops::rtz_result<T> rtz_impl(T n) noexcept
 			s += b;
 			n = b ? r : n;
 
+			// c1 == d1 == 42949673u
 			constexpr ::std::uint_least32_t d1{42949673u};
 			r = ::std::rotr(static_cast<std::uint32_t>(n * d1), 2);
 			b = r < d1;

include/fast_io_core_impl/buffer_view.h

@@ -15,7 +15,7 @@ struct basic_ibuffer_view
 	template <::std::contiguous_iterator Iter>
 		requires ::std::same_as<::std::remove_cvref_t<::std::iter_value_t<Iter>>, char_type>
 	inline constexpr basic_ibuffer_view(Iter first, Iter last) noexcept
-		: begin_ptr{::std::to_address(first)}, curr_ptr{begin_ptr}, end_ptr{curr_ptr + (last - first)}
+		: begin_ptr{::std::to_address(first)}, curr_ptr{begin_ptr}, end_ptr{::std::to_address(last)}
 	{
 	}
 	template <::std::ranges::contiguous_range rg>

include/fast_io_core_impl/char_category/char_category_traits.h

@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 
 namespace fast_io::char_category
 {