From 2383440ca098dd4c6448e664cc8a58600c7365d4 Mon Sep 17 00:00:00 2001
From: Deepak Raj H R <deepak.raj.h.r@intel.com>
Date: Fri, 29 Nov 2024 23:57:24 +0800
Subject: [PATCH 1/2] Fix dereference issue while typecasting frist arg for
 cuMemHostGetDevicePointer

---
 .../DPCT/RuleInfra/CallExprRewriterCommon.h   | 25 +++++++++++++++++++
 clang/lib/DPCT/RulesLang/APINamesMemory.inc   |  2 +-
 clang/test/dpct/USM-restricted.cu             |  4 +++
 3 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/clang/lib/DPCT/RuleInfra/CallExprRewriterCommon.h b/clang/lib/DPCT/RuleInfra/CallExprRewriterCommon.h
index 0d88a3ea482b..b8a6ae828aef 100644
--- a/clang/lib/DPCT/RuleInfra/CallExprRewriterCommon.h
+++ b/clang/lib/DPCT/RuleInfra/CallExprRewriterCommon.h
@@ -818,6 +818,31 @@ inline std::function<std::string(const CallExpr *C)> getDerefedType(size_t Idx)
   };
 }
 
+inline std::function<std::string(const CallExpr *C)> getReplacedTypeNameForDerefExpr(size_t Idx) {
+  return [=](const CallExpr *C) -> std::string {
+    if (Idx >= C->getNumArgs())
+      return "";
+
+    const auto* ArgExpr = C->getArg(Idx);
+    QualType ArgExprType = ArgExpr->getType();
+
+    if (auto *CSCE = dyn_cast<ExplicitCastExpr>(ArgExpr->IgnoreImplicitAsWritten()))
+      ArgExprType = CSCE->getTypeAsWritten();
+
+    while (const auto *ET = dyn_cast<ElaboratedType>(ArgExprType)) {
+      ArgExprType = ET->getNamedType();
+      if (const auto *TDT = dyn_cast<TypedefType>(ArgExprType)) {
+        if (isRedeclInCUDAHeader(TDT))
+          break;
+        ArgExprType = TDT->getDecl()->getUnderlyingType();
+      }
+    }
+
+    ArgExprType = DerefQualType(ArgExprType);
+    return ArgExprType.isNull() ? "" : DpctGlobalInfo::getReplacedTypeName(ArgExprType);
+  };
+}
+
 inline std::function<std::string(const CallExpr *)> getTemplateArg(size_t Idx) {
   return [=](const CallExpr *C) -> std::string {
     std::string TemplateArgStr = "";
diff --git a/clang/lib/DPCT/RulesLang/APINamesMemory.inc b/clang/lib/DPCT/RulesLang/APINamesMemory.inc
index 38099432ab9b..31abc359e157 100644
--- a/clang/lib/DPCT/RulesLang/APINamesMemory.inc
+++ b/clang/lib/DPCT/RulesLang/APINamesMemory.inc
@@ -217,7 +217,7 @@ ASSIGNABLE_FACTORY(ASSIGN_FACTORY_ENTRY("cudaHostGetDevicePointer",
 
 ASSIGNABLE_FACTORY(ASSIGN_FACTORY_ENTRY("cuMemHostGetDevicePointer_v2",
                                         DEREF(makeCallArgCreatorWithCall(0)),
-                                        CAST(getDerefedType(0), ARG(1))))
+                                        CAST(getReplacedTypeNameForDerefExpr(0), ARG(1))))
 
 ASSIGNABLE_FACTORY(CONDITIONAL_FACTORY_ENTRY(
     checkIsUSM(),
diff --git a/clang/test/dpct/USM-restricted.cu b/clang/test/dpct/USM-restricted.cu
index eaa19966d85f..47f818efc5e9 100644
--- a/clang/test/dpct/USM-restricted.cu
+++ b/clang/test/dpct/USM-restricted.cu
@@ -378,6 +378,10 @@ void foo() {
   // CHECK: MY_SAFE_CALL(DPCT_CHECK_ERROR(*D_ptr = (dpct::device_ptr)h_A));
   MY_SAFE_CALL(cuMemHostGetDevicePointer(D_ptr, h_A, 0));
 
+  unsigned long long addr;
+  // CHECK: *(dpct::device_ptr *)&addr = (dpct::device_ptr)h_A;
+  cuMemHostGetDevicePointer((CUdeviceptr *)&addr, h_A, 0);
+
   cudaHostRegister(h_A, size, 0);
   // CHECK: errorCode = 0;
   errorCode = cudaHostRegister(h_A, size, 0);

From a680f29cc36cc74df913086d230157c51b9c3031 Mon Sep 17 00:00:00 2001
From: Deepak Raj H R <deepak.raj.h.r@intel.com>
Date: Mon, 2 Dec 2024 13:34:42 +0800
Subject: [PATCH 2/2] Format code

---
 clang/lib/DPCT/RuleInfra/CallExprRewriterCommon.h | 12 ++++++++----
 clang/lib/DPCT/RulesLang/APINamesMemory.inc       |  3 ++-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/clang/lib/DPCT/RuleInfra/CallExprRewriterCommon.h b/clang/lib/DPCT/RuleInfra/CallExprRewriterCommon.h
index b8a6ae828aef..eaa0cdcc93cd 100644
--- a/clang/lib/DPCT/RuleInfra/CallExprRewriterCommon.h
+++ b/clang/lib/DPCT/RuleInfra/CallExprRewriterCommon.h
@@ -818,15 +818,17 @@ inline std::function<std::string(const CallExpr *C)> getDerefedType(size_t Idx)
   };
 }
 
-inline std::function<std::string(const CallExpr *C)> getReplacedTypeNameForDerefExpr(size_t Idx) {
+inline std::function<std::string(const CallExpr *C)>
+getReplacedTypeNameForDerefExpr(size_t Idx) {
   return [=](const CallExpr *C) -> std::string {
     if (Idx >= C->getNumArgs())
       return "";
 
-    const auto* ArgExpr = C->getArg(Idx);
+    const auto *ArgExpr = C->getArg(Idx);
     QualType ArgExprType = ArgExpr->getType();
 
-    if (auto *CSCE = dyn_cast<ExplicitCastExpr>(ArgExpr->IgnoreImplicitAsWritten()))
+    if (auto *CSCE =
+            dyn_cast<ExplicitCastExpr>(ArgExpr->IgnoreImplicitAsWritten()))
       ArgExprType = CSCE->getTypeAsWritten();
 
     while (const auto *ET = dyn_cast<ElaboratedType>(ArgExprType)) {
@@ -839,7 +841,9 @@ inline std::function<std::string(const CallExpr *C)> getReplacedTypeNameForDeref
     }
 
     ArgExprType = DerefQualType(ArgExprType);
-    return ArgExprType.isNull() ? "" : DpctGlobalInfo::getReplacedTypeName(ArgExprType);
+    return ArgExprType.isNull()
+               ? ""
+               : DpctGlobalInfo::getReplacedTypeName(ArgExprType);
   };
 }
 
diff --git a/clang/lib/DPCT/RulesLang/APINamesMemory.inc b/clang/lib/DPCT/RulesLang/APINamesMemory.inc
index 31abc359e157..9901c17a6cc2 100644
--- a/clang/lib/DPCT/RulesLang/APINamesMemory.inc
+++ b/clang/lib/DPCT/RulesLang/APINamesMemory.inc
@@ -217,7 +217,8 @@ ASSIGNABLE_FACTORY(ASSIGN_FACTORY_ENTRY("cudaHostGetDevicePointer",
 
 ASSIGNABLE_FACTORY(ASSIGN_FACTORY_ENTRY("cuMemHostGetDevicePointer_v2",
                                         DEREF(makeCallArgCreatorWithCall(0)),
-                                        CAST(getReplacedTypeNameForDerefExpr(0), ARG(1))))
+                                        CAST(getReplacedTypeNameForDerefExpr(0),
+                                             ARG(1))))
 
 ASSIGNABLE_FACTORY(CONDITIONAL_FACTORY_ENTRY(
     checkIsUSM(),