From 44ac74c9db780cd6b878861446ca22d5f74f4ee8 Mon Sep 17 00:00:00 2001 From: Siu Chi Chan Date: Thu, 29 Nov 2018 11:38:31 -0500 Subject: [PATCH] Revert "Missing handling nullary `__global__` functions for mixed arity cases." This reverts commit 5647e0ae3561208cceabc6e4f96ebc3bab94708e. [ROCm/clr commit: c5df445d1fdbc2ca6f4468c10d2e18d156cc220e] --- projects/clr/hipamd/src/program_state.cpp | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/projects/clr/hipamd/src/program_state.cpp b/projects/clr/hipamd/src/program_state.cpp index 7e42a44245..97e9035e0d 100644 --- a/projects/clr/hipamd/src/program_state.cpp +++ b/projects/clr/hipamd/src/program_state.cpp @@ -409,18 +409,13 @@ void read_kernarg_metadata( auto fn = tmp.substr(dx, tmp.find_first_of("'\n", dx) - dx); dx += fn.size(); - - auto dx1 = tmp.find("CodeProps", dx); dx = tmp.find("Args:", dx); - if (dx1 < dx) { - dx = dx1; - continue; - } if (dx == string::npos) break; static constexpr decltype(tmp.size()) args_sz{5}; - dx = parse_args(tmp, dx + args_sz, dx1, kernargs[fn]); + dx = parse_args( + tmp, dx + args_sz, tmp.find("CodeProps", dx), kernargs[fn]); } while (true); } }