Skip to content
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

[pull] swiftwasm from master #39

Closed
wants to merge 1,828 commits into from
Closed

[pull] swiftwasm from master #39

wants to merge 1,828 commits into from

Conversation

pull[bot]
Copy link

@pull pull bot commented Feb 1, 2020

See Commits and Changes for more details.


Created by pull[bot]. Want to support this open source service? Please star it : )

swift-ci and others added 30 commits January 21, 2020 08:23
…wiftlang#29294)

correctly there.

To do this just disable on Linux where the test is currently broken.

rdar://problem/58640751
LucianoPAlmeida and others added 17 commits February 9, 2020 17:14
…ster-rebranch. Bumping the module version just in case.
Since resilient class metadata is built at runtime, we don't actually
care if there are missing vtable entries. The restriction was relaxed
in Sema in 9117c57, but SILGen still
had an assertion here.

Add a test and relax the assertion.

Fixes <rdar://problem/58644615>.
Merge master-rebranch into master to support new llvm branch apple/stable/20200108
…backtrace.swift

[test] Fix LLDB Python Path and re-enable linux-fatal-backtrace.swift
…-assertion

SILGen: Relax assertion about missing vtable entries in a class
…arameters-errors

[Diagnostics] Remove `FailureDiagnosis::diagnoseParameterErrors` from CSDiag
…en returning from a void function (swiftlang#29747)

* [CSDiagnostics] Offer a fix-it to insert a return type when returning from a void function

* [CSDiagnostics] Make sure the function name is not empty

The function name will be empty in some cases, for example for property setters. In cases where the function name is empty, skip the note and fix-it.

* [Test] Update existing diagnostics
…ripts

[NFC][Python: black] Reformatted the benchmark Python sources using utils/python_format.py.
@MaxDesiatov
Copy link

@kateinoigakukun now seeing some conflicts here, what do you think is the best way to resolve those?

@kateinoigakukun
Copy link
Member

@MaxDesiatov Umm, I think these conflicts are caused by "squash and merge" 🤔
Did you merge #117 by "squash and merge"? I forgot to tell you to merge via "creating merge commit". Sorry.

Could you force push c6ba966d8665e654560ee16c0c162a1d026cbddc and merge #117 again through "merge commit"?

@kateinoigakukun
Copy link
Member

@MaxDesiatov Thanks 😄 Conflicts are gone now!

@kateinoigakukun kateinoigakukun changed the base branch from swiftwasm to swiftwasm-stable February 11, 2020 11:53
@kateinoigakukun kateinoigakukun changed the base branch from swiftwasm-stable to swiftwasm February 11, 2020 11:53
@kateinoigakukun
Copy link
Member

CI is not triggered 🤔 I'll close this PR temporarily

MaxDesiatov pushed a commit that referenced this pull request Feb 13, 2020
[pull] swiftwasm from apple:master
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.