[SYCLomatic] Do not add dpct_operator_overloading namespace for user-defined types (#2011)

Signed-off-by: Jiang, Zhiwei <[email protected]>

Author: zhiweij1

clang/lib/DPCT/ASTTraversal.cpp

@@ -2214,7 +2214,11 @@ void TypeInDeclRule::runRule(const MatchFinder::MatchResult &Result) {
     return;
   }
   if (auto TL = getNodeAsType<TypeLoc>(Result, "cudaTypeDef")) {
-
+    if (const auto *ND = getNamedDecl(TL->getTypePtr())) {
+      auto Loc = ND->getBeginLoc();
+      if (DpctGlobalInfo::isInAnalysisScope(Loc))
+        return;
+    }
     // if TL is the T in
     // template<typename T> void foo(T a);
     if (TL->getType()->getTypeClass() == clang::Type::SubstTemplateTypeParm ||
@@ -2828,8 +2832,16 @@ AST_MATCHER(FunctionDecl, overloadedVectorOperator) {
       return false;
 
     const std::string TypeName = IDInfo->getName().str();
-    return (MapNames::SupportedVectorTypes.find(TypeName) !=
-            MapNames::SupportedVectorTypes.end());
+    if (MapNames::SupportedVectorTypes.find(TypeName) !=
+        MapNames::SupportedVectorTypes.end()) {
+      if (const auto *ND = getNamedDecl(PD->getType().getTypePtr())) {
+        auto Loc = ND->getBeginLoc();
+        if (DpctGlobalInfo::isInAnalysisScope(Loc))
+          return false;
+      }
+      return true;
+    }
+    return false;
   };
 
   // As long as one parameter is vector type

clang/lib/DPCT/Utility.cpp

@@ -3262,6 +3262,10 @@ const NamedDecl *getNamedDecl(const clang::Type *TypePtr) {
     ND = getNamedDecl(ET->getNamedType().getTypePtr());
   } else if (auto TST = dyn_cast<clang::TemplateSpecializationType>(TypePtr)) {
     ND = TST->getTemplateName().getAsTemplateDecl();
+  } else if (auto LVRT = dyn_cast<clang::LValueReferenceType>(TypePtr)) {
+    ND = getNamedDecl(LVRT->getPointeeType().getTypePtr());
+  } else if (auto RVRT = dyn_cast<clang::RValueReferenceType>(TypePtr)) {
+    ND = getNamedDecl(RVRT->getPointeeType().getTypePtr());
   }
   return ND;
 }

clang/test/dpct/overload_operator.cpp

@@ -0,0 +1,14 @@
+// RUN: dpct --format-range=none --out-root %T/overload_operator %s --cuda-include-path="%cuda-path/include" --extra-arg="-xc++" || true
+// RUN: FileCheck %s --match-full-lines --input-file %T/overload_operator/overload_operator.cpp
+// RUN: %if build_lit %{icpx -c -fsycl %T/overload_operator/overload_operator.cpp -o %T/overload_operator/overload_operator.o %}
+
+// CHECK: struct half {};
+// CHECK-NEXT: half operator+(half &&a, half &&b) { return a; }
+// CHECK-NEXT: half operator-(half &a, half &b) { return a; }
+// CHECK-NEXT: void foo1() { half() + half(); }
+// CHECK-NEXT: void foo2(half &a, half &b) { a - b; }
+struct half {};
+half operator+(half &&a, half &&b) { return a; }
+half operator-(half &a, half &b) { return a; }
+void foo1() { half() + half(); }
+void foo2(half &a, half &b) { a - b; }