Address some comments

Author: Harlan Haskins

lib/AST/ASTVerifier.cpp

@@ -490,9 +490,9 @@ class Verifier : public ASTWalker {
       case AbstractFunctionDecl::BodyKind::TypeChecked:
       case AbstractFunctionDecl::BodyKind::Skipped:
       case AbstractFunctionDecl::BodyKind::MemberwiseInitializer:
+      case AbstractFunctionDecl::BodyKind::Deserialized:
         return true;
 
-      case AbstractFunctionDecl::BodyKind::Deserialized:
       case AbstractFunctionDecl::BodyKind::Unparsed:
       case AbstractFunctionDecl::BodyKind::Parsed:
       case AbstractFunctionDecl::BodyKind::Synthesize:

lib/AST/Decl.cpp

@@ -5421,13 +5421,19 @@ void AbstractFunctionDecl::computeType(AnyFunctionType::ExtInfo info) {
 }
 
 bool AbstractFunctionDecl::hasInlinableBodyText() const {
-  if (getBodyKind() == BodyKind::Deserialized)
+  switch (getBodyKind()) {
+  case BodyKind::Deserialized:
     return true;
-  if (getBodyKind() != BodyKind::Parsed &&
-      getBodyKind() != BodyKind::TypeChecked)
+  case BodyKind::Parsed:
+  case BodyKind::TypeChecked:
+    return getBody() && !getBody()->isImplicit();
+  case BodyKind::None:
+  case BodyKind::Unparsed:
+  case BodyKind::Synthesize:
+  case BodyKind::Skipped:
+  case BodyKind::MemberwiseInitializer:
     return false;
-  auto body = getBody();
-  return body && !body->isImplicit();
+  }
 }
 
 StringRef AbstractFunctionDecl::getInlinableBodyText(

lib/Serialization/Serialization.cpp

@@ -898,8 +898,6 @@ void Serializer::writeBlockInfoBlock() {
                               decls_block::GENERIC_REQUIREMENT);
   BLOCK_RECORD_WITH_NAMESPACE(sil_block,
                               decls_block::LAYOUT_REQUIREMENT);
-  BLOCK_RECORD_WITH_NAMESPACE(sil_block,
-                              decls_block::INLINABLE_BODY_TEXT);
 
   BLOCK(SIL_INDEX_BLOCK);
   BLOCK_RECORD(sil_index_block, SIL_FUNC_NAMES);
@@ -1363,7 +1361,8 @@ void Serializer::writeGenericRequirements(ArrayRef<Requirement> requirements,
   }
 }
 
-void Serializer::writeInlinableBodyText(const AbstractFunctionDecl *AFD) {
+void Serializer::writeInlinableBodyTextIfNeeded(
+  const AbstractFunctionDecl *AFD) {
   using namespace decls_block;
 
   if (AFD->getResilienceExpansion() != swift::ResilienceExpansion::Minimal)
@@ -3250,7 +3249,7 @@ void Serializer::writeDecl(const Decl *D) {
     if (auto errorConvention = fn->getForeignErrorConvention())
       writeForeignErrorConvention(*errorConvention);
 
-    writeInlinableBodyText(fn);
+    writeInlinableBodyTextIfNeeded(fn);
 
     break;
   }
@@ -3309,7 +3308,7 @@ void Serializer::writeDecl(const Decl *D) {
     if (auto errorConvention = fn->getForeignErrorConvention())
       writeForeignErrorConvention(*errorConvention);
 
-    writeInlinableBodyText(fn);
+    writeInlinableBodyTextIfNeeded(fn);
 
     break;
   }
@@ -3464,8 +3463,7 @@ void Serializer::writeDecl(const Decl *D) {
     if (auto errorConvention = ctor->getForeignErrorConvention())
       writeForeignErrorConvention(*errorConvention);
 
-    writeInlinableBodyText(ctor);
-
+    writeInlinableBodyTextIfNeeded(ctor);
     break;
   }
 
@@ -3482,7 +3480,7 @@ void Serializer::writeDecl(const Decl *D) {
                                  dtor->isObjC(),
                                  addGenericEnvironmentRef(
                                                 dtor->getGenericEnvironment()));
-    writeInlinableBodyText(dtor);
+    writeInlinableBodyTextIfNeeded(dtor);
     break;
   }
 

lib/Serialization/Serialization.h

@@ -326,7 +326,7 @@ class Serializer {
 
   /// Writes the body text of the provided funciton, if the function is
   /// inlinable and has body text.
-  void writeInlinableBodyText(const AbstractFunctionDecl *decl);
+  void writeInlinableBodyTextIfNeeded(const AbstractFunctionDecl *decl);
 
   /// Writes a list of protocol conformances.
   void writeConformances(ArrayRef<ProtocolConformanceRef> conformances,

test/ModuleInterface/inlinable-function.swift

@@ -18,6 +18,7 @@ public struct Foo: Hashable {
     set {
       print("I am set to \(newValue)")
     }
+    // CHECK-NEXT: {{^}}  }
   }
 
   // CHECK: public var noAccessors: [[INT]]{{$}}
@@ -31,13 +32,13 @@ public struct Foo: Hashable {
     didSet {
       print("b set to \(hasDidSet)")
     }
-    // CHECK-NEXT: }
+    // CHECK-NEXT: {{^}}  }
   }
 
 
   // CHECK: @_transparent public var transparent: [[INT]] {
-  // CHECK:   return 34
-  // CHECK: }
+  // CHECK-NEXT:   return 34
+  // CHECK-NEXT: }
   @_transparent
   public var transparent: Int {
     return 34
@@ -59,6 +60,7 @@ public struct Foo: Hashable {
     // CHECK:       print("I am set to \(newValue)")
     // CHECK-NOT:   #endif
     // CHECK-NOT:   #endif
+    // CHECK-NEXT: }
     @_transparent
     set {
       #if false
@@ -97,6 +99,7 @@ public struct Foo: Hashable {
       print("I should not appear")
       #endif
     }
+    // CHECK-NEXT: }
   }
 
   // CHECK: @inlinable public func inlinableMethod() {