Resolve conflicts with master #1210
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
These tests are marked XFAIL or UNSUPPORTED because either the tests: require libc annotation, require Mach-O support, don't recognize calls to swift-autolink-extract, requires porting alongside Linux, or rely on simd which is not present. Additionally, explicit REQUIRES for tsan/asan/fuzzer are added to some tests, since OpenBSD does not support these sanitizers or fuzzers, since it's nicer to mark that with REQUIRES rather than XFAIL.
…965160 [CodeCompletion] Wrap base expression with CodeCompletionExpr
…ed-convenience-inits-for-members [ClangImporter] Make sure that inherited convenience constructors are included in members of `IterableDeclContext`
…sourcekit-driver-args [Driver/SourceKit] Handle filelist driver args in getSingleFrontendInvocationFromDriverArguments
…tion Strip TypeLoc out of Patterns
Inline it into its final user: swift::performTypeLocChecking
…366ae4af217d8279439f36e
…e-modules Revert "Emit coverage mappings for all modules"
Strip Attributes of their TypeLocs
…AndRequired [test] Mark XFAIL tests for OpenBSD.
…format New binary swiftdeps format
…dead-param [NFC] CS: Inline a parameter in openUnboundGenericType
…merge # Conflicts: # test/stdlib/simd.swift.gyb # test/stdlib/simd_diagnostics.swift
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 build was fixed by adding
install-llvmto WebAssembly presets, which are now required after swiftlang#32250 is merged upstream.