Merge pull request #22 from benlangmuir/update-51

[5.1] Update swift-5.1-branch

Author: benlangmuir

README.md

@@ -20,5 +20,5 @@ $ swift test
 The C++ code in the index requires `libdispatch`, but unlike Swift code, it cannot find it automatically on Linux. You can work around this by adding a search path manually.
 
 ```sh
-$ swift build -Xcxx -I<path_to_swift_toolchain>/usr/lib/swift
+$ swift build -Xcxx -I<path_to_swift_toolchain>/usr/lib/swift -Xcxx -I<path_to_swift_toolchain>/usr/lib/swift/Block
 ```

Utilities/import-llvm

@@ -4,7 +4,7 @@
 #
 # NOTE: We have slightly modified copies of some of the files, to reduce the
 # dependency surface area, so if you run this to update the sources, please
-# examine the diffs to remove things that don't make sense.
+# examine the diffs to remove things that don't make sense and update 'llvm-patch.diff'.
 
 import errno
 import optparse
@@ -19,7 +19,7 @@ ADT_imports = ['EpochTracker', 'iterator', 'iterator_range', 'Hashing', 'None',
                'Statistic', 'StringExtras', 'STLExtras', 'AllocatorList', 'Triple']
 
 # ADT basic data structures.
-ADT_imports += ['APFloat', 'APInt', 'APSInt', 'ArrayRef', 'PointerIntPair', 'SetVector', 'StringRef', 'StringSwitch',
+ADT_imports += ['APFloat', 'APInt', 'APSInt', 'ArrayRef', 'bit', 'PointerIntPair', 'SetVector', 'StringRef', 'StringSwitch',
                 'Twine', 'IntrusiveRefCntPtr', 'ilist', 'ilist_base', 'ilist_node', 'ilist_node_base',
                 'ilist_node_options', 'ilist_iterator', 'simple_ilist', 'OptionSet', 'PointerUnion']
 
@@ -35,11 +35,11 @@ ADT_imports += ['edit_distance']
 # Support types and infrastructure.
 Support_imports = [
     'AlignOf', 'Allocator', 'Atomic', 'CBindingWrapping', 'Casting', 'Capacity', 'CommandLine', 'Compiler',
-    'Endian', 'Errno', 'ErrorHandling', 'Errc', 'ErrorOr', 'Error', 'Format',
+    'Endian', 'Errno', 'ErrorHandling', 'Errc', 'ErrorOr', 'Error', 'Format', 'FormatAdapters',
     'ManagedStatic', 'MathExtras', 'Mutex', 'MutexGuard', 'Memory',
     'MemoryBuffer', 'PointerLikeTypeTraits', 'Recycler', 'SwapByteOrder',
     'Timer', 'TimeValue', 'Threading', 'Unicode', 'UniqueLock', 'Unix', 'WindowsError',
-    'Valgrind', 'circular_raw_ostream', 'raw_ostream', 'type_traits', 'JSON']
+    'Valgrind', 'circular_raw_ostream', 'raw_ostream', 'Signposts', 'type_traits', 'JSON']
 
 # Stuff we don't want, but have to pull in.
 Support_imports += [
@@ -49,23 +49,24 @@ Support_imports += [
     'MemAlloc', 'Chrono', 'FormatProviders', 'FormatVariadic', 'FormatCommon',
     'FormatVariadicDetails', 'NativeFormatting', 'DJB', 'ReverseIteration', 'MD5',
     'SmallVectorMemoryBuffer', 'WithColor', 'Options', 'PrettyStackTrace', 'Watchdog',
-    'TargetParser', 'ARMBuildAttributes', 'ARMTargetParser.def', 'AArch64TargetParser.def', 'X86TargetParser.def', 'LineIterator']
+    'TargetParser', 'ARMBuildAttributes', 'ARMTargetParser', 'AArch64TargetParser',
+    'ARMTargetParser.def', 'AArch64TargetParser.def', 'X86TargetParser.def', 'LineIterator']
 
 # Dependencies from llvm-c needed by Support.
-C_imports = ['Types', 'DataTypes', 'Support', 'ErrorHandling']
+C_imports = ['Types', 'DataTypes', 'Support', 'Error', 'ErrorHandling']
 
 # Support data structures.
 Support_imports += ['YAMLParser', 'YAMLTraits']
 
 # Source files to exclude.
