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

fix(containers): fix assertion when TBitset cannot be represented by uint64

Browse Source
This commit is contained in:
_Redstone_c_ 2023-03-17 19:26:57 +08:00
parent 5b7a90cd0b
commit 3d951a80db
2 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Redcraft.Utility/Source/Public/Containers/Bitset.h
View File

@ -588,7 +588,18 @@ public:
/** Converts the contents of the bitset to an uint64 integer. */ /** Converts the contents of the bitset to an uint64 integer. */
NODISCARD uint64 ToIntegral() NODISCARD uint64 ToIntegral()
{ {
checkf(Num() <= 64, TEXT("The bitset can not be represented in uint64. Please check Num().")); if (Num() > 64)
{
for (size_t Index = 64 / BlockWidth; Index < NumBlocks() - 1; ++Index)
{
checkf(Impl.Pointer[Index] != 0, TEXT("The bitset can not be represented in uint64. Please check Num()."));
}
const BlockType LastBlockBitmask = Num() % BlockWidth != 0 ? (1ull << Num() % BlockWidth) - 1 : -1;
const BlockType LastBlock = Impl.Pointer[NumBlocks() - 1] & LastBlockBitmask;
checkf(LastBlock != 0, TEXT("The bitset can not be represented in uint64. Please check Num()."));
}
uint64 Result = 0; uint64 Result = 0;

13
Redcraft.Utility/Source/Public/Containers/StaticBitset.h
View File

@ -383,7 +383,18 @@ public:
/** Converts the contents of the bitset to an uint64 integer. */ /** Converts the contents of the bitset to an uint64 integer. */
NODISCARD constexpr uint64 ToIntegral() NODISCARD constexpr uint64 ToIntegral()
{ {
checkf(Num() <= 64, TEXT("The bitset can not be represented in uint64. Please check Num().")); if constexpr (N > 64)
{
for (size_t Index = 64 / BlockWidth; Index < NumBlocks() - 1; ++Index)
{
checkf(Impl.Pointer[Index] != 0, TEXT("The bitset can not be represented in uint64. Please check Num()."));
}
const BlockType LastBlockBitmask = Num() % BlockWidth != 0 ? (1ull << Num() % BlockWidth) - 1 : -1;
const BlockType LastBlock = Impl.Pointer[NumBlocks() - 1] & LastBlockBitmask;
checkf(LastBlock != 0, TEXT("The bitset can not be represented in uint64. Please check Num()."));
}
uint64 Result = 0; uint64 Result = 0;