fix and duplication removal

Signed-off-by: Tikhomirova, Kseniya <[email protected]>

Author: KseniyaTikhomirova

sycl/source/detail/program_manager/program_manager.cpp

@@ -243,12 +243,6 @@ ProgramManager::createURProgram(const RTDeviceBinaryImage &Img,
           : createBinaryProgram(Ctx, Devices, Binaries.data(), Lengths.data(),
                                 ProgMetadata);
 
-  {
-    std::lock_guard<std::mutex> Lock(MNativeProgramsMutex);
-    // associate the UR program with the image it was created for
-    NativePrograms.insert({Res, &Img});
-  }
-
   Ctx->addDeviceGlobalInitializer(Res, Devices, &Img);
 
   if constexpr (DbgProgMgr > 1)
@@ -509,7 +503,7 @@ std::pair<ur_program_handle_t, bool> ProgramManager::getOrCreateURProgram(
     const std::vector<const RTDeviceBinaryImage *> &AllImages,
     const context &Context, const std::vector<device> &Devices,
     const std::string &CompileAndLinkOptions, SerializedObj SpecConsts) {
-  ur_program_handle_t NativePrg; // TODO: Or native?
+  ur_program_handle_t NativePrg;
 
   auto BinProg = PersistentDeviceCodeCache::getItemFromDisc(
       Devices[0], AllImages, SpecConsts, CompileAndLinkOptions);
@@ -750,7 +744,8 @@ setSpecializationConstants(const std::shared_ptr<device_image_impl> &InputImpl,
   }
 }
 
-static inline void CheckAndDecompressImage([[maybe_unused]] RTDeviceBinaryImage *Img) {
+static inline void
+CheckAndDecompressImage([[maybe_unused]] RTDeviceBinaryImage *Img) {
 #ifndef SYCL_RT_ZSTD_NOT_AVAIABLE
   if (auto CompImg = dynamic_cast<CompressedRTDeviceBinaryImage *>(Img))
     if (CompImg->IsCompressed())
@@ -891,6 +886,11 @@ ur_program_handle_t ProgramManager::getBuiltURProgram(
 
     {
       std::lock_guard<std::mutex> Lock(MNativeProgramsMutex);
+      // NativePrograms map does not intend to keep reference to program handle,
+      // so keys in the map can be invalid (reference count went to zero and the
+      // underlying program disposed of). Protecting from incorrect values by
+      // removal of map entries with same handle (obviously invalid entries).
+      std::ignore = NativePrograms.erase(BuiltProgram.get());
       NativePrograms.insert({BuiltProgram.get(), &Img});
       for (RTDeviceBinaryImage *LinkedImg : DeviceImagesToLink) {
         NativePrograms.insert({BuiltProgram.get(), LinkedImg});