-Support_source_excludes = set(['Host'])
+Support_source_excludes = set([])
 
 llvm_srcroot = None
-sourcekit_srcroot = None
+indexstoredb_srcroot = None
 
 def note(msg):
     msg = msg.replace(llvm_srcroot, "<LLVM>")
-    msg = msg.replace(sourcekit_srcroot, "<INDEXSTOREDB>")
+    msg = msg.replace(indexstoredb_srcroot, "<INDEXSTOREDB>")
     print >>sys.stderr, "note: %s" % (msg,)
 
 def mkdir_p(path):
@@ -133,32 +134,32 @@ def main():
     if len(args) != 1:
         parser.error("unexpected number of arguments")
 
-    global llvm_srcroot, sourcekit_srcroot
+    global llvm_srcroot, indexstoredb_srcroot
     llvm_srcroot, = args
-    sourcekit_srcroot = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+    indexstoredb_srcroot = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 
     def import_header(dir, name):
         src = os.path.join(llvm_srcroot, 'include', 'llvm', dir, name)
         if os.path.exists(src):
-            dst = os.path.join(sourcekit_srcroot, 'include', 'llvm', dir, name)
+            dst = os.path.join(indexstoredb_srcroot, 'include', 'llvm', dir, name)
             mkdir_p(os.path.dirname(dst))
             copyfile(src, dst)
 
     def import_c_header(name):
         src = os.path.join(llvm_srcroot, 'include', 'llvm-c', name)
         if os.path.exists(src):
-            dst = os.path.join(sourcekit_srcroot, 'include', 'llvm-c', name)
+            dst = os.path.join(indexstoredb_srcroot, 'include', 'llvm-c', name)
             mkdir_p(os.path.dirname(dst))
             copyfile(src, dst)
 
     def import_source(dir, name):
         src = os.path.join(llvm_srcroot, 'lib', dir, name)
         if os.path.exists(src):
-            dst = os.path.join(sourcekit_srcroot, 'lib', 'LLVMSupport', dir, name)
+            dst = os.path.join(indexstoredb_srcroot, 'lib', 'LLVMSupport', dir, name)
             mkdir_p(os.path.dirname(dst))
             copyfile(src, dst)
 
-    print "note: importing from %r to %r" % (llvm_srcroot, sourcekit_srcroot)
+    print "note: importing from %r to %r" % (llvm_srcroot, indexstoredb_srcroot)
 
     for name in ADT_imports:
         import_header('ADT', name+'.h')
@@ -175,6 +176,8 @@ def main():
             import_source('Support', name+'.cpp')
             import_source('Support', os.path.join('Unix', name+'.h'))
             import_source('Support', os.path.join('Unix', name+'.inc'))
+            import_source('Support', os.path.join('Windows', name+'.h'))
+            import_source('Support', os.path.join('Windows', name+'.inc'))
 
     for name in C_imports:
         import_c_header(name + '.h')
@@ -183,17 +186,23 @@ def main():
     print "Adding prefix header includes"
 
     base_dirs = [
-        os.path.join(sourcekit_srcroot, 'include', 'llvm'),
-        os.path.join(sourcekit_srcroot, 'include', 'llvm-c'),
-        os.path.join(sourcekit_srcroot, 'lib', 'LLVMSupport'),
+        os.path.join(indexstoredb_srcroot, 'include', 'llvm'),
+        os.path.join(indexstoredb_srcroot, 'include', 'llvm-c'),
+        os.path.join(indexstoredb_srcroot, 'lib', 'LLVMSupport'),
     ]
 
-    include_dir = os.path.join(sourcekit_srcroot, 'include')
+    include_dir = os.path.join(indexstoredb_srcroot, 'include')
 
     for base in base_dirs:
         for root, dirs, files in os.walk(base):
             for file in files:
                 maybe_add_prefix(os.path.join(root, file), include_dir)
 
+    print ""
+    print "Applying patch"
+
+    patch_path = os.path.join(indexstoredb_srcroot, 'Utilities', 'llvm-patch.diff'),
+    subprocess.call("patch -p1 < '%s'" % patch_path, shell=True)
+
 if __name__ == '__main__':
     main()

Utilities/llvm-patch.diff

