---

yaml
---
r: 343405
b: refs/heads/master-rebranch
c: e4f0f78
h: refs/heads/master
i:
  343403: 0ca6b67

Author: varungandhi-apple

[refs]

@@ -1455,7 +1455,7 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2019-08-02-a: ddd2b2976aa9bfde5f20fe37f6bd2
 refs/tags/swift-DEVELOPMENT-SNAPSHOT-2019-08-03-a: 171cc166f2abeb5ca2a4003700a8a78a108bd300
 refs/heads/benlangmuir-patch-1: baaebaf39d52f3bf36710d4fe40cf212e996b212
 refs/heads/i-do-redeclare: 8c4e6d5de5c1e3f0a2cedccf319df713ea22c48e
-refs/heads/master-rebranch: 23cd3d64f2f84fe8d1e272aa7a7663122eeb0dfd
+refs/heads/master-rebranch: e4f0f78020243786a2574875c191966c4abe4920
 refs/heads/rdar-53901732: 9bd06af3284e18a109cdbf9aa59d833b24eeca7b
 refs/heads/revert-26776-subst-always-returns-a-type: 1b8e18fdd391903a348970a4c848995d4cdd789c
 refs/heads/tensorflow-merge: 8b854f62f80d4476cb383d43c4aac2001dde3cec

branches/master-rebranch/CHANGELOG.md

@@ -26,29 +26,6 @@ CHANGELOG
 Swift Next
 ----------
 
-* [SE-0253][]:
-
-  Values of types that declare `func callAsFunction` methods can be called
-  like functions. The call syntax is shorthand for applying
-  `func callAsFunction` methods.
-
-  ```swift
-  struct Adder {
-    var base: Int
-    func callAsFunction(_ x: Int) -> Int {
-      return x + base
-    }
-  }
-  var adder = Adder(base: 3)
-  adder(10) // returns 13, same as `adder.callAsFunction(10)`
-  ```
-
-  * `func callAsFunction` argument labels are required at call sites.
-  * Multiple `func callAsFunction` methods on a single type are supported.
-  * `mutating func callAsFunction` is supported.
-  * `func callAsFunction` works with `throws` and `rethrows`.
-  * `func callAsFunction` works with trailing closures.
-
 * [SR-4206][]:
 
   A method override is no longer allowed to have a generic signature with 
@@ -7734,7 +7711,6 @@ Swift 1.0
 [SE-0244]: <https://github.com/apple/swift-evolution/blob/master/proposals/0244-opaque-result-types.md>
 [SE-0245]: <https://github.com/apple/swift-evolution/blob/master/proposals/0245-array-uninitialized-initializer.md>
 [SE-0252]: <https://github.com/apple/swift-evolution/blob/master/proposals/0252-keypath-dynamic-member-lookup.md>
-[SE-0253]: <https://github.com/apple/swift-evolution/blob/master/proposals/0253-callable.md>
 [SE-0254]: <https://github.com/apple/swift-evolution/blob/master/proposals/0254-static-subscripts.md>
 
 [SR-106]: <https://bugs.swift.org/browse/SR-106>

branches/master-rebranch/benchmark/CMakeLists.txt

