Skip to content

NSNumber already preserves whether a value was originally boolean. #4386

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
Aug 19, 2016
Merged

NSNumber already preserves whether a value was originally boolean. #4386

merged 1 commit into from
Aug 19, 2016

Conversation

jrose-apple
Copy link
Contributor

  • Explanation: In preview 6 we introduced a type called _SwiftTypePreservingNSNumber, which remembered whether a bridged primitive number value was originally an Int or a Double. (NSNumber itself does not preserve this information quite well enough for us; it only records the original C type, which does not distinguish between Int/Int64, CGFloat/Double, or Bool/Int8.) We applied this to all types bridged to NSNumber, which included Bool. However, this broke code that relied on NSNumber boolean values being one of the two singleton values of the CFBoolean type, or code that checked the CF type ID for a wrapped boolean value. Rather than try to fake that in _SwiftTypePreservingNSNumber, we can just trust that NSNumber will always preserve enough information about booleans for us to not mix them up with small integers.
  • Scope: Affects NSNumbers that were created from booleans, and any Bool values bridged to Objective-C.
  • Issue: SR-2381 and rdar://problem/27894308.
  • Reviewed by: @DougGregor
  • Risk: Medium-low. This mostly just puts us closer to the behavior in previous betas, but it will treat boolean NSNumbers coming from Objective-C slightly differently.
  • Testing: Changed existing regression tests, verified that the test case in SR-2381 matches the pre-preview-6 behavior.

Before merging this pull request to apple/swift repository:

  • Test pull request on Swift continuous integration.

Triggering Swift CI

The swift-ci is triggered by writing a comment on this PR addressed to the GitHub user @swift-ci. Different tests will run depending on the specific comment that you use. The currently available comments are:

Smoke Testing

Platform Comment
All supported platforms @swift-ci Please smoke test
All supported platforms @swift-ci Please smoke test and merge
OS X platform @swift-ci Please smoke test OS X platform
Linux platform @swift-ci Please smoke test Linux platform

A smoke test on macOS does the following:

  1. Builds the compiler incrementally.
  2. Builds the standard library only for macOS. Simulator standard libraries and
    device standard libraries are not built.
  3. lldb is not built.
  4. The test and validation-test targets are run only for macOS. The optimized
    version of these tests are not run.

A smoke test on Linux does the following:

  1. Builds the compiler incrementally.
  2. Builds the standard library incrementally.
  3. lldb is built incrementally.
  4. The swift test and validation-test targets are run. The optimized version of these
    tests are not run.
  5. lldb is tested.

Validation Testing

Platform Comment
All supported platforms @swift-ci Please test
All supported platforms @swift-ci Please test and merge
OS X platform @swift-ci Please test OS X platform
OS X platform @swift-ci Please benchmark
Linux platform @swift-ci Please test Linux platform

Lint Testing

Language Comment
Python @swift-ci Please Python lint

Note: Only members of the Apple organization can trigger swift-ci.

@jrose-apple
NSNumber already preserves whether a value was originally boolean. (s…
54d01f2 
…wiftlang#4366)

Use that instead of rolling it up in _SwiftTypePreservingNSNumber so that we
get the right behavior when we go to write plists.

https://bugs.swift.org/browse/SR-2381
(cherry picked from commit ba3de9e)
@jrose-apple jrose-apple added this to the Swift 3.0 milestone Aug 18, 2016
@jrose-apple
Copy link
Contributor Author

@swift-ci Please test macOS

@tkremenek tkremenek self-assigned this Aug 19, 2016
@swift-ci
Copy link
Contributor

Build failed
Jenkins build - Swift Test OS X Platform
Git Commit - 54d01f2
Test requested by - @jrose-apple

@jrose-apple
Copy link
Contributor Author

Compiler error is unrelated in SwiftPM, but I think it does mean the tests didn't run.

@jrose-apple
Copy link
Contributor Author

@swift-ci Please test OS X platform

@tkremenek tkremenek merged commit a454607 into swiftlang:swift-3.0-branch Aug 19, 2016
@jrose-apple jrose-apple deleted the swift-3-CFBoolean branch August 19, 2016 16:27
@belkadan belkadan mentioned this pull request Aug 19, 2016
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@tkremenek tkremenek

Labels
None yet
Projects
None yet
Milestone
Swift 3.0
Development

Successfully merging this pull request may close these issues.
3 participants
@jrose-apple @swift-ci @tkremenek