Skip to content

Merge master 2020-07-06 resolving broken build #1389

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 49 commits into from
Jul 6, 2020

Conversation

kateinoigakukun
Copy link
Member

@kateinoigakukun kateinoigakukun commented Jul 6, 2020

The added lines by Apple Silicon patch really depend on the build machine platform and it forces that we can build stdlib only for darwin targets. So I changed to allow non-darwin targets and filter only unsupported darwin targets. This patch should be sent to upstream.

Resolve #1388

compnerd and others added 30 commits July 2, 2020 12:47
Use `io.open` to open the files with the correct encoding and to allow
proper newline specification.  This allows the script to be python 2 and
python 3 compatible.
Most of the changes fall into a few categories:
* Replace explicit "x86_64" with %target-cpu in lit tests
* Cope with architecture differences in IR/asm/etc. macOS-specific tests
…n macOS.

Most of this is enabled by an upstream change to generalize the tests
for the api-digester to properly handle all targets. The primary change
here is to account for the Swift-level ABI differences for the standard
library between Apple Silicon macOS and Intel macOS. Specifically, anything
related to Float80 will be removed from the standard library on Apple Silicon
macOS, so account for the differences.
…iling

clang and compiler-rt are rev-locked and should match.  Currently, we build clang (and use it to bootstrap the rest) but don't build compiler-rt.  We should.

This doesn't completely achieve that: this only makes us build compiler-rt for the local host.

This used to be pretty much impossible, but, since then, compiler-rt cmake support was rewritten.

We should build it for the other hosts as well, but that's trickier, because we'd need to make the cross-compiled compiler-rt build use a separate just-built clang (from the local host). We do that for the other projects, but compiler-rt is special (because it's cmake'd as a runtime part of clang/llvm).
…acy-impl.

LIPO_SRC_DIRS wasn't set for '--only-execute merged-hosts-lipo',
because the logic was skipped for actions other than install.
shahmishal and others added 19 commits July 2, 2020 19:20
LLVM no longer canonicalizes target triples for maOS versions. Update
tests to account for this.
…eric specialization tests behind a flag.

The idea is that this will let me remove these assertions that were in place to
make sure we were really conservative around specializing ownership code. For me
to remove that I need to be able to actually test out this code (since I think
there are some code paths where this will trigger in other parts of the compiler
now).

So to work out the kinks, I added a flag that allows for the generic specializer
to process ownership code and translated most of the .sil test cases/fixed any
bugs that I found. This hopefully will expose anything that is missing.

NOTE: I have not enabled the generic specializer running in ownership in the
pipeline. This is just a step in that direction by adding tests/etc.
Attempt to appease the python linter
test: make `validate_parse` more python3 friendly
…d650430947c43d7b3a743d5

[ownership] Loosen restrictions around what we specialize and add generic specialization tests behind a flag.
Co-authored-by: Olivier Halligon <olivier@halligon.net>
Co-authored-by: Xiaodi Wu <13952+xwu@users.noreply.github.com>
Co-authored-by: Xiaodi Wu <13952+xwu@users.noreply.github.com>
…wiftlang#32670)

Add base type parameter to `TangentStoredPropertyRequest`.

Use `TypeBase::getTypeOfMember` instead of `VarDecl::getType` to correctly
compute the member type of original stored properties, using the base type.

Resolves SR-13134.
…swiftlang#32714)

Reject `@differentiable` and `@derivative` attribute for original
functions with opaque result types.

It is not possible to support derivative registration nor the
differentiation transform for such functions.

Resolves SR-12656.
…cript

The added lines by Apple Silicon patch really depend on the build
machine platform and it forces that we can build stdlib only for
darwin targets. So I changed to allow non-darwin targets and filter only
unsupported darwin targets. This patch shuold be sent to upstream.
Copy link

@MaxDesiatov MaxDesiatov left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great stuff, thanks for the quick fix!

@MaxDesiatov MaxDesiatov merged commit 5e687ec into swiftwasm Jul 6, 2020
@MaxDesiatov MaxDesiatov deleted the katei/merge-master-2020-07-06 branch July 6, 2020 18:35
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.

Build broken by Apple Silicon patch
6 participants