Redstone1024/Redcraft
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(templates): disable TReferenceWrapper swap and enable it into FAny

Browse Source
This commit is contained in:
_Redstone_c_ 2022-12-18 19:28:33 +08:00
parent d87d292691
commit de059cb980
2 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Redcraft.Utility/Source/Public/Templates/Any.h
View File

@ -23,7 +23,7 @@ NAMESPACE_MODULE_BEGIN(Utility)
NAMESPACE_PRIVATE_BEGIN NAMESPACE_PRIVATE_BEGIN
template <typename T> template <typename T>
concept CFAnyPlaceable = CDestructible<TDecay<T>> && CCopyConstructible<TDecay<T>> && CMoveConstructible<TDecay<T>> && CSwappable<TDecay<T>>; concept CFAnyPlaceable = CDestructible<TDecay<T>> && CCopyConstructible<TDecay<T>> && CMoveConstructible<TDecay<T>>;
NAMESPACE_PRIVATE_END NAMESPACE_PRIVATE_END
@ -314,10 +314,10 @@ public:
case ERepresentation::Empty: case ERepresentation::Empty:
break; break;
case ERepresentation::Trivial: case ERepresentation::Trivial:
uint8 Buffer[sizeof(TrivialStorage.Internal)]; uint8 TempBuffer[sizeof(TrivialStorage.Internal)];
Memory::Memmove(Buffer, TrivialStorage.Internal); Memory::Memmove(TempBuffer, TrivialStorage.Internal);
Memory::Memmove(TrivialStorage.Internal, InValue.TrivialStorage.Internal); Memory::Memmove(TrivialStorage.Internal, InValue.TrivialStorage.Internal);
Memory::Memmove(InValue.TrivialStorage.Internal, Buffer); Memory::Memmove(InValue.TrivialStorage.Internal, TempBuffer);
break; break;
case ERepresentation::Small: case ERepresentation::Small:
SmallStorage.RTTI->SwapObject(&SmallStorage.Internal, &InValue.SmallStorage.Internal); SmallStorage.RTTI->SwapObject(&SmallStorage.Internal, &InValue.SmallStorage.Internal);
@ -409,7 +409,20 @@ private:
, SwapObject{ , SwapObject{
[](void* A, void* B) [](void* A, void* B)
{ {
NAMESPACE_REDCRAFT::Swap(*reinterpret_cast<T*>(A), *reinterpret_cast<T*>(B)); if constexpr (CSwappable<T>)
{
NAMESPACE_REDCRAFT::Swap(*reinterpret_cast<T*>(A), *reinterpret_cast<T*>(B));
}
else
{
TAlignedStorage<sizeof(T), alignof(T)> TempBuffer;
new (&TempBuffer) T(MoveTemp(*reinterpret_cast<T*>(A)));
reinterpret_cast<T*>(A)->~T();
new (A) T(MoveTemp(*reinterpret_cast<T*>(B)));
reinterpret_cast<T*>(B)->~T();
new (B) T(MoveTemp(*reinterpret_cast<T*>(&TempBuffer)));
reinterpret_cast<T*>(&TempBuffer)->~T();
}
} }
} }
{ } { }

7
Redcraft.Utility/Source/Public/Templates/ReferenceWrapper.h
View File

@ -52,13 +52,6 @@ public:
return NAMESPACE_REDCRAFT::GetTypeHash(Get()); return NAMESPACE_REDCRAFT::GetTypeHash(Get());
} }
FORCEINLINE constexpr void Swap(TReferenceWrapper& InValue)
{
ReferencedType* Temp = Pointer;
Pointer = InValue.Pointer;
InValue.Pointer = Temp;
}
private: private:
ReferencedType* Pointer; ReferencedType* Pointer;