[SYCLomatic] Fix compile warning (#2707)

Signed-off-by: Jiang, Zhiwei <zhiwei.jiang@intel.com>

Author: zhiweij1

clang/lib/DPCT/PreProcessor.cpp

@@ -20,7 +20,6 @@
 #include "clang/AST/Type.h"
 #include "clang/AST/TypeLoc.h"
 #include "clang/Analysis/AnalysisDeclContext.h"
-#include "clang/Analysis/CallGraph.h"
 #include "clang/Basic/Cuda.h"
 #include "clang/Basic/SourceLocation.h"
 #include "clang/DPCT/DpctOptions.h"

clang/lib/DPCT/RuleInfra/CallExprRewriterCommon.h

@@ -2185,7 +2185,7 @@ const std::string MipmapNeedBindlessImage =
                                         DOES_FIRST_LEVEL_POINTER_NEED_CONST)
 #define NEW(...) makeNewDeleteExprCreator(true, __VA_ARGS__)
 #define DELETE(...) makeNewDeleteExprCreator(false, __VA_ARGS__)
-#define DECL(TYPE, VAR, ...) makeDeclCreator(TYPE, VAR, __VA_ARGS__)
+#define DECLARE(TYPE, VAR, ...) makeDeclCreator(TYPE, VAR, __VA_ARGS__)
 #define TYPENAME(SUBEXPR) makeTypenameExprCreator(SUBEXPR)
 #define ZERO_INITIALIZER(SUBEXPR) makeZeroInitializerCreator(SUBEXPR)
 #define SUBGROUP                                                               \

clang/lib/DPCT/RuleInfra/TypeLocRewriters.cpp

@@ -114,7 +114,7 @@ class CheckTemplateArgCount {
         return Num == Count;
       }
       size_t NoneDefaultNum = 0;
-      for (int i = 0; i < Num; i++) {
+      for (size_t i = 0; i < Num; i++) {
         if (!TSTL.getArgLoc(i).getArgument().getIsDefaulted()) {
           NoneDefaultNum++;
         }

clang/lib/DPCT/RulesLang/RulesLang.cpp

@@ -7317,7 +7317,7 @@ TypeMmberRule::findTokenEndBeforeColonColon(SourceLocation TokStart,
 
   bool FoundColonColon = false;
   // Find coloncolon
-  while (TokPtr && (TokPtr - 1)) {
+  while (TokPtr) {
     if (*TokPtr == ':' && *(TokPtr - 1) == ':') {
       TokPtr = TokPtr - 2;
       FoundColonColon = true;

clang/lib/DPCT/RulesLang/RulesLangCooperativeGroups.cpp

@@ -22,7 +22,6 @@
 #include "clang/AST/TypeLoc.h"
 #include "clang/ASTMatchers/ASTMatchers.h"
 #include "clang/Analysis/AnalysisDeclContext.h"
-#include "clang/Analysis/CallGraph.h"
 #include "clang/Basic/SourceLocation.h"
 #include "clang/Lex/MacroArgs.h"
 

clang/lib/DPCT/RulesLang/RulesLangNoneAPIAndType.cpp

@@ -21,7 +21,6 @@
 #include "clang/AST/TypeLoc.h"
 #include "clang/ASTMatchers/ASTMatchers.h"
 #include "clang/Analysis/AnalysisDeclContext.h"
-#include "clang/Analysis/CallGraph.h"
 #include "clang/Basic/Cuda.h"
 #include "clang/Basic/SourceLocation.h"
 #include "clang/Lex/MacroArgs.h"

clang/lib/DPCT/RulesLang/RulesLangTexture.cpp

@@ -24,7 +24,6 @@
 #include "clang/AST/TypeLoc.h"
 #include "clang/ASTMatchers/ASTMatchers.h"
 #include "clang/Analysis/AnalysisDeclContext.h"
-#include "clang/Analysis/CallGraph.h"
 #include "clang/Basic/Cuda.h"
 #include "clang/Basic/SourceLocation.h"
 #include "clang/Lex/MacroArgs.h"

clang/lib/DPCT/RulesMathLib/APINamesCUBLAS.inc

@@ -437,13 +437,6 @@ void BLASFunctionCallRule::runRule(const MatchFinder::MatchResult &Result) {
   bool NeedUseLambda = isConditionOfFlowControl(
       CE, OriginStmtType, CanAvoidUsingLambda, OuterInsertLoc);
   bool IsInReturnStmt = isInReturnStmt(CE, OuterInsertLoc);
-  bool CanAvoidBrace = false;
-  const CompoundStmt *CS = findImmediateBlock(CE);
-  if (CS && (CS->size() == 1)) {
-    const Stmt *S = *(CS->child_begin());
-    if (CE == S || dyn_cast<ReturnStmt>(S))
-      CanAvoidBrace = true;
-  }
 
   if (NeedUseLambda) {
     PrefixInsertLoc = FuncNameBegin;