---

yaml
---
r: 345214
b: refs/heads/master
c: 015f4ba
h: refs/heads/master

Author: swift-ci

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: d99d086b1e09cb668aec12736c9f4c3f18f1fc5a
+refs/heads/master: 015f4ba8cfaf9f5170b6a1d34025887d1d96b25f
 refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/include/swift/AST/Decl.h

@@ -4977,7 +4977,10 @@ class AbstractFunctionDecl : public GenericContext, public ValueDecl {
     TypeChecked,
 
     /// This is a memberwise initializer that will be synthesized by SILGen.
-    MemberwiseInitializer
+    MemberwiseInitializer,
+
+    /// Function body text was deserialized from a .swiftmodule.
+    Deserialized
 
     // This enum currently needs to fit in a 3-bit bitfield.
   };
@@ -4999,6 +5002,9 @@ class AbstractFunctionDecl : public GenericContext, public ValueDecl {
     /// BodyKind::TypeChecked.
     BraceStmt *Body;
 
+    /// This enum member is active if getBodyKind() is BodyKind::Deserialized.
+    StringRef BodyStringRepresentation;
+
     /// This enum member is active if getBodyKind() == BodyKind::Synthesize.
     BodySynthesizer Synthesizer;
 
@@ -5093,6 +5099,11 @@ class AbstractFunctionDecl : public GenericContext, public ValueDecl {
     return getBodyKind() != BodyKind::None;
   }
 
+  /// Returns true if the text of this function's body can be retrieved either
+  /// by extracting the text from the source buffer or reading the inlinable
+  /// body from a deserialized swiftmodule.
+  bool hasInlinableBodyText() const;
+
   /// Returns the function body, if it was parsed, or nullptr otherwise.
   ///
   /// Note that a null return value does not imply that the source code did not
@@ -5156,6 +5167,18 @@ class AbstractFunctionDecl : public GenericContext, public ValueDecl {
       setBodyKind(BodyKind::TypeChecked);
   }
 
+  /// Gets the body of this function, stripping the unused portions of #if
+  /// configs inside the body. If this function was not deserialized from a
+  /// .swiftmodule, this body is reconstructed from the original
+  /// source buffer.
+  StringRef getInlinableBodyText(SmallVectorImpl<char> &scratch) const;
+
+  void setBodyStringRepresentation(StringRef body) {
+    assert(getBodyKind() == BodyKind::None);
+    setBodyKind(BodyKind::Deserialized);
+    BodyStringRepresentation = body;
+  }
+
   bool isBodyTypeChecked() const {
     return getBodyKind() == BodyKind::TypeChecked;
   }

trunk/include/swift/AST/PrintOptions.h

@@ -23,6 +23,7 @@
 #include <vector>
 
 namespace swift {
+class ASTPrinter;
 class GenericEnvironment;
 class CanType;
 class Decl;
@@ -356,10 +357,9 @@ struct PrintOptions {
   QualifyNestedDeclarations ShouldQualifyNestedDeclarations =
       QualifyNestedDeclarations::Never;
 
-  /// \brief If this is not \c nullptr then functions (including accessors and
-  /// constructors) will be printed with a body that is determined by this
-  /// function.
-  std::function<std::string(const ValueDecl *)> FunctionBody;
+  /// \brief If this is not \c nullptr then function bodies (including accessors
+  /// and constructors) will be printed by this function.
+  std::function<void(const ValueDecl *, ASTPrinter &)> FunctionBody;
 
   BracketOptions BracketOptions;
 

trunk/include/swift/SILOptimizer/Utils/Existential.h

@@ -96,8 +96,6 @@ struct ConcreteExistentialInfo {
   ConcreteExistentialInfo(Operand &ArgOperand, CanType ConcreteType,
                           ProtocolDecl *Protocol);
 
-  ConcreteExistentialInfo(ConcreteExistentialInfo &) = delete;
-
   /// For scenerios where ConcreteExistentialInfo is created using a known
   /// ConcreteType and ProtocolDecl, both of InitExistential
   /// and ConcreteValue can be null. So there is no need for explicit check for

trunk/include/swift/Serialization/DeclTypeRecordNodes.def

@@ -180,6 +180,7 @@ OTHER(NORMAL_PROTOCOL_CONFORMANCE_ID, 246)
 OTHER(PROTOCOL_CONFORMANCE_XREF, 247)
 OTHER(MEMBERS, 248)
 OTHER(XREF, 249)
+OTHER(INLINABLE_BODY_TEXT, 250)
 
 #undef RECORD
 #undef DECLTYPERECORDNODES_HAS_RECORD_VAL

trunk/include/swift/Serialization/ModuleFile.h

@@ -884,6 +884,9 @@ class ModuleFile
 
   /// Reads a foreign error conformance from \c DeclTypeCursor, if present.
   Optional<ForeignErrorConvention> maybeReadForeignErrorConvention();
+
+  /// Reads inlinable body text from \c DeclTypeCursor, if present.
+  Optional<StringRef> maybeReadInlinableBodyText();
 };
 
 template <typename T, typename RawData>

trunk/include/swift/Serialization/ModuleFormat.h

@@ -55,7 +55,7 @@ const uint16_t VERSION_MAJOR = 0;
 /// describe what change you made. The content of this comment isn't important;
 /// it just ensures a conflict if two people change the module format.
 /// Don't worry about adhering to the 80-column limit for this line.
-const uint16_t VERSION_MINOR = 443; // Last change: serialize unsubstituted type alias type
+const uint16_t VERSION_MINOR = 444; // Last change: inlinable body text
 
 using DeclIDField = BCFixed<31>;
 
@@ -979,8 +979,11 @@ namespace decls_block {
     BCVBR<5>,     // number of parameter name components
     BCArray<IdentifierIDField> // name components,
                                // followed by TypeID dependencies
-    // Trailed by its generic parameters, if any, followed by the parameter
-    // patterns.
+    // This record is trailed by:
+    // - its generic parameters, if any
+    // - its parameter patterns,
+    // - the foreign error convention, if any
+    // - inlinable body text, if any
   >;
 
   using VarLayout = BCRecordLayout<
@@ -1044,6 +1047,8 @@ namespace decls_block {
     // - its _silgen_name, if any
     // - its generic parameters, if any
     // - body parameter patterns
+    // - the foreign error convention, if any
+    // - inlinable body text, if any
   >;
 
   // TODO: remove the unnecessary FuncDecl components here
@@ -1073,6 +1078,8 @@ namespace decls_block {
     // - its _silgen_name, if any
     // - its generic parameters, if any
     // - body parameter patterns
+    // - the foreign error convention, if any
+    // - inlinable body text, if any
   >;
 
   using PatternBindingLayout = BCRecordLayout<
@@ -1176,6 +1183,12 @@ namespace decls_block {
     BCFixed<1>,  // implicit?
     BCFixed<1>,  // objc?
     GenericEnvironmentIDField // generic environment
+    // This record is trailed by its inlinable body text
+  >;
+
+  using InlinableBodyTextLayout = BCRecordLayout<
+    INLINABLE_BODY_TEXT,
+    BCBlob // body text
   >;
 
   using ParameterListLayout = BCRecordLayout<