Rebase to avoid conflicts

Author: premanandrao

clang/include/clang/Basic/DiagnosticSemaKinds.td

@@ -12391,7 +12391,7 @@ def err_builtin_invalid_arg_type: Error <
   "a vector of integers|"
   "an unsigned integer|"
   "an 'int'|"
-  "a vector of floating points}"
+  "a vector of floating points|"
   "a function pointer}1 (was %2)">;
 
 def err_builtin_invalid_arg_value: Error<

clang/lib/AST/ExprConstant.cpp

@@ -13709,6 +13709,7 @@ bool IntExprEvaluator::VisitBuiltinCallExpr(const CallExpr *E,
       if (Msk[I])
         Result.setBitVal(P++, Val[I]);
     return Success(Result, E);
+  }
 
   case Builtin::BI__builtin_sycl_is_kernel: {
     return isSYCLFreeFunctionKernel(*this, Info, E, "sycl-single-task-kernel",

clang/lib/Sema/SemaChecking.cpp

@@ -3042,7 +3042,7 @@ Sema::CheckBuiltinFunctionCall(FunctionDecl *FDecl, unsigned BuiltinID,
 
     if (!ArgTy->isFunctionProtoType() && !ArgTy->isFunctionPointerType()) {
       Diag(Arg->getBeginLoc(), diag::err_builtin_invalid_arg_type)
-          << 1 << /* pointer to function type */ 9 << ArgTy;
+          << 1 << /* pointer to function type */ 10 << ArgTy;
       return ExprError();
     }