Skip to content

[ClangImporter] Predefine __swift__ in imported (Obj)C code. #4513

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 30, 2016

Conversation

jrose-apple
Copy link
Contributor

  • Explanation: Provides a macro allowing imported code to distinguish between Swift versions, particularly between Swift 2 and Swift 3. More explanation and rationale in https://lists.swift.org/pipermail/swift-dev/Week-of-Mon-20160822/002754.html. While this is hardly a critical Swift 3 feature, it's much more effective if it goes in now rather than in a point release, and so if there are any further critical fixes we should take this too.
  • Scope: Pretty much affects no one unless they were defining this macro manually. It does also affect the implementation of __SWIFT_COMPILER_VERSION, which is used only for internal processes at Apple, but the intent is that nothing changes there either.
  • Issue: rdar://problem/26921435
  • Reviewed by: @DougGregor, @bitjammer
  • Risk: Very low.
  • Testing: Added a compiler regression test.

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 clean 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 clean test OS X platform
OS X platform @swift-ci Please benchmark
Linux platform @swift-ci Please test Linux platform
Linux platform @swift-ci Please clean test Linux platform

Lint Testing

Language Comment
Python @swift-ci Please Python lint

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

…ng#4510)

This macro expands to a numeric value representing the current Swift
language version; for Swift 3.1.2, it would be 30102.

See discussion in https://lists.swift.org/pipermail/swift-dev/Week-of-Mon-20160822/002754.html.

rdar://problem/26921435
(cherry picked from commit 5ffb151)
@jrose-apple
Copy link
Contributor Author

@swift-ci Please test

@jrose-apple jrose-apple added this to the Swift 3.0 milestone Aug 26, 2016
@jrose-apple jrose-apple changed the title [ClangImporter] Predefine __swift__ in imported (Obj)C code. (#4510) [ClangImporter] Predefine __swift__ in imported (Obj)C code. Aug 26, 2016
@jrose-apple
Copy link
Contributor Author

P.S. If anyone's wondering what's up with __SWIFT_COMPILER_VERSION and why we don't just use that, it's because self-built toolchains and development snapshots don't have Apple build numbers, and therefore it doesn't make sense to write logic checking Apple build numbers.

@tkremenek tkremenek merged commit 6dff1cf into swiftlang:swift-3.0-branch Aug 30, 2016
@jrose-apple jrose-apple deleted the swift-3-__swift__ branch August 30, 2016 15:46
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.

2 participants