---

yaml
---
r: 286654
b: refs/heads/master-next
c: 8cb4456
h: refs/heads/master

Author: aschwaighofer

[refs]

@@ -1,6 +1,6 @@
 ---
 refs/heads/master: a67ffadd758dfc7a0f10a8afde063b8864663208
-refs/heads/master-next: 0da04ca1eded63d5f1aba74efa4c551ace560486
+refs/heads/master-next: 8cb4456d337f99dea8bca08901c8b554f1e65d58
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-b: 66d897bfcf64a82cb9a87f5e663d889189d06d07

branches/master-next/CHANGELOG.md

@@ -197,9 +197,7 @@ Swift 5.1
   }
   ```
 
-* [SR-9827][]:
-
-  `weak` and `unowned` stored properties no longer inhibit the
+* `weak` and `unowned` stored properties no longer inhibit the
    automatic synthesis of `Equatable` or `Hashable` conformance.
 
 * [SR-2688][]:
@@ -7697,4 +7695,3 @@ Swift 1.0
 [SR-8109]: <https://bugs.swift.org/browse/SR-8109>
 [SR-8546]: <https://bugs.swift.org/browse/SR-8546>
 [SR-9043]: <https://bugs.swift.org/browse/SR-9043>
-[SR-9827]: <https://bugs.swift.org/browse/SR-9827>

branches/master-next/benchmark/CMakeLists.txt

@@ -92,7 +92,6 @@ set(SWIFT_BENCH_MODULES
     single-source/Hash
     single-source/Histogram
     single-source/InsertCharacter  
-    single-source/IntegerParsing
     single-source/Integrate
     single-source/IterateData
     single-source/Join

branches/master-next/benchmark/single-source/IntegerParsing.swift

@@ -80,7 +80,6 @@ import Hanoi
 import Hash
 import Histogram
 import InsertCharacter
-import IntegerParsing
 import Integrate
 import IterateData
 import Join
@@ -254,7 +253,6 @@ registerBenchmark(Hanoi)
 registerBenchmark(HashTest)
 registerBenchmark(Histogram)
 registerBenchmark(InsertCharacter)
-registerBenchmark(IntegerParsing)
 registerBenchmark(IntegrateTest)
 registerBenchmark(IterateData)
 registerBenchmark(Join)

branches/master-next/benchmark/utils/main.swift

@@ -0,0 +1,39 @@
+//===--- AccessedStorage.def ----------------------------*- c++ -*---------===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2014 - 2018 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0 with Runtime Library Exception
+//
+// See https://swift.org/LICENSE.txt for license information
+// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+//
+//===----------------------------------------------------------------------===//
+///
+/// \file
+///
+/// A file used for metaprogramming with accessed storage. Used to enable
+/// easily updateable visitors.
+///
+//===----------------------------------------------------------------------===//
+
+#ifndef ACCESSED_STORAGE
+#error "Must define accesed storage before including this?!"
+#endif
+
+#ifndef ACCESSED_STORAGE_RANGE
+#define ACCESSED_STORAGE_RANGE(Name, Start, End)
+#endif
+
+ACCESSED_STORAGE(Box)
+ACCESSED_STORAGE(Stack)
+ACCESSED_STORAGE(Global)
+ACCESSED_STORAGE(Class)
+ACCESSED_STORAGE(Argument)
+ACCESSED_STORAGE(Yield)
+ACCESSED_STORAGE(Nested)
+ACCESSED_STORAGE(Unidentified)
+ACCESSED_STORAGE_RANGE(AccessedStorageKind, Box, Unidentified)
+
+#undef ACCESSED_STORAGE_RANGE
+#undef ACCESSED_STORAGE

branches/master-next/include/swift/SIL/AccessedStorage.def

@@ -106,15 +106,11 @@ class AccessedStorage {
   /// Enumerate over all valid begin_access bases. Clients can use a covered
   /// switch to warn if findAccessedAddressBase ever adds a case.
   enum Kind : uint8_t {
-    Box,
-    Stack,
-    Global,
-    Class,
-    Argument,
-    Yield,
-    Nested,
-    Unidentified,
-    NumKindBits = countBitsUsed(static_cast<unsigned>(Unidentified))
+#define ACCESSED_STORAGE(Name) Name,
+#define ACCESSED_STORAGE_RANGE(Name, Start, End)                               \
+  First_##Name = Start, Last_##Name = End,
+#include "swift/SIL/AccessedStorage.def"
+    NumKindBits = countBitsUsed(unsigned(Last_AccessedStorageKind))
   };
 
   static const char *getKindName(Kind k);
@@ -326,6 +322,26 @@ class AccessedStorage {
   bool operator==(const AccessedStorage &) const = delete;
   bool operator!=(const AccessedStorage &) const = delete;
 };
+
+template <class ImplTy, class ResultTy = void, typename... ArgTys>
+class AccessedStorageVisitor {
+  ImplTy &asImpl() { return static_cast<ImplTy &>(*this); }
+
+public:
+#define ACCESSED_STORAGE(Name)                                                 \
+  ResultTy visit##Name(const AccessedStorage &storage, ArgTys &&... args);
+#include "swift/SIL/AccessedStorage.def"
+
+  ResultTy visit(const AccessedStorage &storage, ArgTys &&... args) {
+    switch (storage.getKind()) {
+#define ACCESSED_STORAGE(Name)                                                 \
+  case AccessedStorage::Name:                                                  \
+    return asImpl().visit##Name(storage, std::forward<ArgTys>(args)...);
+#include "swift/SIL/AccessedStorage.def"
+    }
+  }
+};
+
 } // end namespace swift
 
 namespace llvm {

branches/master-next/include/swift/SIL/MemAccessUtils.h

@@ -24,23 +24,7 @@
 extern "C" {
 #endif
 
-// Pointers used here need to be pointer-sized on watchOS for binary
-// compatibility. Everywhere else, they are 64-bit so 32-bit processes can
-// potentially read from 64-bit processes.
-#if defined(__APPLE__) && defined(__MACH__)
-#include <TargetConditionals.h>
-#if TARGET_OS_WATCH
-#define SWIFT_REFLECTION_NATIVE_POINTERS 1
-#endif
-#endif
-
-#if SWIFT_REFLECTION_NATIVE_POINTERS
-typedef uintptr_t swift_reflection_ptr_t;
-#else
-typedef uint64_t swift_reflection_ptr_t;
-#endif
-
-typedef swift_reflection_ptr_t swift_typeref_t;
+typedef uint64_t swift_typeref_t;
 
 /// Represents one of the Swift reflection sections of an image.
 typedef struct swift_reflection_section {
@@ -53,37 +37,37 @@ typedef struct swift_reflection_section {
 typedef struct swift_reflection_info {
   struct {
     swift_reflection_section_t section;
-    swift_reflection_ptr_t offset;
+    uint64_t offset;
   } field;
 
   struct {
     swift_reflection_section_t section;
-    swift_reflection_ptr_t offset;
+    uint64_t offset;
   } associated_types;
 
   struct {
     swift_reflection_section_t section;
-    swift_reflection_ptr_t offset;
+    uint64_t offset;
   } builtin_types;
 
   struct {
     swift_reflection_section_t section;
-    swift_reflection_ptr_t offset;
+    uint64_t offset;
   } capture;
 
   struct {
     swift_reflection_section_t section;
-    swift_reflection_ptr_t offset;
+    uint64_t offset;
   } type_references;
 
   struct {
     swift_reflection_section_t section;
-    swift_reflection_ptr_t offset;
+    uint64_t offset;
   } reflection_strings;
 
   // Start address in local and remote address spaces.
-  swift_reflection_ptr_t LocalStartAddress;
-  swift_reflection_ptr_t RemoteStartAddress;
+  uint64_t LocalStartAddress;
+  uint64_t RemoteStartAddress;
 } swift_reflection_info_t;
 
 /// The layout kind of a Swift type.

branches/master-next/include/swift/SwiftRemoteMirror/SwiftRemoteMirrorTypes.h

@@ -322,13 +322,6 @@ class ObjCPrinter : private DeclVisitor<ObjCPrinter>,
   void visitClassDecl(ClassDecl *CD) {
     printDocumentationComment(CD);
 
-    // This is just for testing, so we check explicitly for the attribute instead
-    // of asking if the class is weak imported. If the class has availablility,
-    // we'll print a SWIFT_AVAIALBLE() which implies __attribute__((weak_imported))
-    // already.
-    if (CD->getAttrs().hasAttribute<WeakLinkedAttr>())
-      os << "SWIFT_WEAK_IMPORT\n";
-
     bool hasResilientAncestry =
       CD->checkAncestry().contains(AncestryFlags::ResilientOther);
     if (hasResilientAncestry) {
@@ -2724,9 +2717,6 @@ class ModuleWriter {
            "#if !defined(SWIFT_AVAILABILITY)\n"
            "# define SWIFT_AVAILABILITY(plat, ...) __attribute__((availability(plat, __VA_ARGS__)))\n"
            "#endif\n"
-           "#if !defined(SWIFT_WEAK_IMPORT)\n"
-           "# define SWIFT_WEAK_IMPORT __attribute__((weak_import))\n"
-           "#endif\n"
            "#if !defined(SWIFT_DEPRECATED)\n"
            "# define SWIFT_DEPRECATED __attribute__((deprecated))\n"
            "#endif\n"