---

yaml
---
r: 345334
b: refs/heads/master
c: 2bbf2c5
h: refs/heads/master

Author: swift-ci

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: c2f9ba7c271d5ea4a7a0f1e7c71ad7a80bc42f12
+refs/heads/master: 2bbf2c5f272e03265d84fb02f61fda7cf42f0bcf
 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/DiagnosticsModuleDiffer.def

@@ -72,6 +72,8 @@ ERROR(super_class_removed,none,"%0 has removed its super class %1", (StringRef,
 
 ERROR(super_class_changed,none,"%0 has changed its super class from %1 to %2", (StringRef, StringRef, StringRef))
 
+ERROR(nominal_type_kind_changed,none,"%0 has been changed to a %1", (StringRef, StringRef))
+
 #ifndef DIAG_NO_UNDEF
 # if defined(DIAG)
 #  undef DIAG

trunk/include/swift/Runtime/Metadata.h

@@ -580,13 +580,39 @@ void swift_initStructMetadata(StructMetadata *self,
 ///
 /// This function is only intended to be called from the relocation function
 /// of a resilient class pattern.
+///
+/// The metadata completion function must complete the metadata by calling
+/// swift_initClassMetadata().
 SWIFT_RUNTIME_EXPORT
 ClassMetadata *
 swift_relocateClassMetadata(ClassDescriptor *descriptor,
                             ResilientClassMetadataPattern *pattern);
 
-/// Initialize the field offset vector for a dependent-layout class, using the
-/// "Universal" layout strategy.
+/// Initialize various fields of the class metadata.
+///
+/// Namely:
+/// - The superclass field is set to \p super.
+/// - If the class metadata was allocated at runtime, copies the
+///   vtable entries from the superclass and installs the class's
+///   own vtable entries and overrides of superclass vtable entries.
+/// - Copies the field offsets and generic parameters and conformances
+///   from the superclass.
+/// - Initializes the field offsets using the runtime type layouts
+///   passed in \p fieldTypes.
+///
+/// This initialization pattern in the following cases:
+/// - The class has generic ancestry, or resiliently-sized fields.
+///   In this case the metadata was emitted statically but is incomplete,
+///   because, the superclass field, generic parameters and conformances,
+///   and field offset vector entries require runtime completion.
+///
+/// - The class is not generic, and has resilient ancestry.
+///   In this case the class metadata was allocated from a resilient
+///   class metadata pattern by swift_relocateClassMetadata().
+///
+/// - The class is generic.
+///   In this case the class metadata was allocated from a generic
+///   class metadata pattern by swift_allocateGenericClassMetadata().
 SWIFT_RUNTIME_EXPORT
 void swift_initClassMetadata(ClassMetadata *self,
                              ClassMetadata *super,
@@ -595,6 +621,24 @@ void swift_initClassMetadata(ClassMetadata *self,
                              const TypeLayout * const *fieldTypes,
                              size_t *fieldOffsets);
 
+#if SWIFT_OBJC_INTEROP
+/// Initialize various fields of the class metadata.
+///
+/// This is a special function only used to re-initialize metadata of
+/// classes that are visible to Objective-C and have resilient fields.
+///
+/// This means the class does not have generic or resilient ancestry,
+/// and is itself not generic. However, it might have fields whose
+/// size is not known at compile time.
+SWIFT_RUNTIME_EXPORT
+void swift_updateClassMetadata(ClassMetadata *self,
+                               ClassMetadata *super,
+                               ClassLayoutFlags flags,
+                               size_t numFields,
+                               const TypeLayout * const *fieldTypes,
+                               size_t *fieldOffsets);
+#endif
+
 /// Given class metadata, a class descriptor and a method descriptor, look up
 /// and load the vtable entry from the given metadata. The metadata must be of
 /// the same class or a subclass of the descriptor.

trunk/include/swift/Runtime/RuntimeFunctions.def

@@ -773,6 +773,21 @@ FUNCTION(InitClassMetadata,
               SizeTy->getPointerTo()),
          ATTRS(NoUnwind))
 
+// struct FieldInfo { size_t Size; size_t AlignMask; };
+// void swift_updateClassMetadata(Metadata *self,
+//                                Metadata *super,
+//                                ClassLayoutFlags flags,
+//                                size_t numFields,
+//                                TypeLayout * const *fieldTypes,
+//                                size_t *fieldOffsets);
+FUNCTION(UpdateClassMetadata,
+         swift_updateClassMetadata, C_CC,
+         RETURNS(VoidTy),
+         ARGS(TypeMetadataPtrTy, TypeMetadataPtrTy, SizeTy, SizeTy,
+              Int8PtrPtrTy->getPointerTo(),
+              SizeTy->getPointerTo()),
+         ATTRS(NoUnwind))
+
 // void *swift_lookUpClassMethod(Metadata *metadata,
 //                               ClassDescriptor *description,
 //                               MethodDescriptor *method);