Updates to address code review feedback from Erich Keane.

- Changed the style of added FIXME comments.
- Changed a `dyn_cast` followed by `assert` to `cast`.
- Removed some unused `FileCheck` captures in a test.

Author: tahonermann

clang/lib/AST/ASTContext.cpp

@@ -12805,7 +12805,7 @@ bool ASTContext::DeclMustBeEmitted(const Decl *D) {
       return true;
 
     // FIXME: Functions declared with SYCL_EXTERNAL are required during
-    // FIXME: device compilation.
+    // device compilation.
 
     // Constructors and destructors are required.
     if (FD->hasAttr<ConstructorAttr>() || FD->hasAttr<DestructorAttr>())
@@ -14833,10 +14833,10 @@ static SYCLKernelInfo BuildSYCLKernelInfo(ASTContext &Context,
 
   // Construct a mangled name for the SYCL kernel caller offload entry point.
   // FIXME: The Itanium typeinfo mangling (_ZTS<type>) is currently used to
-  // FIXME: name the SYCL kernel caller offload entry point function. This
-  // FIXME: mangling does not suffice to clearly identify symbols that
-  // FIXME: correspond to SYCL kernel caller functions, nor is this mangling
-  // FIXME: natural for targets that use a non-Itanium ABI.
+  // name the SYCL kernel caller offload entry point function. This mangling
+  // does not suffice to clearly identify symbols that correspond to SYCL
+  // kernel caller functions, nor is this mangling natural for targets that
+  // use a non-Itanium ABI.
   std::string Buffer;
   Buffer.reserve(128);
   llvm::raw_string_ostream Out(Buffer);

clang/lib/CodeGen/CGCall.cpp

@@ -746,7 +746,8 @@ CodeGenTypes::arrangeSYCLKernelCallerDeclaration(QualType resultType,
 
   return arrangeLLVMFunctionInfo(
       GetReturnType(resultType), FnInfoOpts::None, argTypes,
-      FunctionType::ExtInfo(CC_OpenCLKernel), {}, RequiredArgs::All);
+      FunctionType::ExtInfo(CC_OpenCLKernel), /*paramInfos=*/{},
+      RequiredArgs::All);
 }
 
 /// Arrange a call to a C++ method, passing the given arguments.

clang/lib/CodeGen/CodeGenSYCL.cpp

@@ -39,8 +39,7 @@ void CodeGenModule::EmitSYCLKernelCaller(const FunctionDecl *KernelEntryPointFn,
 
   // Find the SYCLKernelCallStmt.
   SYCLKernelCallStmt *KernelCallStmt =
-      dyn_cast<SYCLKernelCallStmt>(KernelEntryPointFn->getBody());
-  assert(KernelCallStmt && "SYCLKernelCallStmt not found");
+      cast<SYCLKernelCallStmt>(KernelEntryPointFn->getBody());
 
   // Retrieve the SYCL kernel caller parameters from the OutlinedFunctionDecl.
   FunctionArgList Args;

clang/test/CodeGenSYCL/kernel-caller-entry-point.cpp

@@ -62,29 +62,29 @@ int main() {
 // attributed functions during host compilation. ODR-use of these functions may
 // require them to be emitted, but they have no effect if called.
 //
-// CHECK-HOST-LINUX:      define dso_local void @_Z26single_purpose_kernel_task21single_purpose_kernel() #[[LINUX_ATTR0:[0-9]+]] {
+// CHECK-HOST-LINUX:      define dso_local void @_Z26single_purpose_kernel_task21single_purpose_kernel() #{{[0-9]+}} {
 // CHECK-HOST-LINUX-NEXT: entry:
 // CHECK-HOST-LINUX-NEXT:   %kernelFunc = alloca %struct.single_purpose_kernel, align 1
 // CHECK-HOST-LINUX-NEXT:   ret void
 // CHECK-HOST-LINUX-NEXT: }
 //
-// CHECK-HOST-LINUX:      define internal void @_Z18kernel_single_taskIZ4mainE18lambda_kernel_nameZ4mainEUlvE_EvT0_(i32 %kernelFunc.coerce) #[[LINUX_ATTR0:[0-9]+]] {
+// CHECK-HOST-LINUX:      define internal void @_Z18kernel_single_taskIZ4mainE18lambda_kernel_nameZ4mainEUlvE_EvT0_(i32 %kernelFunc.coerce) #{{[0-9]+}} {
 // CHECK-HOST-LINUX-NEXT: entry:
 // CHECK-HOST-LINUX-NEXT:   %kernelFunc = alloca %class.anon, align 4
 // CHECK-HOST-LINUX-NEXT:   %coerce.dive = getelementptr inbounds nuw %class.anon, ptr %kernelFunc, i32 0, i32 0
 // CHECK-HOST-LINUX-NEXT:   store i32 %kernelFunc.coerce, ptr %coerce.dive, align 4
 // CHECK-HOST-LINUX-NEXT:   ret void
 // CHECK-HOST-LINUX-NEXT: }
 //
-// CHECK-HOST-WINDOWS:      define dso_local void @"?single_purpose_kernel_task@@YAXUsingle_purpose_kernel@@@Z"(i8 %kernelFunc.coerce) #[[WINDOWS_ATTR0:[0-9]+]] {
+// CHECK-HOST-WINDOWS:      define dso_local void @"?single_purpose_kernel_task@@YAXUsingle_purpose_kernel@@@Z"(i8 %kernelFunc.coerce) #{{[0-9]+}} {
 // CHECK-HOST-WINDOWS-NEXT: entry:
 // CHECK-HOST-WINDOWS-NEXT:   %kernelFunc = alloca %struct.single_purpose_kernel, align 1
 // CHECK-HOST-WINDOWS-NEXT:   %coerce.dive = getelementptr inbounds nuw %struct.single_purpose_kernel, ptr %kernelFunc, i32 0, i32 0
 // CHECK-HOST-WINDOWS-NEXT:   store i8 %kernelFunc.coerce, ptr %coerce.dive, align 1
 // CHECK-HOST-WINDOWS-NEXT:   ret void
 // CHECK-HOST-WINDOWS-NEXT: }
 //
-// CHECK-HOST-WINDOWS:      define internal void @"??$kernel_single_task@Vlambda_kernel_name@?1??main@@9@V<lambda_1>@?0??2@9@@@YAXV<lambda_1>@?0??main@@9@@Z"(i32 %kernelFunc.coerce) #[[WINDOWS_ATTR0:[0-9]+]] {
+// CHECK-HOST-WINDOWS:      define internal void @"??$kernel_single_task@Vlambda_kernel_name@?1??main@@9@V<lambda_1>@?0??2@9@@@YAXV<lambda_1>@?0??main@@9@@Z"(i32 %kernelFunc.coerce) #{{[0-9]+}} {
 // CHECK-HOST-WINDOWS-NEXT: entry:
 // CHECK-HOST-WINDOWS-NEXT:   %kernelFunc = alloca %class.anon, align 4
 // CHECK-HOST-WINDOWS-NEXT:   %coerce.dive = getelementptr inbounds nuw %class.anon, ptr %kernelFunc, i32 0, i32 0
@@ -95,8 +95,8 @@ int main() {
 // Verify that SYCL kernel caller functions are emitted for each device target.
 //
 // FIXME: The following set of matches are used to skip over the declaration of
-// FIXME: main(). main() shouldn't be emitted in device code, but that pruning
-// FIXME: isn't performed yet.
+// main(). main() shouldn't be emitted in device code, but that pruning isn't
+// performed yet.
 // CHECK-DEVICE:      Function Attrs: convergent mustprogress noinline norecurse nounwind optnone
 // CHECK-DEVICE-NEXT: define {{[a-z_ ]*}}noundef i32 @main() #0