OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-07 18:30:55 +03:00
Code Packages Releases Activity

0031024: Coding - invalid left shift in BVH_RadixSorter::Perform() using -fsanitize=undefined

Browse Source 
Standard_Integer has been replaced by unsigned int for bit operations.
This commit is contained in:
kgv 2019-10-03 06:49:59 +03:00 committed by abv
parent 683b72c3c1
commit c2bcd98369
2 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/BVH/BVH_LinearBuilder.hxx
View File

@ -106,10 +106,11 @@ Standard_Integer BVH_LinearBuilder<T, N>::lowerBound (const NCollection_Array1<B
Standard_Integer theDigit) const Standard_Integer theDigit) const
{ {
Standard_Integer aNbPrims = theFinal - theStart; Standard_Integer aNbPrims = theFinal - theStart;
unsigned int aBit = 1U << theDigit;
while (aNbPrims > 0) while (aNbPrims > 0)
{ {
const Standard_Integer aStep = aNbPrims / 2; const Standard_Integer aStep = aNbPrims / 2;
if (theEncodedLinks.Value (theStart + aStep).first & (1 << theDigit)) if (theEncodedLinks.Value (theStart + aStep).first & aBit)
{ {
aNbPrims = aStep; aNbPrims = aStep;
} }
@ -130,26 +131,26 @@ Standard_Integer BVH_LinearBuilder<T, N>::lowerBound (const NCollection_Array1<B
template<class T, int N> template<class T, int N>
Standard_Integer BVH_LinearBuilder<T, N>::emitHierachy (BVH_Tree<T, N>* theBVH, Standard_Integer BVH_LinearBuilder<T, N>::emitHierachy (BVH_Tree<T, N>* theBVH,
const NCollection_Array1<BVH_EncodedLink>& theEncodedLinks, const NCollection_Array1<BVH_EncodedLink>& theEncodedLinks,
const Standard_Integer theBit, const Standard_Integer theDigit,
const Standard_Integer theShift, const Standard_Integer theShift,
const Standard_Integer theStart, const Standard_Integer theStart,
const Standard_Integer theFinal) const const Standard_Integer theFinal) const
{ {
if (theFinal - theStart > BVH_Builder<T, N>::myLeafNodeSize) if (theFinal - theStart > BVH_Builder<T, N>::myLeafNodeSize)
{ {
const Standard_Integer aPosition = theBit < 0 ? const Standard_Integer aPosition = theDigit < 0 ?
(theStart + theFinal) / 2 : lowerBound (theEncodedLinks, theStart, theFinal, theBit); (theStart + theFinal) / 2 : lowerBound (theEncodedLinks, theStart, theFinal, theDigit);
if (aPosition == theStart || aPosition == theFinal) if (aPosition == theStart || aPosition == theFinal)
{ {
return emitHierachy (theBVH, theEncodedLinks, theBit - 1, theShift, theStart, theFinal); return emitHierachy (theBVH, theEncodedLinks, theDigit - 1, theShift, theStart, theFinal);
} }
// Build inner node // Build inner node
const Standard_Integer aNode = theBVH->AddInnerNode (0, 0); const Standard_Integer aNode = theBVH->AddInnerNode (0, 0);
const Standard_Integer aRghNode = theShift + aPosition - theStart; const Standard_Integer aRghNode = theShift + aPosition - theStart;
const Standard_Integer aLftChild = emitHierachy (theBVH, theEncodedLinks, theBit - 1, theShift, theStart, aPosition); const Standard_Integer aLftChild = emitHierachy (theBVH, theEncodedLinks, theDigit - 1, theShift, theStart, aPosition);
const Standard_Integer aRghChild = emitHierachy (theBVH, theEncodedLinks, theBit - 1, aRghNode, aPosition, theFinal); const Standard_Integer aRghChild = emitHierachy (theBVH, theEncodedLinks, theDigit - 1, aRghNode, aPosition, theFinal);
theBVH->NodeInfoBuffer()[aNode].y() = aLftChild; theBVH->NodeInfoBuffer()[aNode].y() = aLftChild;
theBVH->NodeInfoBuffer()[aNode].z() = aRghChild; theBVH->NodeInfoBuffer()[aNode].z() = aRghChild;

29
src/BVH/BVH_RadixSorter.hxx
View File

@ -25,7 +25,7 @@
#include <algorithm> #include <algorithm>
//! Pair of Morton code and primitive ID. //! Pair of Morton code and primitive ID.
typedef std::pair<Standard_Integer, Standard_Integer> BVH_EncodedLink; typedef std::pair<unsigned int, Standard_Integer> BVH_EncodedLink;
//! Performs radix sort of a BVH primitive set using //! Performs radix sort of a BVH primitive set using
//! 10-bit Morton codes (or 1024 x 1024 x 1024 grid). //! 10-bit Morton codes (or 1024 x 1024 x 1024 grid).
@ -65,31 +65,30 @@ namespace BVH
// Radix sort STL predicate for 32-bit integer. // Radix sort STL predicate for 32-bit integer.
struct BitPredicate struct BitPredicate
{ {
Standard_Integer myBit; unsigned int myBit;
//! Creates new radix sort predicate. //! Creates new radix sort predicate.
BitPredicate (const Standard_Integer theBit) : myBit (theBit) {} BitPredicate (const Standard_Integer theDigit) : myBit (1U << theDigit) {}
//! Returns predicate value. //! Returns predicate value.
bool operator() (const BVH_EncodedLink theLink) const bool operator() (const BVH_EncodedLink theLink) const
{ {
const Standard_Integer aMask = 1 << myBit; return !(theLink.first & myBit); // 0-bit to the left side
return !(theLink.first & aMask); // 0-bit to the left side
} }
}; };
//! STL compare tool used in binary search algorithm. //! STL compare tool used in binary search algorithm.
struct BitComparator struct BitComparator
{ {
Standard_Integer myBit; unsigned int myBit;
//! Creates new STL comparator. //! Creates new STL comparator.
BitComparator (const Standard_Integer theBit) : myBit (theBit) {} BitComparator (const Standard_Integer theDigit) : myBit (1U << theDigit) {}
//! Checks left value for the given bit. //! Checks left value for the given bit.
bool operator() (BVH_EncodedLink theLink1, BVH_EncodedLink /*theLink2*/) bool operator() (BVH_EncodedLink theLink1, BVH_EncodedLink /*theLink2*/)
{ {
return !(theLink1.first & (1 << myBit)); return !(theLink1.first & myBit);
} }
}; };
@ -158,12 +157,12 @@ namespace BVH
protected: protected:
// Performs MSD (most significant digit) radix sort. // Performs MSD (most significant digit) radix sort.
static void perform (LinkIterator theStart, LinkIterator theFinal, Standard_Integer theBit = 29) static void perform (LinkIterator theStart, LinkIterator theFinal, Standard_Integer theDigit = 29)
{ {
while (theStart != theFinal && theBit >= 0) while (theStart != theFinal && theDigit >= 0)
{ {
LinkIterator anOffset = std::partition (theStart, theFinal, BitPredicate (theBit--)); LinkIterator anOffset = std::partition (theStart, theFinal, BitPredicate (theDigit--));
perform (theStart, anOffset, theBit); perform (theStart, anOffset, theDigit);
theStart = anOffset; theStart = anOffset;
} }
} }
@ -198,12 +197,12 @@ void BVH_RadixSorter<T, N>::Perform (BVH_Set<T, N>* theSet, const Standard_Integ
const BVH_VecNt aCenter = theSet->Box (aPrimIdx).Center(); const BVH_VecNt aCenter = theSet->Box (aPrimIdx).Center();
const BVH_VecNt aVoxelF = (aCenter - aSceneMin) * aReverseSize; const BVH_VecNt aVoxelF = (aCenter - aSceneMin) * aReverseSize;
Standard_Integer aMortonCode = 0; unsigned int aMortonCode = 0;
for (Standard_Integer aCompIter = 0; aCompIter < aNbEffComp; ++aCompIter) for (Standard_Integer aCompIter = 0; aCompIter < aNbEffComp; ++aCompIter)
{ {
Standard_Integer aVoxel = BVH::IntFloor (BVH::VecComp<T, N>::Get (aVoxelF, aCompIter)); const Standard_Integer aVoxelI = BVH::IntFloor (BVH::VecComp<T, N>::Get (aVoxelF, aCompIter));
aVoxel = Max (0, Min (aVoxel, aDimension - 1)); unsigned int aVoxel = static_cast<unsigned int>(Max (0, Min (aVoxelI, aDimension - 1)));
aVoxel = (aVoxel | (aVoxel << 16)) & 0x030000FF; aVoxel = (aVoxel | (aVoxel << 16)) & 0x030000FF;
aVoxel = (aVoxel | (aVoxel << 8)) & 0x0300F00F; aVoxel = (aVoxel | (aVoxel << 8)) & 0x0300F00F;