Update Swift master-next for upstream llvm.org changes.

daeken · Oct 21, 2019 · 468b74b · 468b74b
1 parent 299b461
commit 468b74b
Show file tree

Hide file tree

Showing 9 changed files with 48 additions and 24 deletions.
diff --git a/include/swift/ABI/TrailingObjects.h b/include/swift/ABI/TrailingObjects.h
@@ -55,6 +55,7 @@
 #ifndef SWIFT_ABI_TRAILINGOBJECTS_H
 #define SWIFT_ABI_TRAILINGOBJECTS_H
 
+#include "llvm/Support/Alignment.h"
 #include "llvm/Support/AlignOf.h"
 #include "llvm/Support/Compiler.h"
 #include "llvm/Support/MathExtras.h"
@@ -175,7 +176,7 @@ class TrailingObjectsImpl<Align, BaseTy, TopTrailingObj, PrevTy, NextTy,
 
     if (requiresRealignment())
       return reinterpret_cast<const NextTy *>(
-          llvm::alignAddr(Ptr, alignof(NextTy)));
+          llvm::alignAddr(Ptr, llvm::Align(alignof(NextTy))));
     else
       return reinterpret_cast<const NextTy *>(Ptr);
   }
@@ -189,7 +190,8 @@ class TrailingObjectsImpl<Align, BaseTy, TopTrailingObj, PrevTy, NextTy,
                     Obj, TrailingObjectsBase::OverloadToken<PrevTy>());
 
     if (requiresRealignment())
-      return reinterpret_cast<NextTy *>(llvm::alignAddr(Ptr, alignof(NextTy)));
+      return reinterpret_cast<NextTy *>(
+          llvm::alignAddr(Ptr, llvm::Align(alignof(NextTy))));
     else
       return reinterpret_cast<NextTy *>(Ptr);
   }

diff --git a/include/swift/ABI/TypeIdentity.h b/include/swift/ABI/TypeIdentity.h
@@ -19,6 +19,7 @@
 #define SWIFT_ABI_TYPEIDENTITY_H
 
 #include "swift/Basic/LLVM.h"
