Skip to content

Synchronize Data.swift from the overlay #1283

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.

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

Merged

Conversation

phausler
Copy link
Contributor

This pulls in the fixes for:
Guard Data access to NSData._isCompact under availability guards
Ensure that hashing data with zero bytes avoids empty allocations and fix bridged empty data hashes from de-referencing null values (#12509)
Data slice mutation support (#11939)

@phausler phausler requested a review from parkera October 24, 2017 19:39
@phausler
Copy link
Contributor Author

@swift-ci please test

@ianpartridge
Copy link
Contributor

Foundation/Data.swift:1645:9: error: use of unresolved identifier '_withStackOrHeapBuffer'
        _withStackOrHeapBuffer(hashRange.count + 1) { buffer in
        ^~~~~~~~~~~~~~~~~~~~~~
Foundation/Data.swift:32:12: error: value of type 'NSData' has no member '_isCompact'
    return data._isCompact()
           ^~~~ ~~~~~~~~~~
Foundation/Data.swift:1496:9: error: use of unresolved identifier '_withStackOrHeapBuffer'
        _withStackOrHeapBuffer(estimatedCount) { allocation in
        ^~~~~~~~~~~~~~~~~~~~~~
Foundation/Data.swift:1579:9: error: use of unresolved identifier '_withStackOrHeapBuffer'
        _withStackOrHeapBuffer(totalCount) { conditionalBuffer in
        ^~~~~~~~~~~~~~~~~~~~~~

@phausler
Copy link
Contributor Author

I guess it is missing the helper func: will add it to this later today

@parkera
Copy link
Contributor

parkera commented Oct 30, 2017

@phausler Let's get this one in

@phausler phausler force-pushed the swift-4.0-branch-data_sync branch from 6332fef to db9048c Compare October 31, 2017 20:36
@phausler
Copy link
Contributor Author

@swift-ci please test and merge

1 similar comment
@shahmishal
Copy link
Member

@swift-ci please test and merge

@shahmishal
Copy link
Member

Foundation/Data.swift:32:12: error: value of type 'NSData' has no member '_isCompact'
    return data._isCompact()
           ^~~~ ~~~~~~~~~~
Foundation/HTTPCookie.swift:252:74: warning: 'characters' is deprecated: Please use String or Substring directly
            secureString = properties[.secure] as? String, !secureString.characters.isEmpty

This pulls in the fixes for:
Guard Data access to NSData._isCompact under availability guards
Ensure that hashing data with zero bytes avoids empty allocations and fix bridged empty data hashes from de-referencing null values (#12509)
Data slice mutation support (#11939)
@phausler phausler force-pushed the swift-4.0-branch-data_sync branch from db9048c to e8854b5 Compare October 31, 2017 23:06
@phausler
Copy link
Contributor Author

@swift-ci please test and merge

1 similar comment
@shahmishal
Copy link
Member

@swift-ci please test and merge

@swift-ci swift-ci merged commit 1b180e7 into swiftlang:swift-4.0-branch Nov 1, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants