From 5af8ba85136eeeab081c2bcc474c0ed69d08ca31 Mon Sep 17 00:00:00 2001 From: jiabaxie Date: Fri, 8 Mar 2024 16:29:42 -0500 Subject: [PATCH] SWDEV-450204 - hipGetProcAddress check for null corrected Change-Id: Ic34b0d561d3d70f3411a60924a64c3b89954394f [ROCm/clr commit: 14bcbcc25b5591e9eadac93a80aaa963839e7d36] --- projects/clr/hipamd/src/hip_api_trace.cpp | 2 +- projects/clr/hipamd/src/hip_device.cpp | 4 ++-- projects/clr/hipamd/src/hip_table_interface.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/projects/clr/hipamd/src/hip_api_trace.cpp b/projects/clr/hipamd/src/hip_api_trace.cpp index 50de6878e6..7a6d69bc22 100644 --- a/projects/clr/hipamd/src/hip_api_trace.cpp +++ b/projects/clr/hipamd/src/hip_api_trace.cpp @@ -762,7 +762,7 @@ hipError_t hipExtGetLastError(); hipError_t hipTexRefGetBorderColor(float* pBorderColor, const textureReference* texRef); hipError_t hipTexRefGetArray(hipArray_t* pArray, const textureReference* texRef); hipError_t hipGetProcAddress(const char* symbol, void** pfn, int hipVersion, uint64_t flags, - hipDriverProcAddressQueryResult* symbolStatus = NULL); + hipDriverProcAddressQueryResult* symbolStatus); hipError_t hipStreamBeginCaptureToGraph(hipStream_t stream, hipGraph_t graph, const hipGraphNode_t* dependencies, const hipGraphEdgeData* dependencyData, diff --git a/projects/clr/hipamd/src/hip_device.cpp b/projects/clr/hipamd/src/hip_device.cpp index cd2ecb18e8..019ee223eb 100644 --- a/projects/clr/hipamd/src/hip_device.cpp +++ b/projects/clr/hipamd/src/hip_device.cpp @@ -602,11 +602,11 @@ hipError_t hipGetDevicePropertiesR0000(hipDeviceProp_tR0000* prop, int device) { } hipError_t hipGetProcAddress(const char* symbol, void** pfn, int hipVersion, uint64_t flags, - hipDriverProcAddressQueryResult* symbolStatus = nullptr) { + hipDriverProcAddressQueryResult* symbolStatus) { HIP_INIT_API(hipGetProcAddress, symbol, pfn, hipVersion, flags, symbolStatus); std::string symbolString = symbol; - if(symbol == nullptr || symbolString == "" || *pfn == nullptr){ + if(symbol == nullptr || symbolString == "" || pfn == nullptr){ HIP_RETURN(hipErrorInvalidValue); } diff --git a/projects/clr/hipamd/src/hip_table_interface.cpp b/projects/clr/hipamd/src/hip_table_interface.cpp index b561091687..5369bca662 100644 --- a/projects/clr/hipamd/src/hip_table_interface.cpp +++ b/projects/clr/hipamd/src/hip_table_interface.cpp @@ -1729,7 +1729,7 @@ hipError_t hipTexRefGetArray(hipArray_t* pArray, const textureReference* texRef) } extern "C" hipError_t hipGetProcAddress(const char* symbol, void** pfn, int hipVersion, uint64_t flags, - hipDriverProcAddressQueryResult* symbolStatus = nullptr) { + hipDriverProcAddressQueryResult* symbolStatus) { return hip::GetHipDispatchTable()->hipGetProcAddress_fn(symbol, pfn, hipVersion, flags, symbolStatus); }