[SourceKit] Compilation fixes for SourceKit on rebranch

Author: bnbarham

lib/IDETool/DependencyChecking.h

@@ -11,6 +11,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "swift/Basic/LLVM.h"
+#include "llvm/ADT/Optional.h"
 #include "llvm/ADT/StringMap.h"
 #include "llvm/Support/Chrono.h"
 #include "llvm/Support/VirtualFileSystem.h"

tools/SourceKit/include/SourceKit/Core/Context.h

@@ -16,6 +16,7 @@
 #include "SourceKit/Core/LLVM.h"
 #include "SourceKit/Support/CancellationToken.h"
 #include "SourceKit/Support/Concurrency.h"
+#include "llvm/ADT/Optional.h"
 #include "llvm/ADT/STLExtras.h"
 #include "llvm/ADT/StringRef.h"
 #include "llvm/Support/Mutex.h"

tools/SourceKit/include/SourceKit/Core/LLVM.h

@@ -35,7 +35,6 @@ namespace llvm {
   template<unsigned InternalLen> class SmallString;
   template<typename T, unsigned N> class SmallVector;
   template<typename T> class SmallVectorImpl;
-  template<typename T> class Optional;
 
   template<typename T>
   struct SaveAndRestore;

tools/SourceKit/lib/Support/Concurrency-libdispatch.cpp

@@ -12,6 +12,7 @@
 
 #include "SourceKit/Support/Concurrency.h"
 #include "SourceKit/Config/config.h"
+#include "llvm/ADT/Optional.h"
 #include "llvm/ADT/SmallString.h"
 #include "llvm/Support/ErrorHandling.h"
 #include "llvm/Support/thread.h"

tools/SourceKit/tools/sourcekitd-test/TestOptions.cpp

@@ -12,6 +12,7 @@
 
 #include "TestOptions.h"
 #include "llvm/ADT/STLExtras.h"
+#include "llvm/ADT/StringRef.h"
 #include "llvm/ADT/StringSwitch.h"
 #include "llvm/Option/Arg.h"
 #include "llvm/Option/ArgList.h"
@@ -36,10 +37,14 @@ enum Opt {
 };
 
 // Create prefix string literals used in Options.td.
-#define PREFIX(NAME, VALUE) const char *const NAME[] = VALUE;
+#define PREFIX(NAME, VALUE)                                                    \
+  constexpr llvm::StringLiteral NAME##_init[] = VALUE;                         \
+  constexpr llvm::ArrayRef<llvm::StringLiteral> NAME(                          \
+      NAME##_init, std::size(NAME##_init) - 1);
 #include "Options.inc"
 #undef PREFIX
 
+
 // Create table mapping all options defined in Options.td.
 static const llvm::opt::OptTable::Info InfoTable[] = {
 #define OPTION(PREFIX, NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, FLAGS, PARAM,  \
@@ -53,9 +58,9 @@ static const llvm::opt::OptTable::Info InfoTable[] = {
 };
 
 // Create OptTable class for parsing actual command line arguments
-class TestOptTable : public llvm::opt::OptTable {
+class TestOptTable : public llvm::opt::GenericOptTable {
 public:
-  TestOptTable() : OptTable(InfoTable, std::size(InfoTable)){}
+  TestOptTable() : GenericOptTable(InfoTable){}
 };
 
 } // end anonymous namespace

tools/SourceKit/tools/sourcekitd/lib/Service/Requests.cpp

@@ -37,6 +37,7 @@
 
 #include "llvm/ADT/ArrayRef.h"
 #include "llvm/ADT/IntrusiveRefCntPtr.h"
+#include "llvm/ADT/Optional.h"
 #include "llvm/ADT/STLExtras.h"
 #include "llvm/ADT/SmallString.h"
 #include "llvm/ADT/StringRef.h"
@@ -581,11 +582,9 @@ handleRequestGlobalConfiguration(const RequestDict &Req,
     auto dict = RB.getDictionary();
 
     Optional<unsigned> CompletionMaxASTContextReuseCount =
-        Req.getOptionalInt64(KeyCompletionMaxASTContextReuseCount)
-            .transform([](int64_t v) -> unsigned { return v; });
+        swift::transform(Req.getOptionalInt64(KeyCompletionMaxASTContextReuseCount), [](int64_t v) -> unsigned { return v; });
     Optional<unsigned> CompletionCheckDependencyInterval =
-        Req.getOptionalInt64(KeyCompletionCheckDependencyInterval)
-            .transform([](int64_t v) -> unsigned { return v; });
+        swift::transform(Req.getOptionalInt64(KeyCompletionCheckDependencyInterval), [](int64_t v) -> unsigned { return v; });
 
     GlobalConfig::Settings UpdatedConfig =
         Config->update(CompletionMaxASTContextReuseCount,
@@ -1674,9 +1673,9 @@ handleRequestCollectVariableType(const RequestDict &Req,
     if (getCompilerArgumentsForRequestOrEmitError(Req, Args, Rec))
       return;
 
-    Optional<unsigned> Offset = Req.getOptionalInt64(KeyOffset).transform(
+    Optional<unsigned> Offset = swift::transform(Req.getOptionalInt64(KeyOffset),
         [](int64_t v) -> unsigned { return v; });
-    Optional<unsigned> Length = Req.getOptionalInt64(KeyLength).transform(
+    Optional<unsigned> Length = swift::transform(Req.getOptionalInt64(KeyLength),
         [](int64_t v) -> unsigned { return v; });
     int64_t FullyQualified = false;
     Req.getInt64(KeyFullyQualified, FullyQualified, /*isOptional=*/true);