---

yaml
---
r: 278399
b: refs/heads/swift-5.1-old-llvm-branch
c: 3199214
h: refs/heads/master
i:
  278397: d2c11a0
  278395: 155e951
  278391: 7f28812
  278383: ee8397d
  278367: 61b75f7
  278335: 92b5a4e
  278271: 79473d5

Author: slavapestov

[refs]

@@ -1241,7 +1241,7 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2019-01-24-a: b6f62823aa5010b2ae53f15f72a57
 refs/heads/marcrasi-astverifier-disable: 3fac766a23a77ebd0640296bfd7fc116ea60a4e0
 refs/heads/revert-22227-a-tall-white-fountain-played: adfce60b2eaa54903ea189bed8a783bca609fa53
 refs/heads/revert-22300-revert-22227-a-tall-white-fountain-played: 5f92040224df7dd4e618fdfb367349df64d8acad
-refs/heads/swift-5.1-old-llvm-branch: eb459d5df6d6c513b36d711a9cf04e42441dc01b
+refs/heads/swift-5.1-old-llvm-branch: 31992143ee9317b6ad7c5c9a083424c21e388862
 refs/heads/swift-5.1-branch: 8060872acb4105d9655e020fe047e1ebcd77d0fb
 refs/tags/swift-4.2.2-RELEASE: e429d1f1aaf59e69d38207a96e56265c7f6fccec
 refs/tags/swift-5.0-DEVELOPMENT-SNAPSHOT-2019-02-02-a: 3e5a03d32ff3b1e9af90d6c1198c14f938379a6e

branches/swift-5.1-old-llvm-branch/cmake/modules/SwiftSharedCMakeConfig.cmake

@@ -213,7 +213,10 @@ endmacro()
 #     The product name, e.g. Swift or SourceKit. Used as prefix for some
 #     cmake variables.
 macro(swift_common_unified_build_config product)
+  set(PATH_TO_LLVM_SOURCE "${CMAKE_SOURCE_DIR}")
+  set(PATH_TO_LLVM_BUILD "${CMAKE_BINARY_DIR}")
   set(${product}_PATH_TO_CLANG_BUILD "${CMAKE_BINARY_DIR}")
+  set(PATH_TO_CLANG_BUILD "${CMAKE_BINARY_DIR}")
   set(CLANG_MAIN_INCLUDE_DIR "${LLVM_EXTERNAL_CLANG_SOURCE_DIR}/include")
   set(CLANG_BUILD_INCLUDE_DIR "${CMAKE_BINARY_DIR}/tools/clang/include")
   set(${product}_NATIVE_LLVM_TOOLS_PATH "${CMAKE_BINARY_DIR}/bin")

branches/swift-5.1-old-llvm-branch/docs/WindowsBuild.md

@@ -159,8 +159,8 @@ mkdir "S:\b\swift"
 pushd "S:\b\swift"
 cmake -G Ninja^
  -DCMAKE_BUILD_TYPE=RelWithDebInfo^
- -DCMAKE_C_COMPILER=cl^
- -DCMAKE_CXX_COMPILER=cl^
+ -DCMAKE_C_COMPILER=clang-cl^
+ -DCMAKE_CXX_COMPILER=clang-cl^
  -DCMAKE_EXE_LINKER_FLAGS:STRING="/INCREMENTAL:NO"^
  -DCMAKE_SHARED_LINKER_FLAGS:STRING="/INCREMENTAL:NO"^
  -DSWIFT_INCLUDE_DOCS=OFF^
@@ -220,9 +220,9 @@ Running the testsuite on Windows has additional external dependencies.  You must
   2. diffutils
   3. grep
   4. sed
-
+  
 ```cmd
-path S:\thirdparty\icu4c-63_1-Win64-MSVC2017\bin64;S:\b\swift\bin;S:\b\swift\libdispatch-prefix\bin;%PATH%;%ProgramFiles(x86)%\GnuWin32\bin
+path S:\b\swift\bin;S:\b\swift\libdispatch-prefix\bin;%PATH%;%ProgramFiles(x86)%\GnuWin32\bin;S:\thirdparty\icu4c-63_1-Win64-MSVC2017\lib64
 ninja -C S:\b\swift check-swift
 ```
 
