Fix conflicts merging main into next #66937
Merged
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
Its storage vector is intended to be of some type like `std::vector<std::pair<Key, Optional<Value>>>`, i.e., some collection of pairs whose `second` is an `Optional<Value>`. So when constructing a default instance of that pair, just construct an Optional in the None case.
…y initialized. This leads to unhandled complications in the move-only checker that were causing miscompiles. We can disallow this for now. rdar://109695770
…nsuming this was staged in as a warning initially but it was intended to be an error if it is not written so that we can move to a world where these pattern matches are done as a borrowing operation instead. rdar://110908714
swiftlang#66707) * [IRGen] Use EnumImplStrategy to generate getEnumTag function for layout strings rdar://110794898 The implementation in TypeLayout seems to have a bug causing wrong tags to be returned on 32 bit systems. * Don't use unsupported types in tests
Iterating all options and potential file system access is not great for every plugin lookup request. Instead, lazily create a single lookup table keyed by module name.
Enable IRGen/protocol_metadata test on Apple Silicon
[SILOptimizer] Don't optimize move-only lifetimes.
require `consume x` for noncopyable pattern bindings since they're consuming
FieldSensitivePrunedLiveness is used as a vectorization of
PrunedLiveness. An instance of FSPL with N elements needs to be able to
represent the same states as N instances of PL.
Previously, it failed to do that in two significant ways:
(1) It attempted to save space for which elements were live by using
a range. This failed to account for instructions which are users of
non-contiguous fields of an aggregate.
apply(
@owned (struct_element_addr %s, #S.f1),
@owned (struct_element_addr %s, #S.f3)
)
(2) It used a single bit to represent whether the instruction was
consuming. This failed to account for instructions which consumed
some fields and borrowed others.
apply(
@owned (struct_element_addr %s, #S.f1),
@guaranteed (struct_element_addr %s, #S.f2)
)
The fix for (1) is to use a bit vector to represent which elements
are used by the instruction. The fix for (2) is to use a second bit
vector to represent which elements are _consumed_ by the instruction.
Adapted the move-checker to use the new representation.
rdar://110909290
Dumped more info and called llvm_unreachable on bad state.
Previously, the checker inserted destroys after each last use. Here, extend the lifetimes of fields as far as possible within their original (unchecked) limits. rdar://99681073
It's always the first line of the function, so try to do better.
Passing ``` -Xllvm -move-only-address-checker-disable-lifetime-extension=true ``` will skip the maximization of unconsumed field lifetimes.
…rvable At one point this gave us trouble, but it's since been fixed. Add the test to make sure we don't regress. Covers rdar://109231047.
…debug_info_opaque_ptrs [DebugInfo] Update tests to use opaque ptrs
SILDebugScopes: Don't ignore ConditionalClauseInitializerScope.
[FieldSensitivePL] Fix vectorization.
[MoveOnlyAddressChecker] Maximize lifetimes.
The address checker records uses in its livenessUses map. Previously, that map mapped from an instruction to a range of fields of the type. But an instruction can use multiple discontiguous fields of a single value. Here, such instructions are properly recorded by fixing the map to store a bit vector for each instruction. rdar://110676577
```
../include/swift/SIL/FieldSensitivePrunedLiveness.h:531:54: warning: 'hasValue' is deprecated: Use has_value instead. [-Wdeprecated-declarations]
bool isInitialized() const { return numBitsToTrack.hasValue(); }
^~~~~~~~
has_value
```
[MoveOnlyAddressChecker] Fix representation for used fields.
…617/1/fix-warning Gardening: Silenced Optional::hasValue warning.
Add frontend flag for explicitly setting ccc
This patch adds the metadata registration for the wasm targets, and also adds build support for it.
…3fc716c8f3b55bfd113d3972dc3bb6 [wasm][build] Recognize wasi-wasm32 as valid host
…ure-type-constraint [ConstraintSystem] Use fallback type constraint to default pack expansion
…5a694965ab652f57cbfead006a33d7 [static-stdlib] Move static-executable-args.lnk under stdlib/public/Resources/linux
…lation-bigger-change [SoruceKit] Audit SwiftASTManager to prevent deadlocks
[ConstraintSystem] Fix keyPath diagnostic error for value convert to contextual types
[ConstraintSystem] Adjust the way pack parameters are opened
[CursorInfo] Pass primary path to allow comparing previous ASTs
[stdlib] Add support for classes in _createOffsetBasedKeyPath
The following tests required conflict resolutions, since upstream LLVM did a lot of work to remove dbg.addr, and this work is not available to swift's main. At the same time, swift's main changed these tests to enable opaque pointers. ``` both modified: test/DebugInfo/async-let-await.swift both modified: test/DebugInfo/move_function_dbginfo.swift both modified: test/DebugInfo/move_function_dbginfo_async.swift ``` The conflicts are fairly easy to fix: we keep the "structure" of the CHECK lines present in `next`, but replace all pointers with `ptr`.
felipepiovezan
requested review from
hborla,
xedin,
ahoppen,
bnbarham,
rintaro,
slavapestov,
CodaFi,
DougGregor,
zoecarver,
hyp,
egorzhdan,
ktoso,
adrian-prantl,
al45tair,
AnthonyLatsis,
kavon,
artemcm,
tshortli,
LucianoPAlmeida and
eeckstein
as code owners
bnbarham
approved these changes
Jun 26, 2023
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 following tests required conflict resolution, since upstream LLVM did a lot of
work to remove dbg.addr, and this work is not available to swift's main. At the
same time, swift's main changed these tests to enable opaque pointers.
The conflicts are fairly easy to fix: we keep the "structure" of the CHECK
lines present in
next, but replace all pointers withptr.