forked from swiftlang/swift
-
Notifications
You must be signed in to change notification settings - Fork 30
Resolve master conflicts #730
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
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
In several places, it was assumed to be /usr and hard-coded to that. This makes sure the installation prefix actually passed in is used.
Previously, availability checking computed a declaration’s availability as the intersection of all @available attributes with active platforms. This meant that Swift would not allow you to use an API that was available earlier in a child platform than in its parent until it was also available in the parent platform. That was incorrect. This PR corrects availability checking to find the most specific @available attribute with an introduced version and use that instead. Fixes rdar://60892534.
New files were added in swiftlang#30875 which did not include os(OpenBSD), so add this. add_swift_target_library in AddSwiftStdlib subsequently required modification. _add_target_variant_link_flags likely needs modification as well, but this is better suited to a separate PR.
The previous commit broke a promise made by the implementation it replaced: if there were two or more @available(introduced:) attributes for the same platform, the greatest version wins. This commit restores that property while still completely overriding the parent platform’s availability with a child platform’s.
…eDiagnostic` This decouples `FailureDiagnostic` from expression.
In preparation to anchor `ConstraintLocator` from `TypedNode` let's refactor diagnostics (which is the biggest user of locators) to support `TypedNode` instead of `Expr *`.
Since `TypedNode` elements are all marked as `const` diagnostics need to get some of the APIs adjusted to support passing `const Expr *`.
`-no-warnings-as-errors` This functionality is required for build systems to be able to overload/disable a given Swift project's preference of treating warnings as errors. Resolves rdar://problem/35699776
within escaping autoclosures. <rdar://problem/60551844>
Inline the conditions for the astGuaranteedToCorrespondToSIL parameter and clean up the logic here to be more const-friendly. Also try to centralize and document the reasons we skip TBD validation.
…ring-simulator Revert "[Darwin] Further restrict inference of the simulator environment"
Avoid unnecessary performTypeChecking() in REPL
[Frontend][NFC] Refactor validateTBDIfNeeded
Yank this parameter and document the historical scope creep of this value.
[Frontend][NFC] Formalize isModuleExternallyConsumed
This is needed for the master-next branch.
getInstanceWithExactDynamicType returns a new instance and for this the class decl has to be updated. https://bugs.swift.org/browse/SR-12538 rdar://problem/61911112
Devirtualizer: fix a miscompile due to handling of cast instructions.
…fixDifferentiation [stdlib] Buildfix differentiation for OpenBSD.
Add compiler option to *disable* warnings-as-errors
…ture-diagnostics [SIL Diagnostics] Improve diagnostics for capture of inout values in escaping autoclosures.
…xtensions [stdlib] StaticString: extension per conformance
[build-script] Add the installation prefix to the toolchain path
…-demand [Diagnostics] Refactor `FailureDiagnostic` to operate on `TypedNode`
Fix @available(macCatalyst N, iOS N+M) bug
…merge # Conflicts: # stdlib/public/Differentiation/TgmathDerivatives.swift.gyb
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.