@@ -0,0 +1,41 @@
+diff --git a/lib/LLVMSupport/Support/AArch64TargetParser.cpp b/lib/LLVMSupport/Support/AArch64TargetParser.cpp
+index faf8385c..8772d213 100644
+--- a/lib/LLVMSupport/Support/AArch64TargetParser.cpp
++++ b/lib/LLVMSupport/Support/AArch64TargetParser.cpp
+@@ -31,7 +31,7 @@ unsigned AArch64::getDefaultFPU(StringRef CPU, AArch64::ArchKind AK) {
+   return StringSwitch<unsigned>(CPU)
+ #define AARCH64_CPU_NAME(NAME, ID, DEFAULT_FPU, IS_DEFAULT, DEFAULT_EXT)       \
+   .Case(NAME, ARM::DEFAULT_FPU)
+-#include "../../include/llvm/Support/AArch64TargetParser.def"
++#include "llvm/Support/AArch64TargetParser.def"
+   .Default(ARM::FK_INVALID);
+ }
+ 
+@@ -44,7 +44,7 @@ unsigned AArch64::getDefaultExtensions(StringRef CPU, AArch64::ArchKind AK) {
+   .Case(NAME, AArch64ARCHNames[static_cast<unsigned>(ArchKind::ID)]            \
+                       .ArchBaseExtensions |                                    \
+                   DEFAULT_EXT)
+-#include "../../include/llvm/Support/AArch64TargetParser.def"
++#include "llvm/Support/AArch64TargetParser.def"
+   .Default(AArch64::AEK_INVALID);
+ }
+ 
+@@ -55,7 +55,7 @@ AArch64::ArchKind AArch64::getCPUArchKind(StringRef CPU) {
+   return StringSwitch<AArch64::ArchKind>(CPU)
+ #define AARCH64_CPU_NAME(NAME, ID, DEFAULT_FPU, IS_DEFAULT, DEFAULT_EXT)       \
+   .Case(NAME, ArchKind::ID)
+-#include "../../include/llvm/Support/AArch64TargetParser.def"
++#include "llvm/Support/AArch64TargetParser.def"
+   .Default(ArchKind::INVALID);
+ }
+ 
+--- a/include/llvm/Support/YAMLTraits.h
++++ b/include/llvm/Support/YAMLTraits.h
+@@ -18,7 +18,6 @@
+ #include "llvm/Support/AlignOf.h"
+ #include "llvm/Support/Allocator.h"
+ #include "llvm/Support/Endian.h"
+-#include "llvm/Support/Regex.h"
+ #include "llvm/Support/SourceMgr.h"
+ #include "llvm/Support/YAMLParser.h"
+ #include "llvm/Support/raw_ostream.h"

include/IndexStoreDB/Core/Symbol.h

@@ -23,7 +23,7 @@
 #include "llvm/ADT/StringRef.h"
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/Support/DataTypes.h"
-#include "llvm/Support/TimeValue.h"
+#include "llvm/Support/Chrono.h"
 #include <memory>
 #include <string>
 