@@ -236,18 +236,14 @@ cmake -G Ninja^
   -DCMAKE_C_COMPILER=clang-cl^
   -DCMAKE_CXX_COMPILER=clang-cl^
   -DCMAKE_SWIFT_COMPILER=S:\b\swift\bin\swiftc.exe^
+  -DSwift_DIR=S:\b\swift\lib\cmake\swift^
   -DENABLE_SWIFT=ON^
   -DENABLE_TESTING=OFF^
   S:\swift-corelibs-libdispatch
 popd
 cmake --build S:\b\libdispatch
 ```
 
-- Add libdispatch to your path:
-```cmd
-path S:\b\libdispatch;S:\b\libdispatch\src;%PATH%
-```
-
 ### 11. Build libxml2
 
 ```cmd
@@ -283,36 +279,23 @@ cmake -G Ninja^
 
 ```
 
-- Add Foundation to your path:
-```cmd
-path S:\b\foundation;%PATH%
-```
-
 ### 13. Build swift-corelibs-xctest
 
 ```cmd
 mkdir "S:\b\xctest"
 pushd "S:\b\xctest"
-cmake -G Ninja^
-  -DBUILD_SHARED_LIBS=YES^
+cmke -G Ninja^
   -DCMAKE_BUILD_TYPE=RelWithDebInfo^
   -DCMAKE_SWIFT_COMPILER=S:\b\swift\bin\swiftc.exe^
   -DXCTEST_PATH_TO_COREFOUNDATION_BUILD=S:\b\foundation\CoreFoundation-prefix^
   -DXCTEST_PATH_TO_FOUNDATION_BUILD=S:\b\foundation^
-  -DXCTEST_PATH_TO_LIBDISPATCH_SOURCE=S:\swift-corelibs-libdispatch^
+  -DXCTEST_PATH_TO_LIBDPATCH_SOURCE=S:\b\swift-corelibs-libdispatch^
   -DXCTEST_PATH_TO_LIBDISPATCH_BUILD=S:\b\libdispatch^
