Adding macOS alias for conditional compilation blocks

[erica]

Alias OSX to macOS for conditional compilation blocks os() test

Starting in Sierra, Apple's Mac-based OS (OS X) will be renamed "macOS".
The #if os(OSX) test should be aliased to #if os(macOS).

With any luck, I've managed to do this right..

Resolved bug number: (SR-1823)

---

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

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.

[karwa]

Maybe add a test?

test/Parse/ConditionalCompilation/x64OSXTarget.swift is where it lives.

[jakepetroules]

👍

[erica]

I duplicated test/Parse/ConditionalCompilation/x64OSXTarget.swift and updated the condition from OSX to macOS

[gribozavr]

Why not add to the existing test file? (Every test has a non-zero startup cost, adding to existing tests is cheaper.)

[erica]

@gribozavr because I'm unsure of the protocol and this is my first (technically my second, but the first time just added a line of text) time doing a code submission

[gribozavr]

It would be best to add the tests to the existing file.

[erica]

@gribozavr And done

[gribozavr]

@swift-ci Please test

[gribozavr]

@erica Please take a look at the test issues.

[jrose-apple]

Unfortunately, addPlatformConditionValue doesn't support multiple values for the same condition. (It should probably assert that.) I think we need to canonicalize to a particular value before checking it.

If you're busy with other things I can take this on from your starting point.

[rintaro]

@jrose-apple
LangOptions::PlatformConditionValues does contain multiple values.
I added one commit on @erica 's change: master...rintaro:SR-1823
It seems to work. How do you think about this?

My concern about my patch is that the primary value is ambiguous.
Since this values is used in lib/Serialization/SerializedModuleLoader.cpp
I'm not sure supporting multiple value is right thing.

[jrose-apple]

Right, we only expect one value. I admit I didn't think of changing the matcher to search the whole list instead of just getting the first one, but I think we should keep it unique for now and just canonicalize.