[SYCLomatic] Add ${method_base} keyword in user-defined rule (#2434)

In "${method_base} member_function",  ${method_base} is used to represent the Object or pointer to the Object for the cxx member_function.


Signed-off-by: Huang, Andy <[email protected]>

Author: AndyCHHuang

clang/lib/DPCT/RuleInfra/CallExprRewriter.h

@@ -11,7 +11,6 @@
 
 #include "Diagnostics/Diagnostics.h"
 
-
 namespace clang {
 namespace dpct {
 
@@ -1683,6 +1682,34 @@ class UserDefinedRewriter : public CallExprRewriter {
       OS << getTemplateArg(OB.ArgIndex)(Call);
       return;
     }
+    case (OutputBuilder::Kind::MethodBase): {
+      if (auto *MCE = llvm::dyn_cast<CXXMemberCallExpr>(Call)) {
+        if (auto *Callee = llvm::dyn_cast<MemberExpr>(MCE->getCallee())) {
+          auto &SM = DpctGlobalInfo::getSourceManager();
+          auto &Context = DpctGlobalInfo::getContext();
+          auto CallRange =
+              getDefinitionRange(Call->getBeginLoc(), Call->getEndLoc());
+          auto LastTokenLength = Lexer::MeasureTokenLength(
+              CallRange.getEnd(), SM, Context.getLangOpts());
+          auto Base = Callee->getBase();
+          std::string BaseStr;
+          if (isa<CXXThisExpr>(Callee->getBase())) {
+            BaseStr = "this";
+          } else {
+            BaseStr = getStringInRange(
+                Base->getSourceRange(), CallRange.getBegin(),
+                CallRange.getEnd().getLocWithOffset(LastTokenLength));
+          }
+          OS << BaseStr;
+          if (Callee->isArrow()) {
+            OS << "->";
+          } else {
+            OS << ".";
+          }
+        }
+      }
+      return;
+    }
     }
     DpctDebugs() << "[OutputBuilder::Kind] Unexpected value: " << OB.Kind
                  << "\n";

clang/lib/DPCT/UserDefinedRules/UserDefinedRules.cpp

@@ -16,6 +16,7 @@
 #include "MigrationRuleManager.h"
 #include "RuleInfra/TypeLocRewriters.h"
 #include "Utility.h"
+#include "clang/ASTMatchers/ASTMatchers.h"
 #include "llvm/Support/YAMLTraits.h"
 
 using namespace clang::ast_matchers;
@@ -591,6 +592,9 @@ OutputBuilder::consumeKeyword(std::string &OutStr, size_t &Idx) {
     ResultBuilder->Kind = Kind::TemplateArg;
     ResultBuilder->ArgIndex = consumeArgIndex(OutStr, Idx, "$template_arg");
     consumeRParen(OutStr, Idx, "$template_arg");
+  } else if (OutStr.substr(Idx, 12) == "$method_base") {
+    Idx += 12;
+    ResultBuilder->Kind = Kind::MethodBase;
   } else {
     ResultBuilder->Kind = Kind::Arg;
     ResultBuilder->ArgIndex = consumeArgIndex(OutStr, Idx, "$");
@@ -738,12 +742,16 @@ void clang::dpct::UserDefinedClassFieldRule::runRule(
 
 void clang::dpct::UserDefinedClassMethodRule::registerMatcher(
     clang::ast_matchers::MatchFinder &MF) {
-  MF.addMatcher(cxxMemberCallExpr(
-                    allOf(on(hasType(hasCanonicalType(qualType(
-                              hasDeclaration(namedDecl(hasName(BaseName))))))),
-                          callee(cxxMethodDecl(hasName(MethodName)))))
-                    .bind("memberCallExpr"),
-                this);
+  MF.addMatcher(
+      cxxMemberCallExpr(
+          anyOf(allOf(on(hasType(hasCanonicalType(qualType(
+                          hasDeclaration(namedDecl(hasName(BaseName))))))),
+                      callee(cxxMethodDecl(hasName(MethodName)))),
+                allOf(on(hasType(pointerType(pointee(hasCanonicalType(qualType(
+                          hasDeclaration(namedDecl(hasName(BaseName))))))))),
+                      callee(cxxMethodDecl(hasName(MethodName))))))
+          .bind("memberCallExpr"),
+      this);
 }
 
 void clang::dpct::UserDefinedClassMethodRule::runRule(

clang/lib/DPCT/UserDefinedRules/UserDefinedRules.h

@@ -347,7 +347,8 @@ class OutputBuilder {
     TypeName,
     AddrOf,
     DerefedTypeName,
-    TemplateArg
+    TemplateArg,
+    MethodBase
   };
   std::string RuleName;
   clang::tooling::UnifiedPath RuleFile;

clang/test/dpct/user_defined_rule.yaml

@@ -65,7 +65,7 @@
       Out: fieldD
   Methods:
     - In: methodA
-      Out: a.methodB($2)
+      Out: $method_base methodB($2)
     - In: methodC
       Out: methodD
 - Rule: rule_Fruit