Resolve conflicts with master #1289
Merged
Conversation
This file contains 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
This reverts commit 8c9649e.
[CMake] Make swift-frontend the primary Swift binary.
… closure After trailing closure, we perform "Labeled trailing closure" completion and fall back to other completion depending on the position. If the completion happens at a newline position, it used to fallback to global expression completion, but in type context, we should do override completion instead. Also, we didn't use to propagate 'hasCodeCompletion()' status properly. rdar://problem/64650782
…merge # Conflicts: # test/stdlib/simd.swift.gyb
tests: fix check line in dso_handle test
[CMake] Fix unified builds after swiftlang#28003
Wrap (de)mangling namespaces in an inline namespace.
Make `make-unreadable` python 3 compatible. `POINTER` is now in `ctypes` rather than in `ctypes.wintypes`. Use the new location which is compatible across python 2 and python 3.
…650782 [CodeCompletion] Fallback to nominal member completion after trailing closure
[AST] Add a pointer to parent statement in 'CaseStmt'
…a-prespecialization-components/consider-conformances [metadata prespecialization] Check conformances.
test: make `binary_sub` python 2, 3 compatible
utils: update `remote-run` for Python 3 compatibility
…@_originallyDefinedIn When a nominal type and its extensions coexist in the same module, mangling may use the nominal type as the context for extension members. We should preserve this mechanism for types marked as @_originallyDefinedIn to maintain ABI stability. rdar://64538537
…icParsing [test][stdlib] Add strto*_l stubs for OpenBSD.
…r-incomplete-func-decl [SourceKit/Indentation] Fix over-indent after function decl with no param list or body.
…ent a result. The default C++ object constructor assigns the newly created object out of the function so, it should not return a value. Returning a value will trigger SILGen assertions.
Code completion always want to see implicit 'oldValue' with the correct type. Return 'false' from 'SimpleDidSetRequest' in code completion mode. rdar://problem/64699286
Command line routines for OpenBSD.
…ypes Substitutions are already recorded for other situations like member references, this was just slipped under the radar.
When a function body has had a function builder applied to it, make sure that we run all of the syntactic diagnostics for expressions and statements within the body. Fixes rdar://problem/64493626.
As discussed in swiftlang#32514, this just runs clang-format over this file.
…wiftlang#32527) Fix false `Differentiable` derived conformances warning on `@differentiable` property-wrapped properties. Check property mutability using `VarDecl::isSettable` instead of `VarDecl::getAccessor(AccessorKind::Set)`. Some settable properties do not have setters, depending on the underlying `WriteImplKind`. Resolves SR-13071.
[sourcekit] Retain semantic annotations across queries
This will enable us apply -sil-disable-pass only on certain functions
…g#32618) As part of this refactor some code touched as part of swiftlang#31794 to better fit into the work done in swiftlang#32120 -- in detail * `_add_host_variant_c_compile_link_flags` is now invoked by both add_swift_host_library and add_swift_host_library * `_add_host_variant_c_compile_link_flags` now sets the target in linker arguments when building against Apple SDKs Addresses rdar://64911978
…050eaa2e542cef37f6470fa [lit] Detect lldb by checking both for lldb_build_root and that that root contains an lldb exec.
…vertchild [RemoteMirror] Gracefully handle a NULL TypeInfo passed to convertChild.
…available For the explicit module mode, swift-driver uses -compile-module-from-interface to generate modules from interfaces found by the dependency scanner. However, we don't need to build the binary module if up-to-date modules are available, either adjacent to the interface file or in the prebuilt module cache directory. This patch teaches dependencies scanner to report these ready-to-use binary modules.
[Gardening] Clean Up OS Conditionals With canImport and Vendor=apple
Use Formal Access To Compute Override Elision Check
…lKeyPath)" This reverts commit d7d829c. The test stdlib/KeyPath.swift is failing on linux. rdar://problem/64997950
…roduct Add a build product and presets for swift-format.
-sil-inline-never-functions already exists, but it does a substring match. This is not desired all the time. Add -sil-inline-never-function flag that does a full string match and avoids inlining functions with that name
…-from-command-line Dependencies Scanner: report compiled Swift module paths if they are available
…-5.3 AST: address code review comments on isEquivalentToExtendedContext()
…ftlang#32614) * initial changes * Add tests, undo unnecessary changes. * Fixing up computed properties accessors and adding tests for getters. * Adding nested type testcase * Fixing error message for when accessor is referenced but not acutally found. * Cleanup. - Improve diagnostic message. - Clean up code and tests. - Delete unrelated nested type `@derivative` attribute tests. * Temporarily disable class subscript setter derivative registration test. Blocked by SR-13096. * Adding libsyntax integration and fixing up an error message. * Added a helper function for checking if the next token is an accessor label. * Update utils/gyb_syntax_support/AttributeNodes.py Co-authored-by: Dan Zheng <danielzheng@google.com> * Update lib/Parse/ParseDecl.cpp Co-authored-by: Dan Zheng <danielzheng@google.com> * Add end-to-end derivative registration tests. * NFC: run `git clang-format`. * NFC: clean up formatting. Re-apply `git clang-format`. * Clarify parsing ambiguity FIXME comments. * Adding couple of more testcases and fixing up error message for when accessor is not found on functions resolved. * Update lib/Sema/TypeCheckAttr.cpp Co-authored-by: Dan Zheng <danielzheng@google.com> Co-authored-by: Dan Zheng <danielzheng@google.com>
[Clang importer] Remove the OS_object objc_runtime_visible hack
…ment-assert AST: Add more asserts for same-type constraints in generic signatures
…merge # Conflicts: # stdlib/private/StdlibUnittest/RaceTest.swift # stdlib/private/SwiftPrivateThreadExtras/SwiftPrivateThreadExtras.swift # stdlib/private/SwiftPrivateThreadExtras/ThreadBarriers.swift # stdlib/public/Differentiation/TgmathDerivatives.swift.gyb # stdlib/public/runtime/ImageInspectionCOFF.h # stdlib/public/runtime/ImageInspectionCommon.h # stdlib/public/runtime/ImageInspectionELF.cpp # test/ClangImporter/clang_builtins.swift # test/IRGen/builtin_math.swift # test/stdlib/POSIX.swift # test/stdlib/PrintFloat.swift.gyb
MaxDesiatov
changed the title
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.
No description provided.