Fix NSNumber.objCType crashes, make it returns same values with darwin platform version
#1025
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Expected results are sampled from macOS
fixes SR-4907
…sing `_Factory` protocol
…SNumber` is Boolean
…edicate.test_NSCoding()`
…itectures - Results of `NSNumber.objCType.pointee` depends on architecture if `NSNumber` is initialized with `Int` or `UInt` - When `NSNumber` is initialized with 64-bit integer, The value of `NSNumber.objCType.pointee` switches from 'q' to 'Q' with `Int64.max` as the boundary.
|
Reflected differences of |
|
@swift-ci please test |
phausler
requested changes
Jun 23, 2017
| @@ -78,7 +78,7 @@ internal class __NSCFBoolean : NSNumber { | |||
| override var objCType: UnsafePointer<Int8> { | |||
| // This must never be fixed to be "B", although that would | |||
| // cause correct old-style archiving when this is unarchived. | |||
| return UnsafePointer<Int8>(bitPattern: UInt(_NSSimpleObjCType.Char.rawValue.value))! | |||
| return String(_NSSimpleObjCType.Char.rawValue)._bridgeToObjectiveC().utf8String! | |||
There was a problem hiding this comment.
this is going to cause leaks, can we have a static allocation somewhere stashed with the type to cstrings?
|
|
||
| extension _Factory { | ||
| init(factory: () -> Self) { | ||
| self = factory() |
There was a problem hiding this comment.
hmm this is rather strange, if this works perhaps we should investigate using this pattern further
There was a problem hiding this comment.
ok, just prototyped a test for this... wow! this will solve a ton of issues with swift-corelibs-foundation!
There was a problem hiding this comment.
| @@ -154,3 +154,14 @@ open class NSValue : NSObject, NSCopying, NSSecureCoding, NSCoding { | |||
| } | |||
| } | |||
|
|
|||
| extension NSValue : _Factory {} | |||
|
|
|||
| protocol _Factory { | |||
There was a problem hiding this comment.
just for maintainability; can we annotate this as internal?
|
Superseded by #1093 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes SR-4907
TestNSNumber.test_objCType()reproducing crashExpected results are sampled from macOS
objCTypeproperty ofNSNumberChange
NSNumber.objCTypeto returning same values with darwin platform versionNSNumber.objCTypeto returning same values with darwinNSNumber.init(value: Bool)to returning__NSCFBooleanby using_FactoryprotocolSince
NSNumber.objCTypereturnscwith both ofBoolandInt8on darwin platform,NSNumber.init(value: Bool)is changed to returns__NSCFBooleanby using_Factoryprotocol, and it changed to use_cfTypeIDto distinguish between Bool and Int8.JSONSerializationto use_cfTypeIDfor checking whetherNSNumberis Boolean or notNSNumber.compare(_:)to useobjCTypeTestNumber.allTestsNSKeyedUnarchiver.decodeBool(forKey:)and add test toTestNSPredicate.test_NSCoding()