---

yaml
---
r: 343407
b: refs/heads/master-rebranch
c: 39c7640
h: refs/heads/master
i:
  343405: d60862b
  343403: 0ca6b67
  343399: e9c97a7
  343391: 6c9f0c5

Author: slavapestov

[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: f055791b9a5e2c4e9bed09baa4d752f2bfcda1fe
+refs/heads/master-rebranch: 39c7640f37c32b10842f7b0bd1f324fa298f764a
 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/include/swift/AST/Decl.h

@@ -5594,8 +5594,6 @@ class AbstractFunctionDecl : public GenericContext, public ValueDecl {
     SourceRange BodyRange;
   };
 
-  friend class ParseAbstractFunctionBodyRequest;
-
   CaptureInfo Captures;
 
   /// Location of the 'throws' token.

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

@@ -48,28 +48,6 @@ class ParseMembersRequest :
   bool isCached() const { return true; }
 };
 
-/// Parse the body of a function, initializer, or deinitializer.
-class ParseAbstractFunctionBodyRequest :
-    public SimpleRequest<ParseAbstractFunctionBodyRequest,
-                         BraceStmt *(AbstractFunctionDecl *),
-                         CacheKind::SeparatelyCached>
-{
-public:
-  using SimpleRequest::SimpleRequest;
-
-private:
-  friend SimpleRequest;
-
-  // Evaluation.
-  BraceStmt *evaluate(Evaluator &evaluator, AbstractFunctionDecl *afd) const;
-
-public:
-  // Caching
-  bool isCached() const { return true; }
-  Optional<BraceStmt *> getCachedResult() const;
-  void cacheResult(BraceStmt *value) const;
-};
-
 /// The zone number for the parser.
 #define SWIFT_TYPEID_ZONE Parse
 #define SWIFT_TYPEID_HEADER "swift/AST/ParseTypeIDZone.def"

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

@@ -15,4 +15,3 @@
 //===----------------------------------------------------------------------===//
 
 SWIFT_REQUEST(Parse, ParseMembersRequest)
-SWIFT_REQUEST(Parse, ParseAbstractFunctionBodyRequest)

branches/master-rebranch/include/swift/Basic/SourceManager.h

@@ -103,13 +103,6 @@ class SourceManager {
            rangeContainsTokenLoc(Enclosing, Inner.End);
   }
 
-  /// Returns true if range \p R contains the code-completion location, if any.
-  bool rangeContainsCodeCompletionLoc(SourceRange R) const {
-    return CodeCompletionBufferID
-               ? rangeContainsTokenLoc(R, getCodeCompletionLoc())
-               : false;
-  }
-
   /// Returns the buffer ID for the specified *valid* location.
   ///
   /// Because a valid source location always corresponds to a source buffer,

branches/master-rebranch/include/swift/Parse/Parser.h

@@ -1124,7 +1124,7 @@ class Parser {
                                        DeclAttributes &Attributes,
                                        bool HasFuncKeyword = true);
   void parseAbstractFunctionBody(AbstractFunctionDecl *AFD);
-  BraceStmt *parseAbstractFunctionBodyDelayed(AbstractFunctionDecl *AFD);
+  bool parseAbstractFunctionBodyDelayed(AbstractFunctionDecl *AFD);
   ParserResult<ProtocolDecl> parseDeclProtocol(ParseDeclOptions Flags,
                                                DeclAttributes &Attributes);
 

branches/master-rebranch/include/swift/Parse/PersistentParserState.h