@@ -224,20 +224,20 @@ class SymbolRelation {
 class TimestampedPath {
   std::string Path;
   std::string ModuleName;
-  llvm::sys::TimeValue ModificationTime;
+  llvm::sys::TimePoint<> ModificationTime;
   unsigned sysrootPrefixLength = 0;
   bool IsSystem;
 
 public:
-  TimestampedPath(StringRef Path, llvm::sys::TimeValue ModificationTime, StringRef moduleName, bool isSystem, CanonicalFilePathRef sysroot = {})
+  TimestampedPath(StringRef Path, llvm::sys::TimePoint<> ModificationTime, StringRef moduleName, bool isSystem, CanonicalFilePathRef sysroot = {})
     : Path(Path), ModuleName(moduleName), ModificationTime(ModificationTime), IsSystem(isSystem) {
     if (sysroot.contains(CanonicalFilePathRef::getAsCanonicalPath(Path))) {
       sysrootPrefixLength = sysroot.getPath().size();
     }
   }
 
   const std::string &getPathString() const { return Path; }
-  llvm::sys::TimeValue getModificationTime() const { return ModificationTime; }
+  llvm::sys::TimePoint<> getModificationTime() const { return ModificationTime; }
   const std::string &getModuleName() const { return ModuleName; }
   unsigned isSystem() const { return IsSystem; }
   StringRef getPathWithoutSysroot() const {

include/IndexStoreDB/Database/Database.h

@@ -15,14 +15,15 @@
 
 #include "IndexStoreDB/Database/IDCode.h"
 #include "IndexStoreDB/Support/LLVM.h"
+#include "IndexStoreDB/Support/Visibility.h"
 #include <memory>
 
 namespace IndexStoreDB {
 namespace db {
   class Database;
   typedef std::shared_ptr<Database> DatabaseRef;
 
-class LLVM_EXPORT Database {
+class INDEXSTOREDB_EXPORT Database {
 public:
   static DatabaseRef create(StringRef dbPath, bool readonly, Optional<size_t> initialDBSize, std::string &error);
   ~Database();
@@ -43,7 +44,7 @@ class LLVM_EXPORT Database {
   static const unsigned DATABASE_FORMAT_VERSION;
 };
 
-LLVM_EXPORT IDCode makeIDCodeFromString(StringRef name);
+INDEXSTOREDB_EXPORT IDCode makeIDCodeFromString(StringRef name);
 
 } // namespace db
 } // namespace IndexStoreDB

include/IndexStoreDB/Database/DatabaseError.h

@@ -13,14 +13,14 @@
 #ifndef INDEXSTOREDB_SKDATABASE_DATABASEERROR_H
 #define INDEXSTOREDB_SKDATABASE_DATABASEERROR_H
 
-#include "llvm/Support/Compiler.h"
+#include "IndexStoreDB/Support/Visibility.h"
 #include <string>
 #include <stdexcept>
 
 namespace IndexStoreDB {
 namespace db {
 
-class LLVM_EXPORT DatabaseError : public std::runtime_error {
+class INDEXSTOREDB_EXPORT DatabaseError : public std::runtime_error {
 protected:
   const int _code;
 
@@ -51,7 +51,7 @@ class LLVM_EXPORT DatabaseError : public std::runtime_error {
 ///
 /// @see http://symas.com/mdb/doc/group__errors.html#ga0a83370402a060c9175100d4bbfb9f25
 ///
-class LLVM_EXPORT MapFullError final : public DatabaseError {
+class INDEXSTOREDB_EXPORT MapFullError final : public DatabaseError {
   virtual void _anchor();
 public:
   using DatabaseError::DatabaseError;

include/IndexStoreDB/Database/ImportTransaction.h

@@ -24,7 +24,7 @@ namespace db {
   class Database;
   typedef std::shared_ptr<Database> DatabaseRef;
 
-class LLVM_EXPORT ImportTransaction {
+class INDEXSTOREDB_EXPORT ImportTransaction {
 public:
   explicit ImportTransaction(DatabaseRef dbase);
   ~ImportTransaction();
@@ -48,13 +48,13 @@ class LLVM_EXPORT ImportTransaction {
   std::unique_ptr<Implementation> Impl;
 };
 
-class LLVM_EXPORT UnitDataImport {
+class INDEXSTOREDB_EXPORT UnitDataImport {
   ImportTransaction &Import;
   std::string UnitName;
   CanonicalFilePath MainFile;
   CanonicalFilePath OutFile;
   CanonicalFilePath Sysroot;
-  llvm::sys::TimeValue ModTime;
+  llvm::sys::TimePoint<> ModTime;
   Optional<bool> IsSystem;
   Optional<SymbolProviderKind> SymProviderKind;
   std::string Target;
@@ -75,7 +75,7 @@ class LLVM_EXPORT UnitDataImport {
   std::vector<UnitInfo::Provider> ProviderDepends;
 
 public:
-  UnitDataImport(ImportTransaction &import, StringRef unitName, llvm::sys::TimeValue modTime);
+  UnitDataImport(ImportTransaction &import, StringRef unitName, llvm::sys::TimePoint<> modTime);
   ~UnitDataImport();
 
   IDCode getUnitCode() const { return UnitCode; }

include/IndexStoreDB/Database/ReadTransaction.h

@@ -26,7 +26,7 @@ namespace db {
   class Database;
   typedef std::shared_ptr<Database> DatabaseRef;
 
-class LLVM_EXPORT ReadTransaction {
+class INDEXSTOREDB_EXPORT ReadTransaction {
 public:
   explicit ReadTransaction(DatabaseRef dbase);
   ~ReadTransaction();
@@ -45,13 +45,16 @@ class LLVM_EXPORT ReadTransaction {
   bool getProviderFileReferences(IDCode provider,
                                  llvm::function_ref<bool(TimestampedPath path)> receiver);
   bool getProviderFileCodeReferences(IDCode provider,
-                                     llvm::function_ref<bool(IDCode pathCode, IDCode unitCode, llvm::sys::TimeValue modTime, IDCode moduleNameCode, bool isSystem)> receiver);
+                                     llvm::function_ref<bool(IDCode pathCode, IDCode unitCode, llvm::sys::TimePoint<> modTime, IDCode moduleNameCode, bool isSystem)> receiver);
   /// Returns all provider-file associations. Intended for debugging purposes.
-  bool foreachProviderAndFileCodeReference(llvm::function_ref<bool(IDCode provider, IDCode pathCode, IDCode unitCode, llvm::sys::TimeValue modTime, IDCode moduleNameCode, bool isSystem)> receiver);
+  bool foreachProviderAndFileCodeReference(llvm::function_ref<bool(IDCode provider, IDCode pathCode, IDCode unitCode, llvm::sys::TimePoint<> modTime, IDCode moduleNameCode, bool isSystem)> receiver);
 
   /// Returns USR codes in batches.
   bool foreachUSROfGlobalSymbolKind(SymbolKind symKind, llvm::function_ref<bool(ArrayRef<IDCode> usrCodes)> receiver);
 
+  /// Returns USR codes in batches.
+  bool foreachUSROfGlobalUnitTestSymbol(llvm::function_ref<bool(ArrayRef<IDCode> usrCodes)> receiver);
+
   /// Returns USR codes in batches.
   bool findUSRsWithNameContaining(StringRef pattern,
                                   bool anchorStart, bool anchorEnd,

include/IndexStoreDB/Database/UnitInfo.h

@@ -18,7 +18,7 @@
 #include "llvm/ADT/ArrayRef.h"
 #include "llvm/ADT/Hashing.h"
 #include "llvm/ADT/StringRef.h"
-#include "llvm/Support/TimeValue.h"
+#include "llvm/Support/Chrono.h"
 
 namespace IndexStoreDB {
 namespace db {
@@ -38,7 +38,7 @@ struct UnitInfo {
 
   StringRef UnitName;
   IDCode UnitCode;
-  llvm::sys::TimeValue ModTime;
+  llvm::sys::TimePoint<> ModTime;
   IDCode OutFileCode;
   IDCode MainFileCode;
   IDCode SysrootCode;

include/IndexStoreDB/Index/IndexStoreLibraryProvider.h

@@ -14,6 +14,7 @@
 #define INDEXSTOREDB_INDEX_SYMBOLDATAPROVIDER_H
 
 #include "IndexStoreDB/Support/LLVM.h"
+#include "IndexStoreDB/Support/Visibility.h"
 #include "llvm/ADT/StringRef.h"
 #include <memory>
 
@@ -29,7 +30,7 @@ namespace index {
 using IndexStoreLibrary = ::indexstore::IndexStoreLibrary;
 using IndexStoreLibraryRef = ::indexstore::IndexStoreLibraryRef;
 
-class LLVM_EXPORT IndexStoreLibraryProvider {
+class INDEXSTOREDB_EXPORT IndexStoreLibraryProvider {
 public:
   virtual ~IndexStoreLibraryProvider() {}
 
@@ -41,12 +42,12 @@ class LLVM_EXPORT IndexStoreLibraryProvider {
 };
 
 /// A simple library provider that can be used if libIndexStore is linked to your binary.
-class LLVM_EXPORT GlobalIndexStoreLibraryProvider: public IndexStoreLibraryProvider {
+class INDEXSTOREDB_EXPORT GlobalIndexStoreLibraryProvider: public IndexStoreLibraryProvider {
 public:
   IndexStoreLibraryRef getLibraryForStorePath(StringRef storePath) override;
 };
 
-LLVM_EXPORT IndexStoreLibraryRef loadIndexStoreLibrary(std::string dylibPath,
+INDEXSTOREDB_EXPORT IndexStoreLibraryRef loadIndexStoreLibrary(std::string dylibPath,
                                                        std::string &error);
 
 } // namespace index