From c42b53faaccad2fb94eb8672ca85e12c8a9c475e Mon Sep 17 00:00:00 2001 From: foreman Date: Tue, 6 Sep 2016 14:19:41 -0400 Subject: [PATCH] P4 to Git Change 1311277 by lmoriche@lmoriche_opencl_dev on 2016/09/06 14:11:25 SWDEV-101853 - Fix the build, add a "return NULL" after the assert. Affected files ... ... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rockernel.hpp#7 edit [ROCm/clr commit: 59ca1d70e611f271d01fd42ea172a4f6f104a891] --- projects/clr/rocclr/runtime/device/rocm/rockernel.hpp | 1 + 1 file changed, 1 insertion(+) diff --git a/projects/clr/rocclr/runtime/device/rocm/rockernel.hpp b/projects/clr/rocclr/runtime/device/rocm/rockernel.hpp index a08a138a74..956d3be17e 100644 --- a/projects/clr/rocclr/runtime/device/rocm/rockernel.hpp +++ b/projects/clr/rocclr/runtime/device/rocm/rockernel.hpp @@ -141,6 +141,7 @@ public: Argument* hsailArgAt(size_t index) const { for (auto arg : hsailArgList_) if (arg->index_ == index) return arg; assert(!"Should not reach here"); + return NULL; } //! Max number of possible extra (hidden) kernel arguments