+#include <llvm/ADT/StringRef.h>
 
 namespace swift {
 template <class> class TargetTypeContextDescriptor;

diff --git a/include/swift/Basic/Statistic.h b/include/swift/Basic/Statistic.h
@@ -25,8 +25,7 @@
 
 #define SWIFT_FUNC_STAT_NAMED(DEBUG_TYPE)                               \
   do {                                                                  \
-    static llvm::Statistic FStat =                                      \
-      {DEBUG_TYPE, __func__, __func__, {0}, {false}};                   \
+    static llvm::Statistic FStat = {DEBUG_TYPE, __func__, __func__};    \
     ++FStat;                                                            \
   } while (0)
 

diff --git a/lib/AST/ASTContext.cpp b/lib/AST/ASTContext.cpp
@@ -509,7 +509,8 @@ static ModuleDecl *createBuiltinModule(ASTContext &ctx) {
 
 inline ASTContext::Implementation &ASTContext::getImpl() const {
   auto pointer = reinterpret_cast<char*>(const_cast<ASTContext*>(this));
-  auto offset = llvm::alignAddr((void*)sizeof(*this), alignof(Implementation));
+  auto offset = llvm::alignAddr((void *)sizeof(*this),
+                                llvm::Align(alignof(Implementation)));
   return *reinterpret_cast<Implementation*>(pointer + offset);
 }
 
@@ -528,7 +529,8 @@ ASTContext *ASTContext::get(LangOptions &langOpts,
   auto size = llvm::alignTo(sizeof(ASTContext) + sizeof(Implementation), align);
   auto mem = AlignedAlloc(size, align);
   auto impl = reinterpret_cast<void*>((char*)mem + sizeof(ASTContext));
-  impl = reinterpret_cast<void*>(llvm::alignAddr(impl,alignof(Implementation)));
+  impl = reinterpret_cast<void *>(
+      llvm::alignAddr(impl, llvm::Align(alignof(Implementation))));
   new (impl) Implementation();
   return new (mem) ASTContext(langOpts, SearchPathOpts, SourceMgr, Diags);
 }

diff --git a/lib/Basic/Statistic.cpp b/lib/Basic/Statistic.cpp
@@ -418,7 +418,7 @@ UnifiedStatsReporter::publishAlwaysOnStatsToLLVM() {
     auto &C = getFrontendCounters();
 #define FRONTEND_STATISTIC(TY, NAME)                            \
     do {                                                        \
-      static Statistic Stat = {#TY, #NAME, #NAME, {0}, {false}};  \
+      static Statistic Stat = {#TY, #NAME, #NAME};              \
       Stat += (C).NAME;                                         \
     } while (0);
 #include "swift/Basic/Statistics.def"
@@ -428,7 +428,7 @@ UnifiedStatsReporter::publishAlwaysOnStatsToLLVM() {
     auto &C = getDriverCounters();
 #define DRIVER_STATISTIC(NAME)                                       \
     do {                                                             \
-      static Statistic Stat = {"Driver", #NAME, #NAME, {0}, {false}};  \
+      static Statistic Stat = {"Driver", #NAME, #NAME};              \
       Stat += (C).NAME;                                              \
     } while (0);
 #include "swift/Basic/Statistics.def"

diff --git a/lib/ClangImporter/ImportName.cpp b/lib/ClangImporter/ImportName.cpp
@@ -1845,7 +1845,7 @@ const InheritedNameSet *NameImporter::getAllPropertyNames(
   llvm::BumpPtrAllocator &alloc = scratch.getAllocator();
   known = allProperties.insert({
       std::pair<const clang::ObjCInterfaceDecl *, char>(classDecl, forInstance),
-      llvm::make_unique<InheritedNameSet>(parentSet, alloc) }).first;
+      std::make_unique<InheritedNameSet>(parentSet, alloc) }).first;
 
   // Local function to add properties from the given set.
   auto addProperties = [&](clang::DeclContext::decl_range members) {

diff --git a/lib/IRGen/GenCall.cpp b/lib/IRGen/GenCall.cpp
@@ -205,8 +205,8 @@ void irgen::addByvalArgumentAttributes(IRGenModule &IGM,
                                        unsigned argIndex, Alignment align) {
   llvm::AttrBuilder b;
   b.addAttribute(llvm::Attribute::ByVal);
-  b.addAttribute(llvm::Attribute::getWithAlignment(IGM.LLVMContext,
-                                                   align.getValue()));
+  b.addAttribute(llvm::Attribute::getWithAlignment(
+      IGM.LLVMContext, llvm::Align(align.getValue())));
   attrs = attrs.addAttributes(IGM.LLVMContext,
                               argIndex + llvm::AttributeList::FirstArgIndex, b);
 }

diff --git a/lib/Serialization/ModuleFile.cpp b/lib/Serialization/ModuleFile.cpp
@@ -1411,14 +1411,21 @@ ModuleFile::readDeclUSRsTable(ArrayRef<uint64_t> fields, StringRef blobData) {
 }
 
 bool ModuleFile::readDeclLocsBlock(llvm::BitstreamCursor &cursor) {
-  cursor.EnterSubBlock(DECL_LOCS_BLOCK_ID);
+  if (llvm::Error Err = cursor.EnterSubBlock(CONTROL_BLOCK_ID)) {
+    consumeError(std::move(Err));
+    return false;
+  }
 
   SmallVector<uint64_t, 4> scratch;
   StringRef blobData;
 
   while (!cursor.AtEndOfStream()) {
-    auto entry = cursor.advance();
-    switch (entry.Kind) {
+    Expected<llvm::BitstreamEntry> entry = cursor.advance();
+    if (!entry) {
+      consumeError(entry.takeError());
+      return false;
+    }
+    switch (entry->Kind) {
     case llvm::BitstreamEntry::EndBlock:
       return true;
 
@@ -1433,9 +1440,13 @@ bool ModuleFile::readDeclLocsBlock(llvm::BitstreamCursor &cursor) {
 
     case llvm::BitstreamEntry::Record:
       scratch.clear();
-      unsigned kind = cursor.readRecord(entry.ID, scratch, &blobData);
-
-      switch (kind) {
+      Expected<unsigned> kind =
+          cursor.readRecord(entry->ID, scratch, &blobData);
+      if (!kind) {
+        consumeError(kind.takeError());
+        return false;
+      }
+      switch (*kind) {
       case decl_locs_block::BASIC_DECL_LOCS:
         BasicDeclLocsData = blobData;
         break;
@@ -1467,20 +1478,28 @@ bool ModuleFile::readModuleSourceInfoIfPresent() {
   }
 
   SmallVector<uint64_t, 64> scratch;
-  llvm::BitstreamEntry topLevelEntry;
 
   bool hasValidControlBlock = false;
   ValidationInfo info;
+  unsigned kind = llvm::BitstreamEntry::Error;
 
   while (!infoCursor.AtEndOfStream()) {
-    topLevelEntry = infoCursor.advance(AF_DontPopBlockAtEnd);
-    if (topLevelEntry.Kind != llvm::BitstreamEntry::SubBlock)
+    Expected<llvm::BitstreamEntry> topLevelEntry =
+        infoCursor.advance(AF_DontPopBlockAtEnd);
+    if (!topLevelEntry) {
+      consumeError(topLevelEntry.takeError());
+      return false;
+    }
+    kind = topLevelEntry->Kind;
+    if (kind != llvm::BitstreamEntry::SubBlock)
       break;
 
-    switch (topLevelEntry.ID) {
+    switch (topLevelEntry->ID) {
     case CONTROL_BLOCK_ID: {
-      infoCursor.EnterSubBlock(CONTROL_BLOCK_ID);
-
+      if (llvm::Error Err = infoCursor.EnterSubBlock(CONTROL_BLOCK_ID)) {
+        consumeError(std::move(Err));
+        return false;
+      }
       info = validateControlBlock(infoCursor, scratch,
                                   {SWIFTSOURCEINFO_VERSION_MAJOR,
                                    SWIFTSOURCEINFO_VERSION_MINOR},
@@ -1509,7 +1528,7 @@ bool ModuleFile::readModuleSourceInfoIfPresent() {
     }
   }
 
-  if (topLevelEntry.Kind != llvm::BitstreamEntry::EndBlock)
+  if (kind != llvm::BitstreamEntry::EndBlock)
     return false;
 
   return true;

diff --git a/tools/SourceKit/lib/SwiftLang/CodeCompletion.h b/tools/SourceKit/lib/SwiftLang/CodeCompletion.h
@@ -17,6 +17,7 @@
 #include "swift/IDE/CodeCompletion.h"
 #include "llvm/ADT/DenseMap.h"
 #include "llvm/ADT/Optional.h"
+#include "llvm/ADT/StringMap.h"
 
 namespace SourceKit {
 namespace CodeCompletion {