@@ -87,7 +87,6 @@ set(SWIFT_BENCH_MODULES
     single-source/Exclusivity
     single-source/ExistentialPerformance
     single-source/Fibonacci
-    single-source/FindStringNaive
     single-source/FlattenList
     single-source/FloatingPointParsing
     single-source/FloatingPointPrinting

branches/master-rebranch/benchmark/single-source/FindStringNaive.swift

@@ -75,7 +75,6 @@ import ErrorHandling
 import Exclusivity
 import ExistentialPerformance
 import Fibonacci
-import FindStringNaive
 import FlattenList
 import FloatingPointParsing
 import FloatingPointPrinting
@@ -254,7 +253,6 @@ registerBenchmark(ErrorHandling)
 registerBenchmark(Exclusivity)
 registerBenchmark(ExistentialPerformance)
 registerBenchmark(Fibonacci)
-registerBenchmark(FindStringNaive)
 registerBenchmark(FlattenListLoop)
 registerBenchmark(FlattenListFlatMap)
 registerBenchmark(FloatingPointParsing)

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

@@ -2370,7 +2370,7 @@ function(_add_swift_executable_single name)
   # NOTE(compnerd) use the C linker language to invoke `clang` rather than
   # `clang++` as we explicitly link against the C++ runtime.  We were previously
   # actually passing `-nostdlib++` to avoid the C++ runtime linkage.
-  if(${SWIFTEXE_SINGLE_SDK} STREQUAL ANDROID)
+  if(SWIFTEXE_SINGLE_SDK STREQUAL ANDROID)
     set_property(TARGET "${name}" PROPERTY
       LINKER_LANGUAGE "C")
   else()

branches/master-rebranch/cmake/modules/AddSwift.cmake

@@ -69,6 +69,7 @@ namespace swift {
   class LazyGenericContextData;
   class LazyIterableDeclContextData;
   class LazyMemberLoader;
+  class LazyMemberParser;
   class LazyResolver;
   class PatternBindingDecl;
   class PatternBindingInitializer;
@@ -111,10 +112,6 @@ namespace swift {
 
   enum class KnownProtocolKind : uint8_t;
 
-namespace namelookup {
-  class ImportCache;
-}
-
 namespace syntax {
   class SyntaxArena;
 }
@@ -424,6 +421,12 @@ class ASTContext final {
   void setLazyResolver(LazyResolver *resolver);
 
 public:
+  /// Add a lazy parser for resolving members later.
+  void addLazyParser(LazyMemberParser *parser);
+
+  /// Remove a lazy parser.
+  void removeLazyParser(LazyMemberParser *parser);
+
   /// getIdentifier - Return the uniqued and AST-Context-owned version of the
   /// specified string.
   Identifier getIdentifier(StringRef Str) const;
@@ -680,9 +683,7 @@ class ASTContext final {
   /// If there is no Clang module loader, returns a null pointer.
   /// The loader is owned by the AST context.
   ClangModuleLoader *getDWARFModuleLoader() const;
-
-  namelookup::ImportCache &getImportCache() const;
-
+  
   /// Asks every module loader to verify the ASTs it has loaded.
   ///
   /// Does nothing in non-asserts (NDEBUG) builds.
@@ -815,6 +816,12 @@ class ASTContext final {
   LazyContextData *getOrCreateLazyContextData(const DeclContext *decl,
                                               LazyMemberLoader *lazyLoader);
 
+  /// Use the lazy parsers associated with the context to populate the members
+  /// of the given decl context.
+  ///
+  /// \param IDC The context whose member decls should be lazily parsed.
+  void parseMembers(IterableDeclContext *IDC);
+
   /// Get the lazy function data for the given generic context.
   ///
   /// \param lazyLoader If non-null, the lazy loader to use when creating the

branches/master-rebranch/include/swift/AST/ASTContext.h

@@ -33,4 +33,3 @@ SWIFT_TYPEID(AncestryFlags)
 SWIFT_TYPEID_NAMED(GenericSignature *, GenericSignature)
 SWIFT_TYPEID_NAMED(GenericTypeParamType *, GenericTypeParamType)
 SWIFT_TYPEID(Requirement)
-SWIFT_TYPEID_NAMED(IterableDeclContext *, IterableDeclContext)

branches/master-rebranch/include/swift/AST/ASTTypeIDZone.def

@@ -17,26 +17,19 @@
 #ifndef SWIFT_AST_ASTTYPEIDS_H
 #define SWIFT_AST_ASTTYPEIDS_H
 
-#include "swift/Basic/LLVM.h"
 #include "swift/Basic/TypeID.h"
 namespace swift {
 
 class CustomAttr;
-class Decl;
 class GenericSignature;
 class GenericTypeParamType;
-class IterableDeclContext;
 class NominalTypeDecl;
-class OperatorDecl;
 struct PropertyWrapperBackingPropertyInfo;
 struct PropertyWrapperTypeInfo;
 enum class CtorInitializerKind;
 struct PropertyWrapperMutability;
-class ProtocolDecl;
 class Requirement;
-enum class ResilienceExpansion : unsigned;
 class Type;
-class ValueDecl;
 class VarDecl;
 class TypeAliasDecl;
 class Type;

branches/master-rebranch/include/swift/AST/ASTTypeIDs.h

@@ -362,7 +362,8 @@ SIMPLE_DECL_ATTR(_weakLinked, WeakLinked,
   OnSubscript | OnConstructor | OnEnumElement | OnExtension | UserInaccessible,
   75)
 SIMPLE_DECL_ATTR(frozen, Frozen,
-  OnEnum | OnStruct,
+  OnEnum | OnStruct |
+  UserInaccessible,
   76)
 DECL_ATTR_ALIAS(_frozen, Frozen)
 SIMPLE_DECL_ATTR(_forbidSerializingReference, ForbidSerializingReference,

branches/master-rebranch/include/swift/AST/Attr.def

@@ -418,14 +418,6 @@ BUILTIN_MISC_OPERATION(Strideof, "strideof", "n", Special)
 /// IsPOD has type T.Type -> Bool
 BUILTIN_MISC_OPERATION(IsPOD, "ispod", "n", Special)
 
-/// IsConcrete has type (T.Type) -> Bool
-///
-/// If the meta type T is concrete, we can always transform this to `true` at
-/// any time in SIL. If it's generic, then we lower it to `false` right before
-/// IRGen in IRGenPrepare. This allows for the optimizer to specialize this at
-/// -O and eliminate conditional code.
-BUILTIN_MISC_OPERATION(IsConcrete, "isConcrete", "n", Special)
-
 /// IsBitwiseTakable has type T.Type -> Bool
 BUILTIN_MISC_OPERATION(IsBitwiseTakable, "isbitwisetakable", "n", Special)