From 0e2c6ebac3c51f199659e6d77368e554da1e4b36 Mon Sep 17 00:00:00 2001 From: Michael LIAO Date: Tue, 5 May 2020 13:15:56 -0400 Subject: [PATCH] Fix build failure. - Also fix `-Wreorder` warning. NFC. Change-Id: I766fdc622c9107f901a55498bdc8fef3d821d1b7 [ROCm/clr commit: 12fcfee41d028aa5b829582f02698635046c43d0] --- projects/clr/rocclr/device/rocm/rockernel.cpp | 4 ++-- projects/clr/rocclr/platform/program.hpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/projects/clr/rocclr/device/rocm/rockernel.cpp b/projects/clr/rocclr/device/rocm/rockernel.cpp index d373bb1bcd..62ee61afae 100644 --- a/projects/clr/rocclr/device/rocm/rockernel.cpp +++ b/projects/clr/rocclr/device/rocm/rockernel.cpp @@ -234,8 +234,8 @@ bool HSAILKernel::init() { } uint32_t wavefront_size = 0; - if (HSA_STATUS_SUCCESS != - hsa_agent_get_info(program()->hsaDevice(), HSA_AGENT_INFO_WAVEFRONT_SIZE, &wavefront_size)) { + hsa_status_t hsaStatus = hsa_agent_get_info(program()->hsaDevice(), HSA_AGENT_INFO_WAVEFRONT_SIZE, &wavefront_size); + if (HSA_STATUS_SUCCESS != hsaStatus) { DevLogPrintfError("Could not get Wave Info Size: %d, failed with hsa_status: %d \n", errorCode, hsaStatus); return false; diff --git a/projects/clr/rocclr/platform/program.hpp b/projects/clr/rocclr/platform/program.hpp index ec71c6ff91..91d4d98ad9 100644 --- a/projects/clr/rocclr/platform/program.hpp +++ b/projects/clr/rocclr/platform/program.hpp @@ -143,8 +143,8 @@ class Program : public RuntimeObject { Program(Context& context, Language language = Binary, const void* mmap_ptr = nullptr, const size_t mmap_size = 0) : context_(context), language_(language), - mmap_({mmap_ptr, mmap_size}), - symbolTable_(NULL) {} + symbolTable_(NULL), + mmap_({mmap_ptr, mmap_size}) {} //! Returns context, associated with the current program. const Context& context() const { return context_(); }