Resolve conflicts after rebase

clang/include/clang/Driver/Options.td

@@ -6997,16 +6997,15 @@ def fno_sycl_allow_device_dependencies : Flag<["-"], "fno-sycl-allow-device-depe
 def fsycl_dump_device_code_EQ : Joined<["-"], "fsycl-dump-device-code=">,
   Flags<[NoXarchOption]>,
   HelpText<"Dump device code into the user provided directory.">;
+defm sycl_use_integration_headers : BoolFOption<"sycl-use-integration-headers",
+      LangOpts<"SYCLUseIntegrationHeaders">, DefaultTrue,
+      PosFlag<SetTrue, [], [ClangOption, CLOption], "Specify">,
+      NegFlag<SetFalse, [], [ClangOption, CLOption], "Do not specify">,
+      BothFlags<[HelpHidden], [ClangOption, CLOption, CC1Option],
+      " that integration headers be used for "
+      "communication between the host and the device compilations. SYCL Only">>;
 } // let Group = sycl_Group
 
-// FIXME: -fsycl-explicit-simd is deprecated. remove it when support is dropped.
-def : Flag<["-"], "fsycl-explicit-simd">, Flags<[Deprecated]>,
-  Group<clang_ignored_legacy_options_Group>,
-  HelpText<"Enable SYCL explicit SIMD extension. (deprecated)">;
-def : Flag<["-"], "fno-sycl-explicit-simd">,
-  Flags<[Deprecated]>, Group<clang_ignored_legacy_options_Group>,
-  HelpText<"Disable SYCL explicit SIMD extension. (deprecated)">;
-
 // OS-specific options
 let Flags = [TargetSpecific] in {
 defm android_pad_segment : BooleanFFlag<"android-pad-segment">, Group<f_Group>;

clang/lib/Driver/ToolChains/Clang.cpp

@@ -5703,7 +5703,7 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
 
     // Add any options that are needed specific to SYCL offload while
     // performing the host side compilation.
-    if (!IsSYCLOffloadDevice && UIH) {
+    if (!IsSYCLDevice && UIH) {
       // Add the -include option to add the integration header
       StringRef Header = D.getIntegrationHeader(Input.getBaseInput());
       // Do not add the integration header if we are compiling after the
@@ -5736,7 +5736,7 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
       }
     }
 
-    if (!IsSYCLOffloadDevice) {
+    if (!IsSYCLDevice) {
       // Let the FE know we are doing a SYCL offload compilation, but we are
       // doing the host pass.
       CmdArgs.push_back("-fsycl-is-host");