Skip to content

Merge 7952f051a3401494655c09aa785a058a7c997c31 #117

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 371 commits into from
Feb 11, 2020

Conversation

kateinoigakukun
Copy link
Member

Resolve conflict

swift-ci and others added 30 commits January 31, 2020 20:02
This flag is recoverable from the contextual type purpose; don’t duplicate
the logic.
This is always set along with SubExpressionDiagnostics, so use that
for both purposes. That flag will go away when `CSDiag.cpp` goes away.
build: correct the handling for the static variants
A contextual type purpose, that is, so it captures more about what the
entity is that is being solved.
…a `type(of: x).A` expression are visible to the `SourceEntityWalker`

For code like

```
  _ = type(of: x).A.self
```

the `A` type reference is written explicitely by the user, but the AST created using `TypeExpr::createImplicitHack` is hiding such a reference,
making the reference invisible to semantic functionality like 'rename'.

rdar://56885871
Revert "Revert "build: simplify version tracking logic""
swift-windows was renamed to swift-build.  Update the repository name to
reflect that.
Remove some unnecessary generalization in exportability checking
…pression

Rework most of typeCheckExpression() to use SolutionApplicationTarget,
folding more information into that data structure and sinking more
expression-checking behavior down into the more general solver and
solution-application code.
build: remove meaningless dependency
Hoist the responsibility for adding the linked libraries out of
`_add_swift_executable_single` to the invoker.  This impacts only
`swift_add_target_executable`.  This continues to bring the computation
of the properties nearer the site of definition.
…*> -> ArrayRef<BranchPropagatedUser> onto BranchPropagatedUser.

A branch propagated user that isn't a cond_br is layout compatible with a
SILInstruction *. This helper function converts from ArrayRef<SILInstruction *>
-> ArrayRef<BranchPropagatedUser> but also in asserts builds checks that our
invariant (namely all of the 'SILInstruction *' are not cond_br.
…s the original value.

The original design was to make it so that end_borrow tied at the use level its
original/borrowed value. So we would have:

```
%borrowedVal = begin_borrow %original
...
end_borrow %borrowedVal from %original
```

In the end we decided not to use that design and instead just use:

```
%borrowedVal = begin_borrow %original
...
end_borrow %borrowedVal
```

In order to enable that transition, I left the old API for end_borrow that took
both original and borrowedVal and reimplemented it on top of the new API that
just took the borrowedVal (i.e. the original was just a dead arg).

Now given where we are in the development, it makes sense to get rid of that
transition API and move to just use the new API.
build: hoist `LINK_LIBRARIES` out of `_add_swift_executable_single`
This is just like SILArgument::getSingleTerminatorOperand() except that it
returns the actual Terminator rather than the terminator's argument.
…support.

The functions used to calculate default LTO link jobs for LLVM and Swift have been moved to the build_swift.defaults module.
ravikandhadai and others added 23 commits February 8, 2020 13:55
test suite skip the optional "nonnull" attribute added to the buffer
pointer in the LLVM IR.
…test-fix

[Tests][SILOptimizer] Make the new OSLogPrototypeFullOptTest.swift test suite skip the optional "nonnull" attribute
CI: attempt to fix the index for swift
…target

[Constraint system] Sink initialization logic into SolutionApplicationTarget
…-mirroring-regression

ClangImporter: Fix mirroring of instance properties as static methods on NSObject
[NFC Incremental] Small changes to fine-grained unit test framework
Ignore the line ending as in the rest of the SourceKit tests.
test: repair the SourceKit test for Windows (NFC)
This should have been done some time ago, but it fell through the cracks. Ran
into some problems here, so I am taking care of it real quickly.
…7b5eb9544a6cb834c96f8ce

Add presets for source compat suite.
…6a2178f9011e5d2ad844b66

Presets add missing preset default for build_swift test.
Gate a test that dumps stats on an asserts build
Revert "Emit debug info for generic type aliases.  …"
XFAIL a test holding up the rebranch process
@MaxDesiatov MaxDesiatov merged this pull request into swiftwasm Feb 11, 2020
@MaxDesiatov MaxDesiatov deleted the merge/7952f051a3401494655c09aa785a058a7c997c31 branch February 11, 2020 10:55
@MaxDesiatov MaxDesiatov restored the merge/7952f051a3401494655c09aa785a058a7c997c31 branch February 11, 2020 11:30
@MaxDesiatov MaxDesiatov deleted the merge/7952f051a3401494655c09aa785a058a7c997c31 branch February 11, 2020 11:33
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.