Rebase conflict resolution errors and

Addition of a suggested change.

Signed-off-by: Garima Gupta <[email protected]>

Author: garimagu

sycl/include/CL/sycl/detail/sycl_mem_obj_t.hpp

@@ -83,7 +83,11 @@ class SYCLMemObjT : public SYCLMemObjI {
 
   virtual ~SYCLMemObjT() = default;
 
-  const plugin &getPlugin() const { return MInteropContext->getPlugin(); }
+  const plugin &getPlugin() const {
+    assert((MInteropContext != nullptr) &&
+           "Trying to get Plugin from SYCLMemObjT with nullptr ContextImpl.");
+    return (MInteropContext->getPlugin());
+  }
   size_t getSize() const override { return MSizeInBytes; }
   size_t get_count() const {
     size_t AllocatorValueSize = MAllocator->getValueSize();

sycl/source/detail/usm/usm_impl.cpp

@@ -250,8 +250,9 @@ alloc get_pointer_type(const void *Ptr, const context &Ctxt) {
   pi_usm_type AllocTy;
 
   // query type using PI function
-  PI_CALL(piextUSMGetMemAllocInfo)(PICtx, Ptr, PI_MEM_ALLOC_TYPE,
-                                   sizeof(pi_usm_type), &AllocTy, nullptr);
+  const detail::plugin &Plugin = CtxImpl->getPlugin();
+  Plugin.call<detail::PiApiKind::piextUSMGetMemAllocInfo>(
+      PICtx, Ptr, PI_MEM_ALLOC_TYPE, sizeof(pi_usm_type), &AllocTy, nullptr);
 
   alloc ResultAlloc;
   switch (AllocTy) {
@@ -297,8 +298,9 @@ device get_pointer_device(const void *Ptr, const context &Ctxt) {
   pi_device DeviceId;
 
   // query device using PI function
-  PI_CALL(piextUSMGetMemAllocInfo)(PICtx, Ptr, PI_MEM_ALLOC_DEVICE,
-                                   sizeof(pi_device), &DeviceId, nullptr);
+  const detail::plugin &Plugin = CtxImpl->getPlugin();
+  Plugin.call<detail::PiApiKind::piextUSMGetMemAllocInfo>(
+      PICtx, Ptr, PI_MEM_ALLOC_DEVICE, sizeof(pi_device), &DeviceId, nullptr);
 
   for (const device &Dev : CtxImpl->getDevices()) {
     // Try to find the real sycl device used in the context