Skip to content

Resolve conflicts with master #727

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 20 commits into from
Apr 20, 2020
Merged

Resolve conflicts with master #727

merged 20 commits into from
Apr 20, 2020

Conversation

MaxDesiatov
Copy link

@MaxDesiatov MaxDesiatov commented Apr 20, 2020

Yet another conflict with OpenBSD ifdefs 🙂

3405691582 and others added 20 commits April 15, 2020 00:32
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.
`-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
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
@MaxDesiatov MaxDesiatov merged commit caf026f into swiftwasm Apr 20, 2020
@MaxDesiatov MaxDesiatov deleted the maxd/master-merge branch April 20, 2020 18:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants