Resolve conflicts with master#1289

Merged

MaxDesiatov merged 306 commits intoswiftwasmfrom

maxd/master-merge

Jul 2, 2020

This pull request is big! We're only showing the most recent 250 commits

Commits on Jun 23, 2020

Commits on Jun 24, 2020

Merge pull request #28003 from DougGregor/swift-frontend-rename
DougGregor
authored
tests: fix check line in dso_handle test
eeckstein
committed
[CodeCompletion] Fallback to nominal member completion after trailing closure
rintaro
committed
Merge branch 'master' of github.com:swiftwasm/swift into maxd/master-merge
MaxDesiatov
committed
[CMake] Fix unified builds after #28003
davezarzycki
committed
Driver: update old doc comments from when clang++ was the linker driver
finagolfin
committed
Merge pull request #32520 from eeckstein/fix-test
eeckstein
authored
Merge pull request #32522 from davezarzycki/pr32522
davezarzycki
authored
Merge pull request #30733 from allevato/rt-inline-ns
compnerd
authored
test: make `make-unreadable` Python 3 friendly
compnerd
committed
Merge pull request #32521 from rintaro/ide-completion-rdar64650782
rintaro
authored
Merge pull request #32444 from rintaro/ast-casestmt-parent
rintaro
authored
Merge pull request #32482 from nate-chandler/generic-metadata-prespecialization-components/consider-conformances
nate-chandler
authored
Merge pull request #32509 from compnerd/binary-is-not-string
compnerd
authored
Merge pull request #32510 from compnerd/action-at-a-distance
compnerd
authored
AST: isEquivalentToExtendedContext() should consider use patterns of @_originallyDefinedIn
nkcsgexi
committed
Merge pull request #32395 from 3405691582/Test_OpenBSD_NumericParsing
CodaFi
authored
Merge pull request #32513 from nathawes/fix-indentation-after-incomplete-func-decl
Nathan Hawes
authored
[cxx-interop] Do not give the default C++ constructor's return statement a result.
zoecarver
committed
[CodeCompletion] Assume non-'isSimpleDidSet' in code completion
rintaro
committed
[IRGen] Remove an unused DenseMap
DougGregor
committed
[Test] Disabled remote_run on prespecialized-metadata/struct-multi-conformance.swift.
nate-chandler
committed
Merge pull request #32514 from 3405691582/OpenBSD_CommandLine
CodaFi
authored
[ConstraintSystem] Record substitutions from opened unbound generic types
xedin
committed
[Function builders] Run syntactic diagnostics for function bodies.
DougGregor
committed
[NFC] Run clang-format over CommandLine.cpp.
3405691582
committed

Commits on Jun 25, 2020

Commits on Jun 26, 2020

Commits on Jun 27, 2020

Commits on Jun 29, 2020

Commits on Jun 30, 2020

Commits on Jul 1, 2020

Commits on Jul 2, 2020