---

yaml
---
r: 346055
b: refs/heads/master
c: 90a4fe1
h: refs/heads/master
i:
  346053: 7f85705
  346051: 7cc70cd
  346047: 5e38dee

Author: swift-ci

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 3dcf8251b8b62b674dae2585fc5bb0ac6e91a2ee
+refs/heads/master: 90a4fe129b2de7d36eacbf7cb62fa2236dbc7134
 refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/stdlib/public/core/StringStorage.swift

@@ -132,8 +132,10 @@ extension _AbstractStringStorage {
           return _nativeIsEqual(_unsafeUncheckedDowncast(other, to: _StringStorage.self))
         case .shared:
           return _nativeIsEqual(_unsafeUncheckedDowncast(other, to: _SharedStringStorage.self))
+#if !(arch(i386) || arch(arm))
         case .tagged:
           fallthrough
+#endif
         case .cocoa:
           //we're allowed to crash, but for compatibility reasons NSCFString allows non-strings here
           if _isNSString(other) != 1 {
@@ -188,7 +190,7 @@ final internal class _StringStorage: __SwiftNativeNSString, _AbstractStringStora
 
   internal var _reserved: UInt16
 
-  override internal var count: Int {
+  internal var count: Int {
     @inline(__always) get { return _count }
     @inline(__always) set { _count = newValue }
   }