Apply some review feedback

Author: Fznamznon

clang/include/clang/Sema/Sema.h

@@ -440,7 +440,7 @@ class SYCLIntegrationFooter {
   SYCLIntegrationFooter(Sema &S) : S(S) {}
   bool emit(StringRef MainSrc);
   void addVarDecl(const VarDecl *VD);
-  bool metSYCLDeviceGlobals() { return DeviceGlobalsEmitted; }
+  bool isDeviceGlobalsEmitted() { return DeviceGlobalsEmitted; }
 
 private:
   bool emit(raw_ostream &O);

clang/lib/Sema/Sema.cpp

@@ -1101,8 +1101,8 @@ void Sema::ActOnEndOfTranslationUnitFragment(TUFragmentKind Kind) {
     // Set the names of the kernels, now that the names have settled down. This
     // needs to happen before we generate the integration headers.
     SetSYCLKernelNames();
-    // Make sure that the footer emitted before header, since only after the
-    // footer is emitted it is known that translation unit contains device
+    // Make sure that the footer is emitted before header, since only after the
+    // footer is emitted is it known that translation unit contains device
     // global variables.
     if (SyclIntFooter != nullptr)
       SyclIntFooter->emit(getLangOpts().SYCLIntFooter);

clang/lib/Sema/SemaSYCL.cpp

@@ -4684,14 +4684,14 @@ void SYCLIntegrationHeader::emit(raw_ostream &O) {
   // whose sole purpose is to run its constructor before the application's
   // main() function.
 
-  if (S.getSyclIntegrationFooter().metSYCLDeviceGlobals()) {
+  if (S.getSyclIntegrationFooter().isDeviceGlobalsEmitted()) {
     O << "namespace {\n";
 
     O << "class __sycl_device_global_registration {\n";
     O << "public:\n";
     O << "  __sycl_device_global_registration() noexcept;\n";
     O << "};\n";
-    O << "__sycl_device_global_registration __sycl_device_global_registerer;\n";
+    O << "__sycl_device_global_registration __sycl_device_global_registrar;\n";
 
     O << "} // namespace\n";
 
@@ -4971,7 +4971,7 @@ static void PrintNSClosingBraces(raw_ostream &OS, const DeclContext *DC) {
       [](raw_ostream &OS, const NamespaceDecl *NS) {}, OS, DC);
 }
 
-static std::string EmitSpecIdShim(raw_ostream &OS, unsigned &ShimCounter,
+static std::string EmitShim(raw_ostream &OS, unsigned &ShimCounter,
                                   const std::string &LastShim,
                                   const NamespaceDecl *AnonNS) {
   std::string NewShimName =
@@ -4991,7 +4991,7 @@ static std::string EmitSpecIdShim(raw_ostream &OS, unsigned &ShimCounter,
 }
 
 // Emit the list of shims required for a DeclContext, calls itself recursively.
-static void EmitSpecIdShims(raw_ostream &OS, unsigned &ShimCounter,
+static void EmitShims(raw_ostream &OS, unsigned &ShimCounter,
                             const DeclContext *DC,
                             std::string &NameForLastShim) {
   if (DC->isTranslationUnit()) {
@@ -5007,7 +5007,7 @@ static void EmitSpecIdShims(raw_ostream &OS, unsigned &ShimCounter,
   } else if (const auto *ND = dyn_cast<NamespaceDecl>(CurDecl)) {
     if (ND->isAnonymousNamespace()) {
       // Print current shim, reset 'name for last shim'.
-      NameForLastShim = EmitSpecIdShim(OS, ShimCounter, NameForLastShim, ND);
+      NameForLastShim = EmitShim(OS, ShimCounter, NameForLastShim, ND);
     } else {
       NameForLastShim = ND->getNameAsString() + "::" + NameForLastShim;
     }
@@ -5021,13 +5021,13 @@ static void EmitSpecIdShims(raw_ostream &OS, unsigned &ShimCounter,
            "Unhandled decl type");
   }
 
-  EmitSpecIdShims(OS, ShimCounter, CurDecl->getDeclContext(), NameForLastShim);
+  EmitShims(OS, ShimCounter, CurDecl->getDeclContext(), NameForLastShim);
 }
 
 // Emit the list of shims required for a variable declaration.
 // Returns a string containing the FQN of the 'top most' shim, including its
 // function call parameters.
-static std::string EmitSpecIdShims(raw_ostream &OS, unsigned &ShimCounter,
+static std::string EmitShims(raw_ostream &OS, unsigned &ShimCounter,
                                    PrintingPolicy &Policy, const VarDecl *VD) {
   if (!VD->isInAnonymousNamespace())
     return "";
@@ -5036,7 +5036,7 @@ static std::string EmitSpecIdShims(raw_ostream &OS, unsigned &ShimCounter,
   VD->getNameForDiagnostic(stream, Policy, false);
   stream.flush();
 
-  EmitSpecIdShims(OS, ShimCounter, VD->getDeclContext(), RelativeName);
+  EmitShims(OS, ShimCounter, VD->getDeclContext(), RelativeName);
   return RelativeName;
 }
 
@@ -5074,7 +5074,7 @@ bool SYCLIntegrationFooter::emit(raw_ostream &OS) {
       OS << "#include <CL/sycl/detail/defines_elementary.hpp>\n";
 
     Visited.insert(VD);
-    std::string TopShim = EmitSpecIdShims(OS, ShimCounter, Policy, VD);
+    std::string TopShim = EmitShims(OS, ShimCounter, Policy, VD);
     if (Util::isSyclDeviceGlobalType(VD->getType())) {
       DeviceGlobalsEmitted = true;
       DeviceGlobOS << "device_global_map::add(";

clang/test/CodeGenSYCL/device_global_int_footer_header.cpp

@@ -2,11 +2,11 @@
 // RUN: FileCheck -input-file=%t.footer.h %s --check-prefix=CHECK-FOOTER
 // RUN: FileCheck -input-file=%t.header.h %s --check-prefix=CHECK-HEADER
 
-// Try and compile all this stuff.
+// Try and compile generated integration header and footer on host.
 // RUN: %clang_cc1 -fsycl-is-host -x c++ -std=c++17 -internal-isystem %S/Inputs -fsyntax-only -include %t.header.h -include %s %t.footer.h
 
 // This test checks that integration header and footer are emitted correctly
-// for device_global variables. It also checks that emitted costructs
+// for device_global variables. It also checks that emitted constructs
 // are syntactically correct.
 
 #include "sycl.hpp"
@@ -25,7 +25,7 @@ int main() {
 // CHECK-HEADER-NEXT: public:
 // CHECK-HEADER-NEXT:   __sycl_device_global_registration() noexcept;
 // CHECK-HEADER-NEXT: };
-// CHECK-HEADER-NEXT: __sycl_device_global_registration __sycl_device_global_registerer;
+// CHECK-HEADER-NEXT: __sycl_device_global_registration __sycl_device_global_registrar;
 // CHECK-HEADER-NEXT: } // namespace
 // CHECK-HEADER: } // namespace detail
 // CHECK-HEADER: } // namespace sycl

clang/test/CodeGenSYCL/device_globals_with_spec_ids.cpp

@@ -1,7 +1,7 @@
 // RUN: %clang_cc1 -fsycl-is-device -std=c++17 -internal-isystem %S/Inputs -triple spir64-unknown-unknown -fsycl-int-footer=%t.footer.h -fsycl-int-header=%t.header.h %s -emit-llvm -o %t.ll
 // RUN: FileCheck -input-file=%t.footer.h %s
 
-// Try and compile all this stuff.
+// Try and compile generated integration header and footer on host.
 // RUN: %clang_cc1 -fsycl-is-host -x c++ -std=c++17 -internal-isystem %S/Inputs -fsyntax-only -include %t.header.h -include %s %t.footer.h
 
 // This test checks that integration footer is emitted correctly if both