Merge pull request swiftlang#5784 from slavapestov/fix-resilience-eager-bridging

erg · web-flow · commit 8ee7e7b53285 · 2016-11-15T14:03:34.000-08:00
stdlib: Fix resilient build
diff --git a/stdlib/public/core/HashedCollections.swift.gyb b/stdlib/public/core/HashedCollections.swift.gyb
@@ -2830,6 +2830,7 @@ final internal class _HashableTypedNative${Self}Storage<${TypeParametersDecl}> :
 /// with _SwiftDeferredNS${Self}. What functionality actually relies on
 /// Hashable can be found in an extension.
 @_versioned
+@_fixed_layout
 internal struct _Native${Self}Buffer<${TypeParameters}> {
 
   internal typealias RawStorage = _RawNative${Self}Storage
@@ -3883,6 +3884,8 @@ internal struct _Cocoa${Self}Buffer : _HashBuffer {
   }
 }
 #else
+@_versioned
+@_fixed_layout
 internal struct _Cocoa${Self}Buffer {}
 #endif
 

Original file line number	Diff line number	Diff line change
`@@ -2830,6 +2830,7 @@ final internal class _HashableTypedNative${Self}Storage<${TypeParametersDecl}> :`
`2830`	`2830`	`/// with _SwiftDeferredNS${Self}. What functionality actually relies on`
`2831`	`2831`	`/// Hashable can be found in an extension.`
`2832`	`2832`	`@_versioned`
	`2833`	`+@_fixed_layout`
`2833`	`2834`	`internal struct _Native${Self}Buffer<${TypeParameters}> {`
`2834`	`2835`
`2835`	`2836`	`internal typealias RawStorage = _RawNative${Self}Storage`
`@@ -3883,6 +3884,8 @@ internal struct _Cocoa${Self}Buffer : _HashBuffer {`
`3883`	`3884`	`}`
`3884`	`3885`	`}`
`3885`	`3886`	`#else`
	`3887`	`+@_versioned`
	`3888`	`+@_fixed_layout`
`3886`	`3889`	`internal struct _Cocoa${Self}Buffer {}`
`3887`	`3890`	`#endif`
`3888`	`3891`