Skip to content

Replace uses of @_silgen_name with uses of a shims header. #192

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
merged 1 commit into from
Feb 22, 2018

Conversation

jrose-apple
Copy link
Contributor

Said shims header is in the main Swift repo because it's shared with the Darwin Dispatch overlay. This is the same effort as swiftlang/swift#5854, but for corelibs.

No intended functionality change.

@jrose-apple
Copy link
Contributor Author

swiftlang/swift#6033

@swift-ci Please test

@jrose-apple jrose-apple force-pushed the excise-silgen_name-once-more branch from cd8f4ff to 4dc1f0b Compare December 2, 2016 21:41
@jrose-apple
Copy link
Contributor Author

swiftlang/swift#6033

@swift-ci Please test

1 similar comment
@jrose-apple
Copy link
Contributor Author

swiftlang/swift#6033

@swift-ci Please test

@jrose-apple
Copy link
Contributor Author

TestFoundation: src/common/knote.c:155: knote_disable: Assertion `!(kn->kev.flags & 0x0008)' failed.

@phausler, @dgrove-oss, have you seen this before?

@phausler
Copy link

phausler commented Dec 2, 2016

nope, have not seen that particular failure before. Looks like a failure inside of the kqueue implementation

@dgrove-oss
Copy link
Contributor

The knote assertion showed up in some of the CI tests of #162. I believe @MadCoder decided it was not blocking and merged anyways. I think it is extremely unlikely that this PR could be the cause of the kqueue assertion.

@jrose-apple
Copy link
Contributor Author

The Dispatch tests did pass anyway.

@dgrove-oss
Copy link
Contributor

@jrose-apple I assume we still want to get this PR merged. Do you want me to pick it up and resolve the conflicts (plus another conflict I'm about to add with #198) or do you have time to resolve them yourself?

@jrose-apple
Copy link
Contributor Author

You're welcome to pick them up if you want. They're not urgent, just general cleanup as we try to get away from the awfulness of matching up unrelated declarations.

@dgrove-oss
Copy link
Contributor

The dispatch conflicts were easy to resolve, but we need to get swiftlang/swift#6033 merged before we can merge this one (otherwise it won't build). Since it seems like a low priority thing, I'm dropping it for now.

@jrose-apple jrose-apple force-pushed the excise-silgen_name-once-more branch from 4dc1f0b to 42588f5 Compare February 8, 2018 02:56
@jrose-apple
Copy link
Contributor Author

Picked this up again, because why not finish it off.

swiftlang/swift#6033
@swift-ci Please test

@jrose-apple
Copy link
Contributor Author

Oops, this probably isn't correct because I forgot to remove SWIFT_CC from things.

@jrose-apple jrose-apple force-pushed the excise-silgen_name-once-more branch from 42588f5 to dd953ed Compare February 8, 2018 16:43
@jrose-apple
Copy link
Contributor Author

swiftlang/swift#6033

@swift-ci Please test

@jrose-apple
Copy link
Contributor Author

swiftlang/swift#6033

@swift-ci Please test

Copy link
Contributor

@dgrove-oss dgrove-oss left a comment

Choose a reason for hiding this comment

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

LGTM

Nice to simplify the code and get rid of the duplication

@jrose-apple
Copy link
Contributor Author

Hm, swift-ci…

swiftlang/swift#6033
@swift-ci Please test

The header is in the main Swift repo because it's shared with the
Darwin Dispatch overlay.

No intended functionality change.
@jrose-apple jrose-apple force-pushed the excise-silgen_name-once-more branch from dd953ed to d7c4fc7 Compare February 8, 2018 19:44
@jrose-apple
Copy link
Contributor Author

swiftlang/swift#6033
@swift-ci Please test

1 similar comment
@jrose-apple
Copy link
Contributor Author

swiftlang/swift#6033
@swift-ci Please test

@jrose-apple
Copy link
Contributor Author

swiftlang/swift#6033
@swift-ci Please test

@jrose-apple
Copy link
Contributor Author

swiftlang/swift#6033
@swift-ci Please test

1 similar comment
@jrose-apple
Copy link
Contributor Author

swiftlang/swift#6033
@swift-ci Please test

@jrose-apple
Copy link
Contributor Author

Okay, I'll try doing it the other way around.

@jrose-apple
Copy link
Contributor Author

Passed here: swiftlang/swift#6033 (comment)

@jrose-apple jrose-apple requested a review from MadCoder February 22, 2018 17:10
@MadCoder MadCoder merged commit 9c792ac into swiftlang:master Feb 22, 2018
@jrose-apple jrose-apple deleted the excise-silgen_name-once-more branch February 22, 2018 17:30
ktopley-apple pushed a commit that referenced this pull request Dec 6, 2018
Replace uses of @_silgen_name with uses of a shims header.

Signed-off-by: Daniel A. Steffen <dsteffen@apple.com>
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.

7 participants