Resolve conflicts with master #1065
Closed
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…s correctly. Previously we would just forward the cleanup and create a normal "destroy" cleanup resulting in early deallocation and use after frees along error paths. As part of this I also had to tweak how DI recognizes self init writebacks to not use SILLocations. This is approach is more robust (since we aren't relying on SourceLocs/have verifiers to make sure we don't violate SIL) and also avoids issues from the write back store not necessarily have the same SILLocation. <rdar://problem/59830255>
LLVM's isel does not like integer types beyond a certain size (llvm::IntegerType::MAX_INT_BITS). rdar://63189452
…s with type param. assertions
The module name is not specified but the test explicitly overfits to an expected name. Adjust the test invocation to accommodate the expectation.
for call arguments. Consider variadic arguments 'skippable'. Also, don't treat 'VarargExpansionExpr' as a "context providing" expression. rdar://problem/62479469
static members cannot be used on protocol metatypes. rdar://problem/58886969
A lot of attributes are essentially default target configuration, and we should only differ when there's a good reason to. For the attributes we were already setting: - the ptrauth and target CPU/feature attributes are taken care of by Clang - I've updated the optsize/minsize attributes to the apparent intent - I've left the frame-pointer override in place for now Fixes rdar://63289339, which was caused by Swift's ptrauth IR attributes getting out of sync with Clang's.
…ubmap Serialization: Use checked substitution map deserialization for type nodes
…ess_huge_types IRGen: Fix enumPayload value witness emission for huge types
differentiation_activity_analysis.swift -> activity_analysis.swift
…when the declaration is synthesised (swiftlang#31915) * [Typechecker] Emit a specialized diagnostic for redeclaration errors when the declaration is synthesized * [Test] Update existing tests * [Typechecker] Diagnose the original wrapped property instead of the nearest non-implicit decl context * [Test] Update existing tests * [Typechecker] Do not diagnose redeclarations when both declarations are implicit * [Test] Update a AutoDiff test
…479469 [CodeCompletion] Handle variadic parameter in expr context analysis
…886969 [CodeCompletion] Stop suggesting static member on a protoco meta type
Use Clang's logic for adding the default IR attributes to a function
test: enable WebAssembly/WASI in lit.cfg
…1e6af034157dc9e8c1b31cf [silgen] Teach CleanupCloner how to handle OwnedValueWritebackCleanups correctly.
…in certain cases.
Don't column align PBD entries if any entry spans from the same line as
the var/let to another line. E.g.
```
// Previous behavior:
let foo = someItem
.getValue(), // Column-alignment looks ok here, but...
bar = otherItem
.getValue()
getAThing()
.andDoStuffWithIt()
let foo = someItem
.getValue() // looks over-indented here, which is more common.
getOtherThing()
.andDoStuffWithIt()
// New behavior
getAThing()
.andDoStuffWithIt()
let foo = someItem
.getValue() // No column alignment in this case...
doOtherThing()
let foo = someItem
.getValue(), // Or in this case (unfortunate, but less common)...
bar = otherItem
.getValue()
let foo = someItem.getValue(),
bar = otherItem.getValue() // but still column-aligned in this case.
```
Resolves rdar://problem/63309288
…am-3 GenericSignatureImpl, swiftlang#31712: Plug remaining relevant methods with type param. assertions
…-gyb Fix and reenable NewArray.swift.gyb
…r being bound to hole has a key path root representatee
…instead of inline in the header
to return a string representing default initialization when a property is default initialized via property wrapper.
…lized via property wrapper, mark the init call as implicit.
… an Objective-C generic class The assertion here is too strict. The TypeAliasDecl will inherit a generic signature from the outer context even if it does not have generic parameters of its own. Instead, let's just assert that the TypeAliasDecl does not have its own generic parameters. Fixes <rdar://problem/63188938>.
Since SIL parsing has been requestified, this is now redundant. Remove the type from Subsystems.h, and rename SILParserTUState to take its place.
This is just fixing an assert violation. I also needed to add support for target-sil-opt(mock-sdk: ...) so I added support to lit for that here. <rdar://problem/62262811>
Previously, prespecialization was incorrectly being performed for non-resilient types defined by other modules. This is incorrect for statically canonical metadata records because in order to be canonical, they need to be returned from the metadata accessor which is emitted by the module which defines the type.
test: repair SILOptimizer AutoDiff test on Windows
…ath-hole [SR-12827] [Diagnostics] Improve diagnostics keypath hole involving generic argument
[NFC][SourceKit] Correct a typo in SwiftEditor.cpp
…-indentation [SourceKit/CodeFormat] Don't column-align PatternBindingDecl entries in certain cases.
…lt-init [Property Wrappers] Fix handling of properties that are default initialized via property wrapper
…eric-typealias-assertion PrintAsObjC: Fix crash when printing typedef that was imported inside an Objective-C generic class
…a-prespecialization-components/canonical-only-inmodule [metadata prespecialization] Prespecialize canonically only in-module.
If the setter conflict occurs in a deserialized declaration, the parent pattern binding can be NULL. Guard the fixit on the existence of the pattern binding so 1) we don't crash 2) we don't try to emit a fixit in otherwise extremely broken code rdar://56558082
…2171104f9e33f8c2224bb82 [fso] Do not try to specialize pseudo-generic functions today.
…merge # Conflicts: # test/lit.cfg
MaxDesiatov
force-pushed
the
maxd/master-merge
branch
from
62a8287 to
b9ba416
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The conflicts appeared after some of our
lit.cfgchanges were merged upsteream.