Merge pull request #24880 from gmittert/FixBuild

Update master-next for llvm api changes

Author: bob-wilson

include/swift/AST/ASTNode.h

@@ -36,10 +36,10 @@ namespace swift {
   enum class DeclKind : uint8_t;
   enum class StmtKind;
 
-  struct ASTNode : public llvm::PointerUnion3<Expr*, Stmt*, Decl*> {
+  struct ASTNode : public llvm::PointerUnion<Expr*, Stmt*, Decl*> {
     // Inherit the constructors from PointerUnion.
-    using PointerUnion3::PointerUnion3;
-    
+    using PointerUnion::PointerUnion;
+
     SourceRange getSourceRange() const;
 
     /// Return the location of the start of the statement.

include/swift/AST/Decl.h

@@ -4773,7 +4773,7 @@ class VarDecl : public AbstractStorageDecl {
   };
 
 protected:
-  PointerUnion3<PatternBindingDecl *, Stmt *, VarDecl *> Parent;
+  PointerUnion<PatternBindingDecl *, Stmt *, VarDecl *> Parent;
 
   VarDecl(DeclKind Kind, bool IsStatic, Specifier Sp, bool IsCaptureList,
           SourceLoc NameLoc, Identifier Name, DeclContext *DC)

include/swift/AST/GenericSignatureBuilder.h

@@ -92,10 +92,10 @@ class GenericSignatureBuilder {
   class ResolvedType;
 
   using UnresolvedRequirementRHS =
-      llvm::PointerUnion3<Type, PotentialArchetype *, LayoutConstraint>;
+      llvm::PointerUnion<Type, PotentialArchetype *, LayoutConstraint>;
 
   using RequirementRHS =
-    llvm::PointerUnion3<Type, PotentialArchetype *, LayoutConstraint>;
+    llvm::PointerUnion<Type, PotentialArchetype *, LayoutConstraint>;
 
   /// The location of a requirement as written somewhere in the source.
   typedef llvm::PointerUnion<const TypeRepr *, const RequirementRepr *>
@@ -1374,8 +1374,8 @@ class GenericSignatureBuilder::FloatingRequirementSource {
   } kind;
 
   using Storage =
-    llvm::PointerUnion3<const RequirementSource *, const TypeRepr *,
-                        const RequirementRepr *>;
+    llvm::PointerUnion<const RequirementSource *, const TypeRepr *,
+                       const RequirementRepr *>;
 
   Storage storage;
 

include/swift/AST/TypeCheckRequests.h

@@ -301,7 +301,7 @@ struct WhereClauseOwner {
 
   /// The source of the where clause, which can be a generic parameter list
   /// or a declaration that can have a where clause.
-  llvm::PointerUnion3<GenericParamList *, Decl *, SpecializeAttr *> source;
+  llvm::PointerUnion<GenericParamList *, Decl *, SpecializeAttr *> source;
 
   WhereClauseOwner(Decl *decl);
 

include/swift/Basic/LLVM.h

@@ -42,8 +42,7 @@ namespace llvm {
   template<typename T> class MutableArrayRef;
   template<typename T> class TinyPtrVector;
   template<typename T> class Optional;
-  template <typename PT1, typename PT2> class PointerUnion;
-  template <typename PT1, typename PT2, typename PT3> class PointerUnion3;
+  template <typename ...PTs> class PointerUnion;
   class SmallBitVector;
 
   // Other common classes.
@@ -68,7 +67,6 @@ namespace swift {
   using llvm::None;
   using llvm::Optional;
   using llvm::PointerUnion;
-  using llvm::PointerUnion3;
   using llvm::SmallBitVector;
   using llvm::SmallPtrSet;
   using llvm::SmallPtrSetImpl;

include/swift/Parse/Parser.h

@@ -38,7 +38,7 @@
 #include "llvm/ADT/SetVector.h"
 
 namespace llvm {
-  template <typename PT1, typename PT2, typename PT3> class PointerUnion3;
+  template <typename...  PTs> class PointerUnion;
 }
 
 namespace swift {

include/swift/SILOptimizer/Analysis/LoopRegionAnalysis.h

@@ -384,7 +384,7 @@ class LoopRegion {
 private:
   /// A pointer to one of a Loop, Basic Block, or Function represented by this
   /// region.
-  llvm::PointerUnion3<FunctionTy *, LoopTy *, BlockTy *> Ptr;
+  llvm::PointerUnion<FunctionTy *, LoopTy *, BlockTy *> Ptr;
 
   /// The ID of this region.
   unsigned ID;

lib/ClangImporter/SwiftLookupTable.h

@@ -307,8 +307,8 @@ class SwiftLookupTable {
   static bool contextRequiresName(ContextKind kind);
 
   /// A single entry referencing either a named declaration or a macro.
-  typedef llvm::PointerUnion3<clang::NamedDecl *, clang::MacroInfo *, 
-                              clang::ModuleMacro *>
+  typedef llvm::PointerUnion<clang::NamedDecl *, clang::MacroInfo *,
+                             clang::ModuleMacro *>
     SingleEntry;
 
   /// A stored version of the context of an entity, which is Clang

lib/IRGen/IRGen.cpp

@@ -385,11 +385,13 @@ static bool needsRecompile(StringRef OutputFilename, ArrayRef<uint8_t> HashData,
     StringRef SectionName;
     Section.getName(SectionName);
     if (SectionName == HashSectionName) {
-      StringRef SectionData;
-      Section.getContents(SectionData);
+      llvm::Expected<llvm::StringRef> SectionData = Section.getContents();
+      if (!SectionData) {
+        return true;
+      }
       ArrayRef<uint8_t> PrevHashData(
-          reinterpret_cast<const uint8_t *>(SectionData.data()),
-          SectionData.size());
+          reinterpret_cast<const uint8_t *>(SectionData->data()),
+          SectionData->size());
       LLVM_DEBUG(if (PrevHashData.size() == sizeof(MD5::MD5Result)) {
         if (DiagMutex) DiagMutex->lock();
         SmallString<32> HashStr;

tools/driver/autolink_extract_main.cpp

@@ -107,26 +107,38 @@ class AutolinkExtractInvocation {
 
 /// Look inside the object file 'ObjectFile' and append any linker flags found in
 /// its ".swift1_autolink_entries" section to 'LinkerFlags'.
-static void
+/// Return 'true' if there was an error, and 'false' otherwise.
+static bool
 extractLinkerFlagsFromObjectFile(const llvm::object::ObjectFile *ObjectFile,
-                                 std::vector<std::string> &LinkerFlags) {
+                                 std::vector<std::string> &LinkerFlags,
+                                 CompilerInstance &Instance) {
   // Search for the section we hold autolink entries in
   for (auto &Section : ObjectFile->sections()) {
     llvm::StringRef SectionName;
     Section.getName(SectionName);
     if (SectionName == ".swift1_autolink_entries") {
-      llvm::StringRef SectionData;
-      Section.getContents(SectionData);
+      llvm::Expected<llvm::StringRef> SectionData = Section.getContents();
+      if (!SectionData) {
+        std::string message;
+        {
+          llvm::raw_string_ostream os(message);
+          logAllUnhandledErrors(SectionData.takeError(), os, "");
+        }
+        Instance.getDiags().diagnose(SourceLoc(), diag::error_open_input_file,
+                                  ObjectFile->getFileName() , message);
+        return true;
+      }
 
       // entries are null-terminated, so extract them and push them into
       // the set.
       llvm::SmallVector<llvm::StringRef, 4> SplitFlags;
-      SectionData.split(SplitFlags, llvm::StringRef("\0", 1), -1,
-                        /*KeepEmpty=*/false);
+      SectionData->split(SplitFlags, llvm::StringRef("\0", 1), -1,
+                         /*KeepEmpty=*/false);
       for (const auto &Flag : SplitFlags)
         LinkerFlags.push_back(Flag);
     }
   }
+  return false;
 }
 
 /// Look inside the binary 'Bin' and append any linker flags found in its
@@ -138,12 +150,10 @@ static bool extractLinkerFlags(const llvm::object::Binary *Bin,
                                StringRef BinaryFileName,
                                std::vector<std::string> &LinkerFlags) {
   if (auto *ObjectFile = llvm::dyn_cast<llvm::object::ELFObjectFileBase>(Bin)) {
-    extractLinkerFlagsFromObjectFile(ObjectFile, LinkerFlags);
-    return false;
+    return extractLinkerFlagsFromObjectFile(ObjectFile, LinkerFlags, Instance);
   } else if (auto *ObjectFile =
                  llvm::dyn_cast<llvm::object::COFFObjectFile>(Bin)) {
-    extractLinkerFlagsFromObjectFile(ObjectFile, LinkerFlags);
-    return false;
+    return extractLinkerFlagsFromObjectFile(ObjectFile, LinkerFlags, Instance);
   } else if (auto *Archive = llvm::dyn_cast<llvm::object::Archive>(Bin)) {
     llvm::Error Error = llvm::Error::success();
     for (const auto &Child : Archive->children(Error)) {

tools/lldb-moduleimport-test/lldb-moduleimport-test.cpp

@@ -169,10 +169,15 @@ collectASTModules(llvm::cl::list<std::string> &InputNames,
           (ELF && Name == swift::ELFASTSectionName) ||
           (COFF && Name == swift::COFFASTSectionName)) {
         uint64_t Size = Section.getSize();
-        StringRef ContentsReference;
-        Section.getContents(ContentsReference);
+
+        llvm::Expected<llvm::StringRef> ContentsReference = Section.getContents();
+        if (!ContentsReference) {
+          llvm::outs() << "error: " << name << " "
+            << errorToErrorCode(OF.takeError()).message() << "\n";
+          return false;
+        }
         char *Module = Alloc.Allocate<char>(Size);
-        std::memcpy(Module, (void *)ContentsReference.begin(), Size);
+        std::memcpy(Module, (void *)ContentsReference->begin(), Size);
         Modules.push_back({Module, Size});
       }
     }

tools/swift-reflection-dump/swift-reflection-dump.cpp

@@ -26,6 +26,7 @@
 #include "llvm/Object/ELFObjectFile.h"
 #include "llvm/Object/MachOUniversal.h"
 #include "llvm/Support/CommandLine.h"
+#include "llvm/Support/Error.h"
 
 #if defined(_WIN32)
 #include <io.h>
@@ -137,11 +138,11 @@ class Image {
     for (SectionRef S : O->sections()) {
       if (!needToRelocate(S))
         continue;
-      StringRef Content;
-      if (auto EC = S.getContents(Content))
-        reportError(EC);
-      std::memcpy(&Memory[getSectionAddress(S)], Content.data(),
-                  Content.size());
+      llvm::Expected<llvm::StringRef> Content = S.getContents();
+      if (!Content)
+        reportError(errorToErrorCode(Content.takeError()));
+      std::memcpy(&Memory[getSectionAddress(S)], Content->data(),
+                  Content->size());
     }
   }
 

unittests/Parse/LexerTests.cpp

@@ -825,7 +825,9 @@ TEST_F(LexerTest, DiagnoseEmbeddedNulOffset) {
 // This test requires mmap because llvm::sys::Memory doesn't support protecting
 // pages to have no permissions.
 TEST_F(LexerTest, EncodedStringSegmentPastTheEnd) {
-  size_t PageSize = llvm::sys::Process::getPageSize();
+  Expected<size_t> ExptPageSize = llvm::sys::Process::getPageSize();
+  ASSERT_TRUE(bool(ExptPageSize));
+  size_t PageSize = *ExptPageSize;
 
   void *FirstPage = mmap(/*addr*/nullptr, PageSize * 2, PROT_NONE,
                          MAP_PRIVATE | MAP_ANON, /*fd*/-1, /*offset*/0);