Skip to content

[PrintAsObjC] Hack: Assume all option sets have typedefs. #3851

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
Aug 3, 2016

Conversation

jrose-apple
Copy link
Contributor

...because otherwise option sets that get imported as members using NS_SWIFT_NAME are printed with an enum tag, and the definition of NS_OPTIONS only declares the typedef under C++.

We should come back and figure out something more principled for this later, but for now this solves an issue with generated headers imported into C++ translation units.

rdar://problem/27130343


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.

...because otherwise option sets that get imported as members using
NS_SWIFT_NAME are printed with an 'enum' tag, and the definition of
NS_OPTIONS only declares the typedef under C++.

We should come back and figure out something more principled for this
later, but for now this solves an issue with generated headers
imported into C++ translation units.

rdar://problem/27130343
@jrose-apple
Copy link
Contributor Author

@milseman or @DougGregor, mind reviewing this?

@swift-ci Please test OS X platform

@jrose-apple
Copy link
Contributor Author

jrose-apple commented Jul 29, 2016

Jenkins issue. EDIT: Oh, right, planned maintenance.

@jrose-apple
Copy link
Contributor Author

@swift-ci Please test OS X platform

@jrose-apple
Copy link
Contributor Author

Testing something for @shahmishal.

@swift-ci Please smoke test OS X platform

@jrose-apple
Copy link
Contributor Author

@milseman / @DougGregor ping

@milseman
Copy link
Member

milseman commented Aug 3, 2016

LGTM

@jrose-apple
Copy link
Contributor Author

jrose-apple commented Aug 3, 2016

Thanks. Re-smoke-testing just to be sure it still builds cleanly.

@swift-ci Please smoke test OS X platform

@jrose-apple
Copy link
Contributor Author

Does not affect Linux. Force-merging.

@jrose-apple jrose-apple merged commit 02d2517 into swiftlang:master Aug 3, 2016
@jrose-apple jrose-apple deleted the typedef-is-not-an-option branch August 3, 2016 20:03
jrose-apple added a commit to jrose-apple/swift that referenced this pull request Aug 3, 2016
…3851)

...because otherwise option sets that get imported as members using
NS_SWIFT_NAME are printed with an 'enum' tag, and the definition of
NS_OPTIONS only declares the typedef under C++.

We should come back and figure out something more principled for this
later, but for now this solves an issue with generated headers
imported into C++ translation units.

rdar://problem/27130343
(cherry picked from commit 02d2517)
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.

3 participants