Resolve conflicts with master #888
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Apply constant value propagation to the host flag variant operations. This reduces the parameters needed for the invocations and enables further cleaning in the hopes that we can apply these per-target using CMake instead.
Perform some constant folding, constant value propagation, dead argument elimination over the flag computation methods. This reduces the unnecessary parameters and more clearly and succinctly describes what is happening.
Convert the out parameters for `_add_host_variant_link_flags` to use the target as an in-parameter. Doing so allows us to set the properties on the target directly rather than providing them as out parameters which then get set subsequently.
Convert the out parameters for `_add_host_variant_c_compile_flags` to use the target as an in-parameter. Doing so allows us to set the properties on the target directly rather than providing them as out parameters which then get set subsequently.
The host tools do not use ICU, only the standard library does. Remove the special handling in the host tool path for ICU. This simplifies the flag computation and allows the ICU handling to be sunk entirely into the target specific paths.
The two invocations here both had a single parameter passed to it. Replace it with `add_dependencies` which already actually supports multiple dependencies specified. Sink the custom wrapper into the usage location in `AddSwiftStdlib.cmake`.
Use a newly introduced `swift_gyb_target_sources` to gyb and use the generated sources when building. Let CMake figure out when to run the command, let it invoke the command properly, and indicate that the sources being added to the target are generated.
ELF is sensitive to library ordering. Ensure that `swiftClangImporter` comes after `swiftAST` as `swiftAST` has grown a dependency on `swiftClangImporter`. Adding this properly using `target_link_libraries` will cause a cyclic dependency so add this reordering here.
build: shuffle library order
optimize flag computation
And handle a cycle specially rather than defaulting to nullptr and doing another lookup to check.
Store an array of Located<Identifier> instead of an array of Identifiers and SourceLocs on OperatorDecl. This allows us to cleanup OperatorPrecedenceGroupRequest a little.
The parser should ensure that we never encounter this case.
[NFC] Fix comment typo in build-script-impl
Drops outdated random number generation example and simplifies a bit. Fixes <rdar://problem/57888487>
…merge # Conflicts: # cmake/modules/AddSwift.cmake
kateinoigakukun
approved these changes
May 2, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.