Fix conflict resolution in SYCL.h

Author: jsji

clang/lib/Driver/ToolChains/SYCL.h

@@ -334,15 +334,16 @@ class LLVM_LIBRARY_VISIBILITY SYCLToolChain : public ToolChain {
 
   SanitizerMask getSupportedSanitizers() const override;
 
+  const ToolChain &HostTC;
+  const bool IsSYCLNativeCPU;
+
+  SYCLInstallationDetector SYCLInstallation;
+
 protected:
   Tool *buildBackendCompiler() const override;
   Tool *buildLinker() const override;
 
 private:
-  const ToolChain &HostTC;
-  const bool IsSYCLNativeCPU;
-  SYCLInstallationDetector SYCLInstallation;
-
   void TranslateGPUTargetOpt(const llvm::opt::ArgList &Args,
                              llvm::opt::ArgStringList &CmdArgs,
                              llvm::opt::OptSpecifier Opt_EQ) const;