---

yaml
---
r: 341701
b: refs/heads/rxwei-patch-1
c: 8117849
h: refs/heads/master
i:
  341699: f26fd4e

Author: DougGregor

[refs]

@@ -1015,7 +1015,7 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2018-08-18-a: b10b1fce14385faa6d44f6b933e95
 refs/heads/rdar-43033749-fix-batch-mode-no-diags-swift-5.0-branch: a14e64eaad30de89f0f5f0b2a782eed7ecdcb255
 refs/heads/revert-19006-error-bridging-integer-type: 8a9065a3696535305ea53fe9b71f91cbe6702019
 refs/heads/revert-19050-revert-19006-error-bridging-integer-type: ecf752d54b05dd0a20f510f0bfa54a3fec3bcaca
-refs/heads/rxwei-patch-1: 015b7c52660e4d0513e4679dc272ddbe9a1f319f
+refs/heads/rxwei-patch-1: 8117849d46c35034cb3732aa1bd2f86b88e166e3
 refs/heads/shahmishal-patch-1: e58ec0f7488258d42bef51bc3e6d7b3dc74d7b2a
 refs/heads/typelist-existential: 4046359efd541fb5c72d69a92eefc0a784df8f5e
 refs/tags/swift-4.2-DEVELOPMENT-SNAPSHOT-2018-08-20-a: 4319ba09e4fb8650ee86061075c74a016b6baab9

branches/rxwei-patch-1/include/swift/AST/Decl.h

@@ -5615,7 +5615,7 @@ class AbstractFunctionDecl : public GenericContext, public ValueDecl {
   }
 
   struct BodySynthesizer {
-    void (* Fn)(AbstractFunctionDecl *, void *);
+    std::pair<BraceStmt *, bool> (* Fn)(AbstractFunctionDecl *, void *);
     void *Context;
   };
 
