Skip to content

[stdlib] Adjust _assertionFailed signature for naming guidelines #6388

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 2 commits into from
Dec 20, 2016
Merged

[stdlib] Adjust _assertionFailed signature for naming guidelines #6388

merged 2 commits into from
Dec 20, 2016

Conversation

airspeedswift
Copy link
Member

@airspeedswift airspeedswift commented Dec 19, 2016 •
edited
Loading

Just internal changes, no externally-facing API changes. Fixes ABI FIXMEs #18, 19 and 20

@airspeedswift
Copy link
Member Author

@swift-ci Please smoke test

@airspeedswift airspeedswift changed the title Adjust _assertionFailed signature for naming guidelines [stdlib] Adjust _assertionFailed signature for naming guidelines Dec 19, 2016
slavapestov
slavapestov reviewed Dec 19, 2016
View reviewed changes
stdlib/public/core/AssertCommon.swift
@@ -112,10 +111,10 @@ func _assertionFailed(
@_versioned
@inline(never)
@_semantics("stdlib_binary_only")
func _assertionFailed(
func _assertionFailure(
// FIXME(ABI)#19 : add argument labels to conform to API guidelines.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This fixme should be removed too right?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, yes, thanks!

@gottesmm
Copy link
Contributor

You should double check that there are no optimizer dependencies on this name. I think we got rid of them all, but it wouldn't hurt to check.

@airspeedswift
Copy link
Member Author

@gottesmm I did a grep for _assertionFail across the swift repo when I did it and these are the only occurrences, is that enough or might there be some hidden gotcha?

@gottesmm
Copy link
Contributor

The mangled name is what you would need to look for.

@jrose-apple
Copy link
Contributor

The regular name will always be in the mangled name in the old mangling, so I think we're okay. (And going forward, we should not pattern-match mangled names in the optimizer. We can use @_semantics for that.)

@shahmishal
Copy link
Member

Testing PR job change: (Please ignore this trigger)
@swift-ci Please smoke test

@airspeedswift airspeedswift merged commit 11e8a1f into swiftlang:master Dec 20, 2016
@airspeedswift airspeedswift deleted the _assertFailure-labels branch December 20, 2016 16:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@slavapestov slavapestov slavapestov left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@airspeedswift @gottesmm @jrose-apple @shahmishal @slavapestov