From 12bf2e3f734e82264b6debed4a9de56abfc192de Mon Sep 17 00:00:00 2001
From: Evgeny Mankov <Evgeniy.Mankov@amd.com>
Date: Tue, 27 Dec 2016 18:54:02 +0300
Subject: [PATCH] [HIPIFY] [Fix] An argument of a function used as macro
 argument is not hipified.

https://github.com/GPUOpen-ProfessionalCompute-Tools/HIP/issues/35


[ROCm/hip commit: 5ec0488ce845a9cfb3c78c43a147c31159775533]
---
 projects/hip/hipify-clang/src/Cuda2Hip.cpp | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/projects/hip/hipify-clang/src/Cuda2Hip.cpp b/projects/hip/hipify-clang/src/Cuda2Hip.cpp
index acba13b1e9..790973f1ad 100644
--- a/projects/hip/hipify-clang/src/Cuda2Hip.cpp
+++ b/projects/hip/hipify-clang/src/Cuda2Hip.cpp
@@ -1671,8 +1671,6 @@ public:
                             const MacroDefinition &MD, SourceRange Range,
                             const MacroArgs *Args) override {
     if (_sm->isWrittenInMainFile(MacroNameTok.getLocation())) {
-      StringRef macroName = MacroNameTok.getIdentifierInfo()->getName();
-      if (N.cudaExcludes.end() == N.cudaExcludes.find(macroName)) {
         for (unsigned int i = 0; Args && i < MD.getMacroInfo()->getNumArgs(); i++) {
           std::vector<Token> toks;
           // Code below is a kind of stolen from 'MacroArgs::getPreExpArgument'
@@ -1684,16 +1682,13 @@ public:
   #else
           _pp->EnterTokenStream(start, len, false, false);
   #endif
-          int j = 0;
           do {
             toks.push_back(Token());
             Token &tk = toks.back();
             _pp->Lex(tk);
-            j++;
           } while (toks.back().isNot(tok::eof));
           _pp->RemoveTopOfLexerStack();
           // end of stolen code
-          j = 0;
           for (auto tok : toks) {
             if (tok.isAnyIdentifier()) {
               StringRef name = tok.getIdentifierInfo()->getName();
@@ -1750,10 +1745,8 @@ public:
                 }
               }
             }
-            j++;
           }
         }
-      }
     }
   }