address reviews

Author: adurang

offload/libomptarget/OpenMP/InteropAPI.cpp

@@ -364,10 +364,15 @@ void __tgt_interop_init(ident_t *LocRef, int32_t Gtid,
                         omp_interop_val_t *&InteropPtr, int32_t InteropType,
                         int32_t DeviceId, int32_t Ndeps,
                         kmp_depend_info_t *DepList, int32_t HaveNowait) {
+  constexpr int32_t old_kmp_interop_type_targetsync = 2;
   interop_ctx_t Ctx = {0, {false, (bool)HaveNowait, 0}, Gtid};
   dep_pack_t Deps = {Ndeps, 0, DepList, nullptr};
-  InteropPtr = __tgt_interop_get(LocRef, InteropType == 2 ? 1 : 0, DeviceId, 0,
-                                 nullptr, &Ctx, Ndeps ? &Deps : nullptr);
+  InteropPtr =
+      __tgt_interop_get(LocRef,
+                        InteropType == old_kmp_interop_type_targetsync
+                            ? kmp_interop_type_targetsync
+                            : kmp_interop_type_target,
+                        DeviceId, 0, nullptr, &Ctx, Ndeps ? &Deps : nullptr);
 }
 
 void __tgt_interop_use(ident_t *LocRef, int32_t Gtid,

offload/plugins-nextgen/amdgpu/src/rtl.cpp

@@ -2738,9 +2738,8 @@ struct AMDGPUDeviceTy : public GenericDeviceTy, AMDGenericDeviceTy {
   }
 
   Error releaseInterop(omp_interop_val_t *Interop) override {
-    if (!Interop)
-      return Plugin::success();
-    delete Interop;
+    if (Interop)
+      delete Interop;
     return Plugin::success();
   }
 

offload/plugins-nextgen/cuda/src/rtl.cpp

@@ -942,8 +942,7 @@ struct CUDADeviceTy : public GenericDeviceTy {
       if (auto Err = setContext())
         return Err;
       CUstream Stream;
-      if (auto Err = CUDAStreamManager.getResource(
-              *reinterpret_cast<CUstream *>(&Stream)))
+      if (auto Err = CUDAStreamManager.getResource(Stream))
         return Err;
 
       Ret->async_info->Queue = Stream;