Address the review comments

Address the review comments

Author: jiejanezhang

clang/lib/Driver/ToolChains/Cuda.cpp

@@ -425,7 +425,6 @@ CudaInstallationDetector::CudaInstallationDetector(
   }
 
 #ifdef SYCLomatic_CUSTOMIZATION
-  Args.hasArg(options::OPT_nogpulib);
   bool IsCudaHeaderFilesIncluded = false;
   for (auto &IncPath : ExtraIncPaths) {
     IsCudaHeaderFilesIncluded = validateCudaHeaderDirectory(IncPath, D);

clang/lib/Format/UnwrappedLineParser.cpp

@@ -1207,9 +1207,7 @@ void UnwrappedLineParser::parsePPDefine() {
     return;
   }
 
-#ifdef SYCLomatic_CUSTOMIZATION
   bool MaybeIncludeGuard = false;
-#endif // SYCLomatic_CUSTOMIZATION
   if (IncludeGuard == IG_IfNdefed &&
       IncludeGuardToken->TokenText == FormatTok->TokenText) {
     IncludeGuard = IG_Defined;
@@ -1220,9 +1218,7 @@ void UnwrappedLineParser::parsePPDefine() {
         break;
       }
     }
-#ifdef SYCLomatic_CUSTOMIZATION
     MaybeIncludeGuard = IncludeGuard == IG_Defined;
-#endif // SYCLomatic_CUSTOMIZATION
   }
 
   // In the context of a define, even keywords should be treated as normal
@@ -1234,11 +1230,9 @@ void UnwrappedLineParser::parsePPDefine() {
   FormatTok->Tok.setIdentifierInfo(Keywords.kw_internal_ident_after_define);
   nextToken();
 
-#ifdef SYCLomatic_CUSTOMIZATION
   // IncludeGuard can't have a non-empty macro definition.
   if (MaybeIncludeGuard && !eof())
     IncludeGuard = IG_Rejected;
-#endif // SYCLomatic_CUSTOMIZATION
 
   if (FormatTok->Tok.getKind() == tok::l_paren &&
       !FormatTok->hasWhitespaceBefore()) {

clang/lib/Tooling/Tooling.cpp

@@ -577,10 +577,10 @@ bool ToolInvocation::run() {
     DiagOpts = &*ParsedDiagOpts;
   }
 #ifdef SYCLomatic_CUSTOMIZATION
-  DiagnosticPrinter =new TextDiagnosticPrinter(DiagnosticsOS(), &*DiagOpts);
+  DiagnosticPrinter =new TextDiagnosticPrinter(DiagnosticsOS(), *DiagOpts);
   DiagConsumer = DiagnosticPrinter;
 #endif // SYCLomatic_CUSTOMIZATION
-  TextDiagnosticPrinter DiagnosticPrinter(llvm::errs(), DiagOpts);
+  TextDiagnosticPrinter DiagnosticPrinter(llvm::errs(), *DiagOpts);
 
   IntrusiveRefCntPtr<DiagnosticsEngine> Diagnostics =
       CompilerInstance::createDiagnostics(

llvm/include/llvm/Support/CommandLine.h

@@ -198,17 +198,17 @@ class OptionCategory {
 // The general Option Category (used as default category).
 LLVM_ABI OptionCategory &getGeneralCategory();
 #ifdef SYCLomatic_CUSTOMIZATION
-OptionCategory &getCtHelpCat();
-OptionCategory &getCtHelpCatBasic();
-OptionCategory &getCtHelpCatAdvanced();
-OptionCategory &getCtHelpCatCodeGen();
-OptionCategory &getCtHelpCatReportGen();
-OptionCategory &getCtHelpCatBuildScript();
-OptionCategory &getCtHelpCatQueryAPI();
-OptionCategory &getCtHelpCatWarnings();
-OptionCategory &getCtHelpCatHelpInfo();
-OptionCategory &getCtHelpCatInterceptBuild();
-OptionCategory &getCtExamplesCategory();
+LLVM_ABI OptionCategory &getCtHelpCat();
+LLVM_ABI OptionCategory &getCtHelpCatBasic();
+LLVM_ABI OptionCategory &getCtHelpCatAdvanced();
+LLVM_ABI OptionCategory &getCtHelpCatCodeGen();
+LLVM_ABI OptionCategory &getCtHelpCatReportGen();
+LLVM_ABI OptionCategory &getCtHelpCatBuildScript();
+LLVM_ABI OptionCategory &getCtHelpCatQueryAPI();
+LLVM_ABI OptionCategory &getCtHelpCatWarnings();
+LLVM_ABI OptionCategory &getCtHelpCatHelpInfo();
+LLVM_ABI OptionCategory &getCtHelpCatInterceptBuild();
+LLVM_ABI OptionCategory &getCtExamplesCategory();
 #endif // SYCLomatic_CUSTOMIZATION
 
 //===----------------------------------------------------------------------===//