Apply suggestions

Author: Fznamznon

clang/include/clang/Basic/LangOptions.def

@@ -273,7 +273,7 @@ LANGOPT(
     "get/operator[], get_id/operator[] and get_global_id/get_global_linear_id "
     "in SYCL class id, iterm and nd_iterm")
 LANGOPT(SYCLDisableRangeRounding, 1, 0, "Disable parallel for range rounding")
-LANGOPT(SYCLEnableIntHeader, 1, 0, "Enable diagnostics based on SYCL integration header")
+LANGOPT(SYCLEnableIntHeaderDiags, 1, 0, "Enable diagnostics based on SYCL integration header")
 
 LANGOPT(HIPUseNewLaunchAPI, 1, 0, "Use new kernel launching API for HIP")
 

clang/include/clang/Driver/Options.td

@@ -6057,9 +6057,9 @@ def fenable_sycl_dae : Flag<["-"], "fenable-sycl-dae">,
 def fsycl_disable_range_rounding : Flag<["-"], "fsycl-disable-range-rounding">,
   HelpText<"Disable parallel for range rounding.">,
   MarshallingInfoFlag<LangOpts<"SYCLDisableRangeRounding">>;
-def fsycl_enable_int_header: Flag<["-"], "fsycl-enable-int-header">,
+def fsycl_enable_int_header: Flag<["-"], "fsycl-enable-int-header-diags">,
   HelpText<"Enable diagnostics based on SYCL integration header.">,
-  MarshallingInfoFlag<LangOpts<"SYCLEnableIntHeader">>;
+  MarshallingInfoFlag<LangOpts<"SYCLEnableIntHeaderDiags">>;
 
 } // let Flags = [CC1Option, NoDriverOption]
 

clang/lib/Driver/ToolChains/Clang.cpp

@@ -4854,9 +4854,9 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
         CmdArgs.push_back("-dependency-filter");
         CmdArgs.push_back(Args.MakeArgString(Header));
 
-        // Since this is host compilation and integration header is included,
-        // enable integration header based diagnostics.
-        CmdArgs.push_back("-fsycl-enable-int-header");
+        // Since this is a host compilation and the integration header is
+        // included, enable the integration header based diagnostics.
+        CmdArgs.push_back("-fsycl-enable-int-header-diags");
       }
       // Let the FE know we are doing a SYCL offload compilation, but we are
       // doing the host pass.

clang/lib/Frontend/CompilerInvocation.cpp

@@ -491,6 +491,13 @@ static bool FixupInvocation(CompilerInvocation &Invocation,
     Diags.Report(diag::err_drv_argument_not_allowed_with) << "-fsycl-is-device"
                                                           << "-fsycl-is-host";
 
+  // SYCLEnableIntHeader implies SYCLIsHost. Error if
+  // -fsycl-enable-int-header-diags is passed without -fsycl-is-host.
+  if (LangOpts.SYCLEnableIntHeaderDiags && !LangOpts.SYCLIsHost)
+    Diags.Report(diag::err_opt_not_valid_without_opt)
+        << "-fsycl-enable-int-header-diags"
+        << "-fsycl-is-host";
+
   if (Args.hasArg(OPT_fgnu89_inline) && LangOpts.CPlusPlus)
     Diags.Report(diag::err_drv_argument_not_allowed_with)
         << "-fgnu89-inline" << GetInputKindName(IK);

clang/lib/Sema/SemaSYCL.cpp

@@ -3529,8 +3529,7 @@ class SYCLKernelNameTypeVisitor
           // ::KernelName1). Since this is not visible to runtime code that
           // submits kernels, this is invalid.
           if (Tag->isCompleteDefinition() ||
-              (S.getLangOpts().SYCLIsHost &&
-               S.getLangOpts().SYCLEnableIntHeader)) {
+              S.getLangOpts().SYCLEnableIntHeaderDiags) {
             S.Diag(KernelInvocationFuncLoc,
                    diag::err_sycl_kernel_incorrectly_named)
                 << /* kernel name should be forward declarable at namespace

clang/test/Frontend/sycl-int-header-diags.cpp

@@ -0,0 +1,7 @@
+// Test that we disallow -fsycl-enable-int-header-diags without -fsycl-is-host.
+
+// RUN: not %clang_cc1 -fsycl-enable-int-header-diags %s 2>&1 | FileCheck --check-prefix=ERROR %s
+// RUN: not %clang_cc1 -fsycl-is-device -fsycl-enable-int-header-diags %s 2>&1 | FileCheck --check-prefix=ERROR %s
+
+// ERROR: error: option '-fsycl-enable-int-header-diags' cannot be specified without '-fsycl-is-host'
+

clang/test/SemaSYCL/non-fwd-declarable-kernel-name.cpp

@@ -1,5 +1,5 @@
 // RUN: %clang_cc1 -fsycl-is-device -internal-isystem %S/Inputs -fno-sycl-unnamed-lambda -fsyntax-only -sycl-std=2020 -fsycl-int-header=%t.h %s
-// RUN: %clang_cc1 -fsycl-is-host -DHEADER_FLAG -fsycl-enable-int-header -internal-isystem %S/Inputs -fno-sycl-unnamed-lambda -fsyntax-only -verify -include %t.h %s
+// RUN: %clang_cc1 -fsycl-is-host -DHEADER_FLAG -fsycl-enable-int-header-diags -internal-isystem %S/Inputs -fno-sycl-unnamed-lambda -fsyntax-only -verify -include %t.h %s
 // RUN: %clang_cc1 -fsycl-is-host -DNO_HEADER_FLAG -internal-isystem %S/Inputs -fno-sycl-unnamed-lambda -fsyntax-only -verify -include %t.h %s
 
 // This test verifies that incorrect kernel names are diagnosed correctly if