Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-09-08 13:23:51 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

Cell and Point locators have correct export visibility

Browse Source 
UBSAN found that these execution object had mixed visibility
causing undefined behavior when casting across DSO's.
This commit is contained in:
Robert Maynard 2019-06-17 08:44:33 -04:00
parent c7f8275818
commit 512d0431ec
6 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vtkm/exec/CellLocator.h
View File

@ -19,7 +19,7 @@ namespace vtkm
namespace exec
{
class CellLocator : public vtkm::VirtualObjectBase
class VTKM_ALWAYS_EXPORT CellLocator : public vtkm::VirtualObjectBase
{
public:
VTKM_EXEC_CONT virtual ~CellLocator() noexcept

3
vtkm/exec/CellLocatorBoundingIntervalHierarchyExec.h
View File

@ -52,7 +52,8 @@ struct CellLocatorBoundingIntervalHierarchyNode
}; // struct CellLocatorBoundingIntervalHierarchyNode
template <typename DeviceAdapter, typename CellSetType>
class VTKM_ALWAYS_EXPORT CellLocatorBoundingIntervalHierarchyExec : public vtkm::exec::CellLocator
class VTKM_ALWAYS_EXPORT CellLocatorBoundingIntervalHierarchyExec final
: public vtkm::exec::CellLocator
{
using NodeArrayHandle =
vtkm::cont::ArrayHandle<vtkm::exec::CellLocatorBoundingIntervalHierarchyNode>;

2
vtkm/exec/CellLocatorRectilinearGrid.h
View File

@ -29,7 +29,7 @@ namespace exec
{
template <typename DeviceAdapter>
class VTKM_ALWAYS_EXPORT CellLocatorRectilinearGrid : public vtkm::exec::CellLocator
class VTKM_ALWAYS_EXPORT CellLocatorRectilinearGrid final : public vtkm::exec::CellLocator
{
private:
using FromType = vtkm::TopologyElementTagPoint;

2
vtkm/exec/CellLocatorUniformGrid.h
View File

@ -28,7 +28,7 @@ namespace exec
{
template <typename DeviceAdapter>
class VTKM_ALWAYS_EXPORT CellLocatorUniformGrid : public vtkm::exec::CellLocator
class VTKM_ALWAYS_EXPORT CellLocatorUniformGrid final : public vtkm::exec::CellLocator
{
private:
using FromType = vtkm::TopologyElementTagPoint;

8
vtkm/exec/PointLocator.h
View File

@ -17,9 +17,15 @@ namespace vtkm
namespace exec
{
class PointLocator : public vtkm::VirtualObjectBase
class VTKM_ALWAYS_EXPORT PointLocator : public vtkm::VirtualObjectBase
{
public:
VTKM_EXEC_CONT virtual ~PointLocator() noexcept
{
// This must not be defaulted, since defaulted virtual destructors are
// troublesome with CUDA __host__ __device__ markup.
}
VTKM_EXEC virtual void FindNearestNeighbor(const vtkm::Vec<vtkm::FloatDefault, 3>& queryPoint,
vtkm::Id& pointId,
vtkm::FloatDefault& distanceSquared) const = 0;

2
vtkm/exec/PointLocatorUniformGrid.h
View File

@ -25,7 +25,7 @@ namespace exec
{
template <typename DeviceAdapter>
class PointLocatorUniformGrid : public vtkm::exec::PointLocator
class VTKM_ALWAYS_EXPORT PointLocatorUniformGrid final : public vtkm::exec::PointLocator
{
public:
using CoordPortalType =