From 3e89277a9ba6127592b7168eff399d46bfbce95a Mon Sep 17 00:00:00 2001
From: Evgeny Mankov <Evgeniy.Mankov@amd.com>
Date: Fri, 28 Apr 2017 21:59:33 +0300
Subject: [PATCH] [HIPIFY] Rename enumConstantDecl -> enumDecl

Reason: not to mix up with clang's enumConstantDecl, used for enum DeclRefExpr (enum constant).
---
 hipamd/hipify-clang/src/Cuda2Hip.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/hipamd/hipify-clang/src/Cuda2Hip.cpp b/hipamd/hipify-clang/src/Cuda2Hip.cpp
index 35c930f3af..390b4ee88c 100644
--- a/hipamd/hipify-clang/src/Cuda2Hip.cpp
+++ b/hipamd/hipify-clang/src/Cuda2Hip.cpp
@@ -2804,10 +2804,10 @@ private:
     return false;
   }
 
-  bool cudaEnumConstantDecl(const MatchFinder::MatchResult &Result) {
-    if (const VarDecl *enumConstantDecl = Result.Nodes.getNodeAs<VarDecl>("cudaEnumConstantDecl")) {
-      StringRef name = enumConstantDecl->getType()->getAsTagDecl()->getNameAsString();
-      QualType QT = enumConstantDecl->getType().getUnqualifiedType();
+  bool cudaEnumDecl(const MatchFinder::MatchResult &Result) {
+    if (const VarDecl *enumDecl = Result.Nodes.getNodeAs<VarDecl>("cudaEnumDecl")) {
+      StringRef name = enumDecl->getType()->getAsTagDecl()->getNameAsString();
+      QualType QT = enumDecl->getType().getUnqualifiedType();
       StringRef name_unqualified = QT.getAsString();
       if ((name_unqualified.find(' ') == StringRef::npos && name.find(' ') == StringRef::npos) || name.empty()) {
         name = name_unqualified;
@@ -2816,8 +2816,8 @@ private:
       // Example: void func(enum cudaMemcpyKind kind);
       //-------------------------------------------------
       SourceManager *SM = Result.SourceManager;
-      SourceLocation sl(enumConstantDecl->getLocStart());
-      SourceLocation end(enumConstantDecl->getLocEnd());
+      SourceLocation sl(enumDecl->getLocStart());
+      SourceLocation end(enumDecl->getLocEnd());
       size_t repLength = SM->getCharacterData(end) - SM->getCharacterData(sl);
       StringRef sfull = StringRef(SM->getCharacterData(sl), repLength);
       size_t offset = sfull.find(name);
@@ -3123,7 +3123,7 @@ public:
       if (cudaCall(Result)) break;
       if (cudaBuiltin(Result)) break;
       if (cudaEnumConstantRef(Result)) break;
-      if (cudaEnumConstantDecl(Result)) break;
+      if (cudaEnumDecl(Result)) break;
       if (cudaTypedefVar(Result)) break;
       if (cudaTypedefVarPtr(Result)) break;
       if (cudaStructVar(Result)) break;
@@ -3169,7 +3169,7 @@ void addAllMatchers(ast_matchers::MatchFinder &Finder, Cuda2HipCallback *Callbac
                                 Callback);
   Finder.addMatcher(varDecl(isExpansionInMainFile(),
                             hasType(enumDecl()))
-                            .bind("cudaEnumConstantDecl"),
+                            .bind("cudaEnumDecl"),
                             Callback);
   Finder.addMatcher(varDecl(isExpansionInMainFile(),
                             hasType(typedefDecl(matchesName("cu.*|CU.*"))))