@@ -5748,18 +5748,8 @@ class AbstractFunctionDecl : public GenericContext, public ValueDecl {
   /// have a body for this function.
   ///
   /// \sa hasBody()
-  BraceStmt *getBody(bool canSynthesize = true) const {
-    if (canSynthesize && getBodyKind() == BodyKind::Synthesize) {
-      const_cast<AbstractFunctionDecl *>(this)->setBodyKind(BodyKind::None);
-      (Synthesizer.Fn)(const_cast<AbstractFunctionDecl *>(this),
-                       Synthesizer.Context);
-    }
-    if (getBodyKind() == BodyKind::Parsed ||
-        getBodyKind() == BodyKind::TypeChecked) {
-      return Body;
-    }
-    return nullptr;
-  }
+  BraceStmt *getBody(bool canSynthesize = true) const;
+
   void setBody(BraceStmt *S, BodyKind NewBodyKind = BodyKind::Parsed) {
     assert(getBodyKind() != BodyKind::Skipped &&
            "cannot set a body if it was skipped");
@@ -5784,8 +5774,12 @@ class AbstractFunctionDecl : public GenericContext, public ValueDecl {
   }
 
   /// Note that parsing for the body was delayed.
-  void setBodySynthesizer(void (* fn)(AbstractFunctionDecl *, void *),
-                         void *context = nullptr) {
+  ///
+  /// The function should return the body statement and a flag indicating
+  /// whether that body is already type-checked.
+  void setBodySynthesizer(
+      std::pair<BraceStmt *, bool> (* fn)(AbstractFunctionDecl *, void *),
+      void *context = nullptr) {
     assert(getBodyKind() == BodyKind::None);
     Synthesizer = {fn, context};
     setBodyKind(BodyKind::Synthesize);

branches/rxwei-patch-1/lib/AST/Decl.cpp

@@ -6236,6 +6236,40 @@ bool AbstractFunctionDecl::argumentNameIsAPIByDefault() const {
   return false;
 }
 
+BraceStmt *AbstractFunctionDecl::getBody(bool canSynthesize) const {
+  switch (getBodyKind()) {
+  case BodyKind::Deserialized:
+  case BodyKind::MemberwiseInitializer:
+  case BodyKind::None:
+  case BodyKind::Skipped:
+    return nullptr;
+
+  case BodyKind::Parsed:
+  case BodyKind::TypeChecked:
+    return Body;
+
+  case BodyKind::Unparsed:
+    // FIXME: Go parse now!
+    return 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 {
   switch (getBodyKind()) {
   case BodyKind::None:

branches/rxwei-patch-1/lib/ClangImporter/ImportDecl.cpp

@@ -536,8 +536,7 @@ makeEnumRawValueConstructor(ClangImporter::Implementation &Impl,
   auto body = BraceStmt::create(C, SourceLoc(), {assign, ret}, SourceLoc(),
                                 /*implicit*/ true);
 
-  ctorDecl->setBody(body);
-  ctorDecl->setBodyTypeCheckedIfPresent();
+  ctorDecl->setBody(body, AbstractFunctionDecl::BodyKind::TypeChecked);
 
   return ctorDecl;
 }
@@ -612,8 +611,7 @@ static AccessorDecl *makeEnumRawValueGetter(ClangImporter::Implementation &Impl,
   auto body = BraceStmt::create(C, SourceLoc(), ASTNode(ret), SourceLoc(),
                                 /*implicit*/ true);
 
-  getterDecl->setBody(body);
-  getterDecl->setBodyTypeCheckedIfPresent();
+  getterDecl->setBody(body, AbstractFunctionDecl::BodyKind::TypeChecked);
 
   return getterDecl;
 }
@@ -689,8 +687,7 @@ static AccessorDecl *makeStructRawValueGetter(
   auto body = BraceStmt::create(C, SourceLoc(), ASTNode(ret), SourceLoc(),
                                 /*implicit*/ true);
 
-  getterDecl->setBody(body);
-  getterDecl->setBodyTypeCheckedIfPresent();
+  getterDecl->setBody(body, AbstractFunctionDecl::BodyKind::TypeChecked);
 
   return getterDecl;
 }
@@ -848,8 +845,7 @@ makeIndirectFieldAccessors(ClangImporter::Implementation &Impl,
     auto ret = new (C) ReturnStmt(SourceLoc(), expr);
     auto body = BraceStmt::create(C, SourceLoc(), ASTNode(ret), SourceLoc(),
                                   /*implicit*/ true);
-    getterDecl->setBody(body);
-    getterDecl->setBodyTypeCheckedIfPresent();
+    getterDecl->setBody(body, AbstractFunctionDecl::BodyKind::TypeChecked);
     getterDecl->getAttrs().add(new (C) TransparentAttr(/*implicit*/ true));
   }
 
@@ -879,8 +875,7 @@ makeIndirectFieldAccessors(ClangImporter::Implementation &Impl,
 
     auto body = BraceStmt::create(C, SourceLoc(), { assign }, SourceLoc(),
                                   /*implicit*/ true);
-    setterDecl->setBody(body);
-    setterDecl->setBodyTypeCheckedIfPresent();
+    setterDecl->setBody(body, AbstractFunctionDecl::BodyKind::TypeChecked);
     setterDecl->getAttrs().add(new (C) TransparentAttr(/*implicit*/ true));
   }
 
@@ -956,8 +951,7 @@ makeUnionFieldAccessors(ClangImporter::Implementation &Impl,
     auto ret = new (C) ReturnStmt(SourceLoc(), reinterpreted);
     auto body = BraceStmt::create(C, SourceLoc(), ASTNode(ret), SourceLoc(),
                                   /*implicit*/ true);
-    getterDecl->setBody(body);
-    getterDecl->setBodyTypeCheckedIfPresent();
+    getterDecl->setBody(body, AbstractFunctionDecl::BodyKind::TypeChecked);
     getterDecl->getAttrs().add(new (C) TransparentAttr(/*implicit*/ true));
   }
 
@@ -1017,8 +1011,7 @@ makeUnionFieldAccessors(ClangImporter::Implementation &Impl,
 
     auto body = BraceStmt::create(C, SourceLoc(), { initialize }, SourceLoc(),
                                   /*implicit*/ true);
-    setterDecl->setBody(body);
-    setterDecl->setBodyTypeCheckedIfPresent();
+    setterDecl->setBody(body, AbstractFunctionDecl::BodyKind::TypeChecked);
     setterDecl->getAttrs().add(new (C) TransparentAttr(/*implicit*/ true));
   }
 
@@ -1282,8 +1275,7 @@ createDefaultConstructor(ClangImporter::Implementation &Impl,
   // Create the function body.
   auto body = BraceStmt::create(context, SourceLoc(), {assign, ret},
                                 SourceLoc());
-  constructor->setBody(body);
-  constructor->setBodyTypeCheckedIfPresent();
+  constructor->setBody(body, AbstractFunctionDecl::BodyKind::TypeChecked);
 
   // We're done.
   return constructor;
@@ -1401,8 +1393,7 @@ createValueConstructor(ClangImporter::Implementation &Impl,
 
     // Create the function body.
     auto body = BraceStmt::create(context, SourceLoc(), stmts, SourceLoc());
-    constructor->setBody(body);
-    constructor->setBodyTypeCheckedIfPresent();
+    constructor->setBody(body, AbstractFunctionDecl::BodyKind::TypeChecked);
   }
 
   // We're done.
@@ -1552,8 +1543,7 @@ static ConstructorDecl *createRawValueBridgingConstructor(
     auto ret = new (ctx) ReturnStmt(SourceLoc(), result, /*Implicit=*/true);
 
     auto body = BraceStmt::create(ctx, SourceLoc(), {assign, ret}, SourceLoc());
-    init->setBody(body);
-    init->setBodyTypeCheckedIfPresent();
+    init->setBody(body, AbstractFunctionDecl::BodyKind::TypeChecked);
   }
 
   return init;
@@ -1911,8 +1901,8 @@ static bool addErrorDomain(NominalTypeDecl *swiftDecl,
 
   auto ret = new (C) ReturnStmt(SourceLoc(), domainDeclRef);
   getterDecl->setBody(
-      BraceStmt::create(C, SourceLoc(), {ret}, SourceLoc(), isImplicit));
-  getterDecl->setBodyTypeCheckedIfPresent();
+      BraceStmt::create(C, SourceLoc(), {ret}, SourceLoc(), isImplicit),
+      AbstractFunctionDecl::BodyKind::TypeChecked);
 
   return true;
 }
@@ -8268,8 +8258,8 @@ ClangImporter::Implementation::createConstant(Identifier name, DeclContext *dc,
     // Finally, set the body.
     func->setBody(BraceStmt::create(C, SourceLoc(),
                                     ASTNode(ret),
-                                    SourceLoc()));
-    func->setBodyTypeCheckedIfPresent();
+                                    SourceLoc()),
+                  AbstractFunctionDecl::BodyKind::TypeChecked);
   }
 
   // Mark the function transparent so that we inline it away completely.