Skip to content

Implement 'join' for optional types and a special case for 'nil'. #4408

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 2 commits into from
Aug 19, 2016

Conversation

DougGregor
Copy link
Member

What's in this pull request?

The join operation for optional types is straightforward to define/implement:

join(T?, U)  ::= join(T, U)?
join(T, U?)  ::= join(T, U)?
join(T?, U?) ::= join(T, U)?

As a special case in the constraint solver, handle the join of a 'nil'
literal with a non-ExpressibleByNilLiteral-conforming concrete type
'T' to produce 'T?'. This allows us, e.g., infer [String?] for the
expressions

["hello", nil]

and

 true ? "hello" nil

for example.

Resolved bug number: (rdar://problem/16326914)


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.

@DougGregor
Copy link
Member Author

@swift-ci please test macOS

@@ -1,4 +1,4 @@
//===--- TypeJoinMeet.cpp - Swift Type "Join" and "Meet" -----------------===//
//===--- TypeJoinjoin.cpp - Swift Type "Join" and "join" -----------------===//
Copy link
Contributor

Choose a reason for hiding this comment

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

sed gone wild, heh.

Copy link
Contributor

Choose a reason for hiding this comment

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

Doug is hereby enmeeted from using sed again.

@DougGregor
Copy link
Member Author

Drat! Will fix.

@jrose-apple
Copy link
Contributor

I'm not a type checker expert but everything else looks good.

@DougGregor
Copy link
Member Author

This isn't specifically addressing any regression that I know of (I originally thought it did), so probably not for 3.0. Whaddya think, @rudkx ?

…e for 'nil'.

The join operation for optional types is straightforward to define/implement:

  join(T?, U)  ::= join(T, U)?
  join(T, U?)  ::= join(T, U)?
  join(T?, U?) ::= join(T, U)?

As a special case in the constraint solver, handle the join of a 'nil'
literal with a non-ExpressibleByNilLiteral-conforming concrete type
'T' to produce 'T?'. This allows us, e.g., infer [String?] for the
expressions

  ["hello", nil]

and

   true ? "hello" nil

for example. Fixes rdar://problem/16326914.
@DougGregor DougGregor force-pushed the optional-join-rdar-16326914 branch from e87226b to 78b7bb4 Compare August 19, 2016 17:57
@DougGregor
Copy link
Member Author

Force-merging; the CI shouldn't pay for my comment fixes.

@DougGregor DougGregor merged commit fe127a2 into swiftlang:master Aug 19, 2016
@DougGregor DougGregor deleted the optional-join-rdar-16326914 branch August 19, 2016 17:58
@rudkx
Copy link
Contributor

rudkx commented Aug 19, 2016

@DougGregor Yeah, I don't think we need to take this now.

kateinoigakukun added a commit that referenced this pull request Aug 31, 2022
Handle `swift_once` workaround in a proper way
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.

4 participants