Skip to content

Merge master 2020-08-08 #1557

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 853 commits into from
Aug 9, 2020
Merged

Conversation

kateinoigakukun
Copy link
Member

No description provided.

rintaro and others added 30 commits July 30, 2020 16:57
[Tests] Disable failing test while investigating
Front-end: pass down main executable path to the sub-ASTContext for building module interfaces. NFC
[Tests] Disable Runtime/linux-fatal-backtrace.swift
target_sdk_name is `macosx` when targeting `maccatalyst`, but the stdlib swift modules are placed under `swift/maccatalyst` instead of `swift/macosx`.
Using `run_os` is not correct in the general sense though, hence the requirement for a special case instead of just replacing `target_sdk_name` with it.
For example, it would be invalid to use run_os instead of target_sdk_name on Windows, because the sdk_name is going to be windows while the run_os variable may be windows-msvc.
Use the scope map to implement lookup for the labeled statements that
are visible from a given source location, which is a lexical property
that is currently handled with stateful tracking in the type checker.

For now, merely assert that the results of this approach are identical
to the state tracked in the statement type checker.
Switch the "shadowing" check for labeled statements over to using the
ASTScope-based lookup of visible labeled statements.
…lib-rdar66332541

[Tests] SILOptimizer/opt-remark-generator.swift requires optimzed stdlib
…_objc_generics_assert_take_2

Type substitution: When substituting SILFunctionTypes we substitute unbound Objective-C generic for bound ones (take 2)
Special-case catalyst when computing a path for stdlib_dir in lit config
The argument handling for `subprocess.check_output` differs between
Python 2.7, [3.0, 3.6], [3.7).

With Python 2.7, the list is implicitly decoded and we cannot use the
`encode` method as it will attempt to decode it as ASCII which will fail
with unicode data.

Python [3.0, 3.6] will attempt to encode the arguments before executing,
but will do so based on the system locale.  In the case that the locale
is `POSIX`, the encoding will be attempted in ASCII, which again fails
when unicode data is used.

Python [3.7) will accept the encoded strings and pass them through.  It
will implicitly encode the arguments using the file system encoding
(normally UTF-8), which will allow it to actually work with the content
encoded or decoded.

In order to provide maximal compatibility, pre-encode the arguments as
UTF-8 when using python 3.  Rely on the interpreter encoding the
argument implicitly on Python 2.  This allows running the
incrParse.simple test with python 2.7, python 3.6, python 3.7, python
3.8 with `LC_ALL=POSIX` as is the default on Ubuntu Server.

Thanks to @tbkka for the details on how to reproduce this issue and the
help with the python conversion!
…mination

SILCombine: optimize casts of existential boxes.
Do not attempt to parse the PlaceholderSwiftModule map when not present
…802490

[CodeCompletion] Handle @autoclosure in context type analysis
benrimmington and others added 25 commits August 6, 2020 23:44
This one was reduced from <rdar://problem/66492626>, which we have
decided is an acceptable source break because the old behavior
was incorrect.
AssociatedTypeInference: Allow Self as a fixed type witness
…ssage

for each element whose type variable was merged in addJoinConstraint
…2626

Add another test case to test/Constraints/sr12365.swift
[test] Ensure clang importer sdk uses its own CoreFoundation overlay
…update

[Doc] Update CI trigger for CentOS and Ubuntu
…-fixes

[Concurrency] Fix syntax tree creation
…ion-tool

[Localization] Fully qualify `swift-serialize-diagnostics` tool
LLVMMergeFunctions: allow more parameters if the function is bigger
AST, SIL: Remove UTF16 encoding from StringLiteralExpr and StringLiteralInst
[Runtime] Fix the isa mask assert for ARM64e.
test: disable a couple of IRGen tests on ASi
Use `in` list comparison rather than equality to make it easy to extend
and homogenise.
…ypevars

[ConstraintSystem] Add a type variable merging heuristic to addJoinConstraint
The standard library on non-Intel targets get compared to the baseline
from the Intel targets which is not guaranteed to be identical.  Mark
the checks as expected failures on non-x86_64 targets.  Although this is
entirely unsatisfying, it allows progress in the short term.
test: format configuration to be more pythonic
SR-13362: no baseline is available for the standard library on ASi
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.

Thanks for the fix, this is great!

@kateinoigakukun kateinoigakukun merged commit 8668be2 into swiftwasm Aug 9, 2020
@MaxDesiatov MaxDesiatov deleted the katei/merge-master-2020-08-08 branch August 10, 2020 09:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.