diff --git a/hipamd/src/hip_code_object.cpp b/hipamd/src/hip_code_object.cpp index d36ad9e9e6..c719a68024 100644 --- a/hipamd/src/hip_code_object.cpp +++ b/hipamd/src/hip_code_object.cpp @@ -509,9 +509,6 @@ hipError_t DynCO::loadCodeObject(const char* fname, const void* image) { // Define Global functions IHIP_RETURN_ONFAIL(populateDynGlobalFuncs()); - // Resets the file info such as desc, size and name - // as they are not necessary once the code object is loaded - fb_info_->ResetFileInfo(); return hipSuccess; } diff --git a/hipamd/src/hip_fatbin.cpp b/hipamd/src/hip_fatbin.cpp index c36609730f..2c7f46973f 100644 --- a/hipamd/src/hip_fatbin.cpp +++ b/hipamd/src/hip_fatbin.cpp @@ -30,7 +30,20 @@ FatBinaryInfo::~FatBinaryInfo() { delete fbd; } - ResetFileInfo(); + if (fdesc_ > 0) { + if (fsize_ && !amd::Os::MemoryUnmapFile(image_, fsize_)) { + guarantee(false, "Cannot unmap file"); + } + if (!amd::Os::CloseFileHandle(fdesc_)) { + guarantee(false, "Cannot close file"); + } + } + + fname_ = std::string(); + fdesc_ = amd::Os::FDescInit(); + fsize_ = 0; + image_ = nullptr; + uri_ = std::string(); } hipError_t FatBinaryInfo::ExtractFatBinary(const std::vector& devices) { diff --git a/hipamd/src/hip_fatbin.hpp b/hipamd/src/hip_fatbin.hpp index 4692f4d247..219a96e802 100644 --- a/hipamd/src/hip_fatbin.hpp +++ b/hipamd/src/hip_fatbin.hpp @@ -67,24 +67,6 @@ public: return hipSuccess; } - // Resets the file information - void ResetFileInfo() { - if (fdesc_ > 0) { - if (fsize_ && !amd::Os::MemoryUnmapFile(image_, fsize_)) { - guarantee(false, "Cannot unmap file"); - } - if (!amd::Os::CloseFileHandle(fdesc_)) { - guarantee(false, "Cannot close file"); - } - } - - fname_ = std::string(); - fdesc_ = amd::Os::FDescInit(); - fsize_ = 0; - image_ = nullptr; - uri_ = std::string(); - } - private: std::string fname_; // File name amd::Os::FileDesc fdesc_; // File descriptor