Rebase and remove checks for intel::reqd_work_group_size spelling

Author: schittir

clang/lib/Sema/SemaDeclAttr.cpp

@@ -3155,13 +3155,12 @@ static void handleWorkGroupSize(Sema &S, Decl *D, const ParsedAttr &AL) {
   Expr *XDimExpr = AL.getArgAsExpr(0);
 
   // If no attribute argument is specified, set the second and third argument
-  // to the default value 1, but only if the sycl:: or intel::
-  // reqd_work_group_size spelling was used.
+  // to the default value 1, but only if the sycl::reqd_work_group_size
+  // spelling was used.
   //
   auto SetDefaultValue = [](Sema &S, const ParsedAttr &AL) {
     assert(AL.getKind() == ParsedAttr::AT_ReqdWorkGroupSize && AL.hasScope() &&
-           (AL.getScopeName()->isStr("sycl") ||
-            AL.getScopeName()->isStr("intel")));
+           AL.getScopeName()->isStr("sycl"));
     return IntegerLiteral::Create(S.Context, llvm::APInt(32, 1),
                                   S.Context.IntTy, AL.getLoc());
   };