@@ -109,6 +109,14 @@ class PersistentParserState {
   PersistentParserState(ASTContext &ctx) : PersistentParserState() { }
   ~PersistentParserState();
 
+  void delayFunctionBodyParsing(AbstractFunctionDecl *AFD,
+                                SourceRange BodyRange,
+                                SourceLoc PreviousLoc);
+  std::unique_ptr<FunctionBodyState>
+  takeFunctionBodyState(AbstractFunctionDecl *AFD);
+
+  bool hasFunctionBodyState(AbstractFunctionDecl *AFD);
+
   void delayDecl(DelayedDeclKind Kind, unsigned Flags,
                  DeclContext *ParentContext,
                  SourceRange BodyRange, SourceLoc PreviousLoc);

branches/master-rebranch/include/swift/Sema/SourceLoader.h

@@ -24,20 +24,22 @@ class ModuleDecl;
 class SourceLoader : public ModuleLoader {
 private:
   ASTContext &Ctx;
+  bool SkipBodies;
   bool EnableLibraryEvolution;
 
   explicit SourceLoader(ASTContext &ctx,
+                        bool skipBodies,
                         bool enableResilience,
                         DependencyTracker *tracker)
     : ModuleLoader(tracker), Ctx(ctx),
-      EnableLibraryEvolution(enableResilience) {}
+      SkipBodies(skipBodies), EnableLibraryEvolution(enableResilience) {}
 
 public:
   static std::unique_ptr<SourceLoader>
-  create(ASTContext &ctx, bool enableResilience,
+  create(ASTContext &ctx, bool skipBodies, bool enableResilience,
          DependencyTracker *tracker = nullptr) {
     return std::unique_ptr<SourceLoader>{
-      new SourceLoader(ctx, enableResilience, tracker)
+      new SourceLoader(ctx, skipBodies, enableResilience, tracker)
     };
   }
 

branches/master-rebranch/lib/AST/ASTPrinter.cpp

@@ -118,13 +118,9 @@ PrintOptions PrintOptions::printParseableInterfaceFile(bool preferTypeRepr) {
 
   result.FunctionBody = [](const ValueDecl *decl, ASTPrinter &printer) {
     auto AFD = dyn_cast<AbstractFunctionDecl>(decl);
-    if (!AFD)
-      return;
+    if (!AFD || !AFD->hasInlinableBodyText()) return;
     if (AFD->getResilienceExpansion() != ResilienceExpansion::Minimal)
       return;
-    if (!AFD->hasInlinableBodyText())
-      return;
-
     SmallString<128> scratch;
     printer << " " << AFD->getInlinableBodyText(scratch);
   };

branches/master-rebranch/lib/AST/ASTScopeCreation.cpp

@@ -1272,7 +1272,7 @@ void AbstractFunctionDeclScope::expandAScopeThatDoesNotCreateANewInsertionPoint(
   // Create scope for the body.
   // We create body scopes when there is no body for source kit to complete
   // erroneous code in bodies. But don't let compiler synthesize one.
-  if (decl->getBodySourceRange().isValid() && decl->getBody(false)) {
+  if (decl->getBody(false) && decl->getBodySourceRange().isValid()) {
     if (AbstractFunctionBodyScope::isAMethod(decl))
       scopeCreator.constructExpandAndInsertUncheckable<MethodBodyScope>(leaf,
                                                                         decl);
@@ -1771,10 +1771,10 @@ bool IterableTypeScope::isBodyCurrent() const {
 }
 
 void AbstractFunctionBodyScope::beCurrent() {
-  bodyWhenLastExpanded = decl->getBody(false);
+  bodyWhenLastExpanded = decl->getBody();
 }
 bool AbstractFunctionBodyScope::isCurrent() const {
-  return bodyWhenLastExpanded == decl->getBody(false);
+  return bodyWhenLastExpanded == decl->getBody();
   ;
 }
 

branches/master-rebranch/lib/AST/Decl.cpp

@@ -33,7 +33,6 @@
 #include "swift/AST/NameLookup.h"
 #include "swift/AST/NameLookupRequests.h"
 #include "swift/AST/ParameterList.h"
-#include "swift/AST/ParseRequests.h"
 #include "swift/AST/Pattern.h"
 #include "swift/AST/PropertyWrappers.h"
 #include "swift/AST/ProtocolConformance.h"
@@ -6308,22 +6307,37 @@ bool AbstractFunctionDecl::argumentNameIsAPIByDefault() const {
 }
 
 BraceStmt *AbstractFunctionDecl::getBody(bool canSynthesize) const {
-  if ((getBodyKind() == BodyKind::Synthesize ||
-       getBodyKind() == BodyKind::Unparsed) &&
-      !canSynthesize)
+  switch (getBodyKind()) {
+  case BodyKind::Deserialized:
+  case BodyKind::MemberwiseInitializer:
+  case BodyKind::None:
+  case BodyKind::Skipped:
     return nullptr;
 
-  ASTContext &ctx = getASTContext();
+  case BodyKind::Parsed:
+  case BodyKind::TypeChecked:
+    return Body;
 
-  // Don't allow getBody() to trigger parsing of an unparsed body containing the
-  // code completion location.
-  if (getBodyKind() == BodyKind::Unparsed &&
-      ctx.SourceMgr.rangeContainsCodeCompletionLoc(getBodySourceRange())) {
+  case BodyKind::Unparsed:
+    // FIXME: Go parse now!
     return nullptr;
-  }
 
-  auto mutableThis = const_cast<AbstractFunctionDecl *>(this);
-  return evaluateOrDefault(ctx.evaluator, ParseAbstractFunctionBodyRequest{mutableThis}, nullptr);
+  case BodyKind::Synthesize: {
+    if (!canSynthesize)
+      return nullptr;
+
+    const_cast<AbstractFunctionDecl *>(this)->setBodyKind(BodyKind::None);
+    BraceStmt *body;
+    bool isTypeChecked;
+
+    auto mutableThis = const_cast<AbstractFunctionDecl *>(this);
+    std::tie(body, isTypeChecked) = (Synthesizer.Fn)(
+        mutableThis, Synthesizer.Context);
+    mutableThis->setBody(
+        body, isTypeChecked ? BodyKind::TypeChecked : BodyKind::Parsed);
+    return body;
+  }
+  }
 }
 
 SourceRange AbstractFunctionDecl::getBodySourceRange() const {
@@ -6790,15 +6804,11 @@ bool AbstractFunctionDecl::hasInlinableBodyText() const {
   switch (getBodyKind()) {
   case BodyKind::Deserialized:
     return true;
-
-  case BodyKind::Unparsed:
   case BodyKind::Parsed:
   case BodyKind::TypeChecked:
-    if (auto body = getBody())
-      return !body->isImplicit();
-    return false;
-
+    return getBody() && !getBody()->isImplicit();
   case BodyKind::None:
+  case BodyKind::Unparsed:
   case BodyKind::Synthesize:
   case BodyKind::Skipped:
   case BodyKind::MemberwiseInitializer:
@@ -7666,49 +7676,3 @@ SourceLoc swift::extractNearestSourceLoc(const Decl *decl) {
 
   return extractNearestSourceLoc(decl->getDeclContext());
 }
-
-Optional<BraceStmt *>
-ParseAbstractFunctionBodyRequest::getCachedResult() const {
-  using BodyKind = AbstractFunctionDecl::BodyKind;
-  auto afd = std::get<0>(getStorage());
-  switch (afd->getBodyKind()) {
-  case BodyKind::Deserialized:
-  case BodyKind::MemberwiseInitializer:
-  case BodyKind::None:
-  case BodyKind::Skipped:
-    return nullptr;
-
-  case BodyKind::TypeChecked:
-  case BodyKind::Parsed:
-    return afd->Body;
-
-  case BodyKind::Synthesize:
-  case BodyKind::Unparsed:
-    return None;
-  }
-}
-
-void ParseAbstractFunctionBodyRequest::cacheResult(BraceStmt *value) const {
-  using BodyKind = AbstractFunctionDecl::BodyKind;
-  auto afd = std::get<0>(getStorage());
-  switch (afd->getBodyKind()) {
-  case BodyKind::Deserialized:
-  case BodyKind::MemberwiseInitializer:
-  case BodyKind::None:
-  case BodyKind::Skipped:
-    // The body is always empty, so don't cache anything.
-    assert(value == nullptr);
-    return;
-
-  case BodyKind::Parsed:
-  case BodyKind::TypeChecked:
-    afd->Body = value;
-    return;
-
-  case BodyKind::Synthesize:
-  case BodyKind::Unparsed:
-    llvm_unreachable("evaluate() did not set the body kind");
-    return;
-  }
-
-}

branches/master-rebranch/lib/AST/UnqualifiedLookup.cpp

@@ -663,7 +663,7 @@ void UnqualifiedLookupFactory::lookupNamesIntroducedByFunctionDecl(
   const bool isCascadingUse =
       AFD->isCascadingContextForLookup(false) &&
       (isCascadingUseArg.getValueOr(
-          Loc.isInvalid() || AFD->getBodySourceRange().isInvalid() ||
+          Loc.isInvalid() || !AFD->getBody() ||
           !SM.rangeContainsTokenLoc(AFD->getBodySourceRange(), Loc)));
 
   if (AFD->getDeclContext()->isTypeContext())
@@ -814,9 +814,7 @@ void UnqualifiedLookupFactory::lookForLocalVariablesIn(
   // FIXME: when we can parse and typecheck the function body partially
   // for code completion, AFD->getBody() check can be removed.
 
-  if (Loc.isInvalid() || AFD->getBodySourceRange().isInvalid() ||
-      !SM.rangeContainsTokenLoc(AFD->getBodySourceRange(), Loc) ||
-      !AFD->getBody()) {
+  if (Loc.isInvalid() || !AFD->getBody()) {
     return;
   }
 

branches/master-rebranch/lib/Frontend/Frontend.cpp

@@ -315,9 +315,12 @@ void CompilerInstance::setUpDiagnosticOptions() {
 
 bool CompilerInstance::setUpModuleLoaders() {
   if (hasSourceImport()) {
+    bool immediate = FrontendOptions::isActionImmediate(
+        Invocation.getFrontendOptions().RequestedAction);
     bool enableLibraryEvolution =
       Invocation.getFrontendOptions().EnableLibraryEvolution;
     Context->addModuleLoader(SourceLoader::create(*Context,
+                                                  !immediate,
                                                   enableLibraryEvolution,
                                                   getDependencyTracker()));
   }

branches/master-rebranch/lib/FrontendTool/FrontendTool.cpp

@@ -241,15 +241,12 @@ template <> struct ObjectTraits<LoadedModuleTraceFormat> {
 static bool emitLoadedModuleTraceIfNeeded(ModuleDecl *mainModule,
                                           DependencyTracker *depTracker,
                                           StringRef loadedModuleTracePath) {
-  ASTContext &ctxt = mainModule->getASTContext();
-  assert(!ctxt.hadError()
-         && "We may not be able to emit a proper trace if there was an error.");
-
   if (loadedModuleTracePath.empty())
     return false;
   std::error_code EC;
   llvm::raw_fd_ostream out(loadedModuleTracePath, EC, llvm::sys::fs::F_Append);
 
+  ASTContext &ctxt = mainModule->getASTContext();
   if (out.has_error() || EC) {
     ctxt.Diags.diagnose(SourceLoc(), diag::error_opening_output,
                         loadedModuleTracePath, EC.message());
@@ -274,9 +271,7 @@ static bool emitLoadedModuleTraceIfNeeded(ModuleDecl *mainModule,
     if (loadedDecl == mainModule)
       continue;
     assert(!loadedDecl->getModuleFilename().empty()
-           && ("Don't know how to handle modules with empty names."
-               " One potential reason for getting an empty module name might"
-               " be that the module could not be deserialized correctly."));
+           && "Don't know how to handle modules with empty names.");
     pathToModuleDecl.insert(
       std::make_pair(loadedDecl->getModuleFilename(), loadedDecl));
   }
@@ -1094,15 +1089,15 @@ static bool performCompile(CompilerInstance &Instance,
 
   emitReferenceDependenciesForAllPrimaryInputsIfNeeded(Invocation, Instance);
 
+  (void)emitLoadedModuleTraceForAllPrimariesIfNeeded(
+      Instance.getMainModule(), Instance.getDependencyTracker(), opts);
+
   if (Context.hadError()) {
     //  Emit the index store data even if there were compiler errors.
     (void)emitIndexData(Invocation, Instance);
     return true;
   }
 
-  (void)emitLoadedModuleTraceForAllPrimariesIfNeeded(
-      Instance.getMainModule(), Instance.getDependencyTracker(), opts);
-
   // FIXME: This is still a lousy approximation of whether the module file will
   // be externally consumed.
   bool moduleIsPublic =