-  -DLIT_COMMAND=S:\llvm\utils\lit\lit.py^
-  -DPYTHON_EXECUTABLE=C:\Python27\python.exe^
   S:\swift-corelibs-xctest
 popd
 cmake --build S:\b\xctest
 ```
 
-- Add XCTest to your path:
-```cmd
-path S:\b\xctest;%PATH%
-```
-
 ### 14. Install Swift on Windows
 
 - Run ninja install:

branches/swift-5.1-old-llvm-branch/include/swift/AST/Types.h

@@ -2762,8 +2762,6 @@ class AnyFunctionType : public TypeBase {
     bool operator!=(Param const &b) const { return !(*this == b); }
 
     Param getWithoutLabel() const { return Param(Ty, Identifier(), Flags); }
-
-    Param withType(Type newType) const { return Param(newType, Label, Flags); }
   };
 
   class CanParam : public Param {

branches/swift-5.1-old-llvm-branch/include/swift/Reflection/ReflectionContext.h

@@ -18,10 +18,8 @@
 #ifndef SWIFT_REFLECTION_REFLECTIONCONTEXT_H
 #define SWIFT_REFLECTION_REFLECTIONCONTEXT_H
 
-#include "llvm/BinaryFormat/COFF.h"
 #include "llvm/BinaryFormat/MachO.h"
 #include "llvm/BinaryFormat/ELF.h"
-#include "llvm/Object/COFF.h"
 
 #include "swift/Remote/MemoryReader.h"
 #include "swift/Remote/MetadataReader.h"
@@ -62,6 +60,7 @@ template <> struct ELFTraits<llvm::ELF::ELFCLASS32> {
   using Section = const struct llvm::ELF::Elf32_Shdr;
   using Offset = llvm::ELF::Elf32_Off;
   using Size = llvm::ELF::Elf32_Word;
+  using Address = llvm::ELF::Elf32_Addr;
   static constexpr unsigned char ELFClass = llvm::ELF::ELFCLASS32;
 };
 
@@ -70,6 +69,7 @@ template <> struct ELFTraits<llvm::ELF::ELFCLASS64> {
   using Section = const struct llvm::ELF::Elf64_Shdr;
   using Offset = llvm::ELF::Elf64_Off;
   using Size = llvm::ELF::Elf64_Xword;
+  using Address = llvm::ELF::Elf64_Addr;
   static constexpr unsigned char ELFClass = llvm::ELF::ELFCLASS64;
 };
 
@@ -202,7 +202,7 @@ class ReflectionContext
                                                RangeEnd - RangeStart);
 
     auto findMachOSectionByName = [&](std::string Name)
-        -> std::pair<std::pair<const char *, const char *>, uint64_t> {
+        -> std::pair<std::pair<const char *, const char *>, uint32_t> {
       for (unsigned I = 0; I < NumSect; ++I) {
         auto S = reinterpret_cast<typename T::Section *>(
             SectionsBuf + (I * sizeof(typename T::Section)));
@@ -233,8 +233,8 @@ class ReflectionContext
         ReflStrMdSec.first.first == nullptr)
       return false;
 
-    auto LocalStartAddress = reinterpret_cast<uint64_t>(SectBuf.get());
-    auto RemoteStartAddress = static_cast<uint64_t>(RangeStart);
+    auto LocalStartAddress = reinterpret_cast<uintptr_t>(SectBuf.get());
+    auto RemoteStartAddress = static_cast<uintptr_t>(RangeStart);
 
     ReflectionInfo info = {
         {{FieldMdSec.first.first, FieldMdSec.first.second}, 0},
@@ -286,100 +286,6 @@ class ReflectionContext
       return readMachOSections<MachOTraits<8>>(ImageStart);
     return false;
   }
-
-#elif defined(_WIN32)
-  bool addImage(RemoteAddress ImageStart) {
-    auto DOSHdrBuf = this->getReader().readBytes(
-        ImageStart, sizeof(llvm::object::dos_header));
-    auto DOSHdr =
-        reinterpret_cast<const llvm::object::dos_header *>(DOSHdrBuf.get());
-    auto COFFFileHdrAddr = ImageStart.getAddressData() +
-                           DOSHdr->AddressOfNewExeHeader +
-                           sizeof(llvm::COFF::PEMagic);
-
-    auto COFFFileHdrBuf = this->getReader().readBytes(
-        RemoteAddress(COFFFileHdrAddr), sizeof(llvm::object::coff_file_header));
-    auto COFFFileHdr = reinterpret_cast<const llvm::object::coff_file_header *>(
-        COFFFileHdrBuf.get());
-
-    auto SectionTableAddr = COFFFileHdrAddr +
-                            sizeof(llvm::object::coff_file_header) +
-                            COFFFileHdr->SizeOfOptionalHeader;
-    auto SectionTableBuf = this->getReader().readBytes(
-        RemoteAddress(SectionTableAddr),
-        sizeof(llvm::object::coff_section) * COFFFileHdr->NumberOfSections);
-
-    auto findCOFFSectionByName = [&](llvm::StringRef Name)
-        -> std::pair<std::pair<const char *, const char *>, uint32_t> {
-      for (size_t i = 0; i < COFFFileHdr->NumberOfSections; ++i) {
-        const llvm::object::coff_section *COFFSec =
-            reinterpret_cast<const llvm::object::coff_section *>(
-                SectionTableBuf.get()) +
-            i;
-        llvm::StringRef SectionName =
-            (COFFSec->Name[llvm::COFF::NameSize - 1] == 0)
-                ? COFFSec->Name
-                : llvm::StringRef(COFFSec->Name, llvm::COFF::NameSize);
-        if (SectionName != Name)
-          continue;
-        auto Addr = ImageStart.getAddressData() + COFFSec->PointerToRawData;
-        auto Buf = this->getReader().readBytes(RemoteAddress(Addr),
-                                               COFFSec->VirtualSize);
-        const char *Begin = reinterpret_cast<const char *>(Buf.get());
-        const char *End = Begin + COFFSec->VirtualSize;
-        savedBuffers.push_back(std::move(Buf));
-        return {{Begin, End},
-                COFFSec->VirtualAddress - COFFSec->PointerToRawData};
-      }
-      return {{nullptr, nullptr}, 0};
-    };
-
-    std::pair<std::pair<const char *, const char *>, uint32_t> CaptureSec =
-        findCOFFSectionByName(".sw5cptr");
-    std::pair<std::pair<const char *, const char *>, uint32_t> TypeRefMdSec =
-        findCOFFSectionByName(".sw5tyrf");
-
-    // FIXME: Make use of .sw5flmd section (the section content appears to be
-    // incorrect on Windows at the moment).
-    std::pair<std::pair<const char *, const char *>, uint32_t> FieldMdSec = {
-        {nullptr, nullptr}, 0};
-    // FIXME: Make use of .sw5asty.
-    std::pair<std::pair<const char *, const char *>, uint32_t> AssocTySec = {
-        {nullptr, nullptr}, 0};
-    // FIXME: Make use of .sw5bltn.
-    std::pair<std::pair<const char *, const char *>, uint32_t> BuiltinTySec = {
-        {nullptr, nullptr}, 0};
-    // FIXME: Make use of .sw5repl.
-    std::pair<std::pair<const char *, const char *>, uint32_t> ReflStrMdSec = {
-        {nullptr, nullptr}, 0};
-
-    if (FieldMdSec.first.first == nullptr &&
-        AssocTySec.first.first == nullptr &&
-        BuiltinTySec.first.first == nullptr &&
-        CaptureSec.first.first == nullptr &&
-        TypeRefMdSec.first.first == nullptr &&
-        ReflStrMdSec.first.first == nullptr)
-      return false;
-    auto LocalStartAddress = reinterpret_cast<uintptr_t>(DOSHdrBuf.get());
-    auto RemoteStartAddress =
-        static_cast<uintptr_t>(ImageStart.getAddressData());
-
-    ReflectionInfo Info = {
-        {{FieldMdSec.first.first, FieldMdSec.first.second}, FieldMdSec.second},
-        {{AssocTySec.first.first, AssocTySec.first.second}, AssocTySec.second},
-        {{BuiltinTySec.first.first, BuiltinTySec.first.second},
-         BuiltinTySec.second},
-        {{CaptureSec.first.first, CaptureSec.first.second}, CaptureSec.second},
-        {{TypeRefMdSec.first.first, TypeRefMdSec.first.second},
-         TypeRefMdSec.second},
-        {{ReflStrMdSec.first.first, ReflStrMdSec.first.second},
-         ReflStrMdSec.second},
-        LocalStartAddress,
-        RemoteStartAddress};
-    this->addReflectionInfo(Info);
-    return true;
-  }
-
 #else // ELF platforms.
   template <typename T> bool readELFSections(RemoteAddress ImageStart) {
     auto Buf =
@@ -426,7 +332,7 @@ class ReflectionContext
     auto StrTab = reinterpret_cast<const char *>(StrTabBuf.get());
 
     auto findELFSectionByName = [&](std::string Name)
-        -> std::pair<std::pair<const char *, const char *>, uint64_t> {
+        -> std::pair<std::pair<const char *, const char *>, typename T::Address> {
       // Now for all the sections, find their name.
       for (const typename T::Section *Hdr : SecHdrVec) {
         uint32_t Offset = Hdr->sh_name;
@@ -461,9 +367,9 @@ class ReflectionContext
         ReflStrMdSec.first.first == nullptr)
       return false;
 
-    auto LocalStartAddress = reinterpret_cast<uint64_t>(Buf.get());
+    auto LocalStartAddress = reinterpret_cast<uintptr_t>(Buf.get());
     auto RemoteStartAddress =
-        static_cast<uint64_t>(ImageStart.getAddressData());
+        static_cast<uintptr_t>(ImageStart.getAddressData());
 
     ReflectionInfo info = {
         {{FieldMdSec.first.first, FieldMdSec.first.second}, FieldMdSec.second},

branches/swift-5.1-old-llvm-branch/include/swift/Reflection/TypeRefBuilder.h

@@ -82,36 +82,36 @@ using GenericSection = ReflectionSection<const void *>;
 struct ReflectionInfo {
   struct {
     FieldSection Metadata;
-    uint64_t SectionOffset;
+    uintptr_t SectionOffset;
   } Field;
 
   struct {
     AssociatedTypeSection Metadata;
-    uint64_t SectionOffset;
+    uintptr_t SectionOffset;
   } AssociatedType;
 
   struct {
     BuiltinTypeSection Metadata;
-    uint64_t SectionOffset;
+    uintptr_t SectionOffset;
   } Builtin;
 
   struct {
     CaptureSection Metadata;
-    uint64_t SectionOffset;
+    uintptr_t SectionOffset;
   } Capture;
 
   struct {
     GenericSection Metadata;
-    uint64_t SectionOffset;
+    uintptr_t SectionOffset;
   } TypeReference;
 
   struct {
     GenericSection Metadata;
-    uint64_t SectionOffset;
+    uintptr_t SectionOffset;
   } ReflectionString;
 
-  uint64_t LocalStartAddress;
-  uint64_t RemoteStartAddress;
+  uintptr_t LocalStartAddress;
+  uintptr_t RemoteStartAddress;
 };
 
 struct ClosureContextInfo {
@@ -506,11 +506,11 @@ class TypeRefBuilder {
 
   /// Get the raw capture descriptor for a remote capture descriptor
   /// address.
-  const CaptureDescriptor *getCaptureDescriptor(uint64_t RemoteAddress);
+  const CaptureDescriptor *getCaptureDescriptor(uintptr_t RemoteAddress);
 
   /// Get the unsubstituted capture types for a closure context.
   ClosureContextInfo getClosureContextInfo(const CaptureDescriptor &CD,
-                                           uint64_t Offset);
+                                           uintptr_t Offset);
 
   ///
   /// Dumping typerefs, field declarations, associated types

branches/swift-5.1-old-llvm-branch/include/swift/Remote/MetadataReader.h

@@ -410,11 +410,15 @@ class MetadataReader {
     StoredPointer InstanceAddress =
         InstanceMetadataAddressAddress + 2 * sizeof(StoredPointer);
 
+    // When built with Objective-C interop, the runtime also stores a conformance
+    // to Hashable and the base type introducing the Hashable conformance.
+    if (isObjC)
+      InstanceAddress += 2 * sizeof(StoredPointer);
+
     // Round up to alignment, and we have the start address of the
     // instance payload.
     auto AlignmentMask = VWT->getAlignmentMask();
-    auto Offset = (sizeof(HeapObject) + AlignmentMask) & ~AlignmentMask;
-    InstanceAddress += Offset;
+    InstanceAddress = (InstanceAddress + AlignmentMask) & ~AlignmentMask;
 
     return RemoteExistential(
         RemoteAddress(*InstanceMetadataAddress),
@@ -2472,13 +2476,8 @@ class MetadataReader {
     TaggedPointerExtendedClasses =
         TaggedPointerExtendedClassesAddr.getAddressData();
 
-    // The tagged pointer obfuscator is not present on older OSes, in
-    // which case we can treat it as zero.
-    TaggedPointerObfuscator = 0;
-    auto TaggedPointerObfuscatorAddr = Reader->getSymbolAddress(
-      "objc_debug_taggedpointer_obfuscator");
-    if (TaggedPointerObfuscatorAddr)
-      tryReadSymbol(TaggedPointerObfuscatorAddr, TaggedPointerObfuscator);
+    tryFindAndReadSymbol(TaggedPointerObfuscator,
+                         "objc_debug_taggedpointer_obfuscator");
 
 #   undef tryFindSymbol
 #   undef tryReadSymbol