Resolve conflicts with master
#1582
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
MaxDesiatov
commented
Aug 28, 2020
kateinoigakukun
force-pushed
the
maxd/master-merge
branch
from
4729044 to
4456632
Compare
MaxDesiatov
force-pushed
the
maxd/master-merge
branch
from
6c39f53 to
9011e9d
Compare
…a root unwrapped members
…oy-root-class DI: Correctly handle conditional destroy of 'self' in root class
[CSBindings] Delay binding chain result if type is an optional of a…
Report the use of conformances declared as SPI in public declarations and inlinable code. rdar://problem/66659715
…-completion-keypath-optional [CodeCompletion] Do not offer completion Wrapped members for optional key path root type
…ze-has-cref [Serialization] Serialize hasCReferences to keep linkage
…nt generation failures Ignore function builder body if it emits at least one diagnostic during constraint generation. Resolves: rdar://problem/65983237
Generalize `ClassDecl::getEmittedMembers()` to operate on an `IterableDeclContext`, so that it can be for other nominal types, extensions, etc. Rename to `getSemanticMembers()` to indicate that these are all of the members that are semantically part of that context. Clean up the implementation slightly so it only forces type checking for the conformances within that particular context (using `getLocalConformances()`) and doesn't need to list out each of the protocols it cares about.
…pagation SILCombine: fix an assertion crash in SILCombine when casting AnyClass to Any
Provide an accessor for retrieving the parsed members, generalizing `ParseMembersRequest` so it can provide the parsed members for deserialized/synthesized declarations as well. This is the counterpart to the recently-generalized `getSemanticMembers()`; together, these should suffice for most (all?) clients of `getMembers()`.
We need ClangImporterOptions to be persistent for several scenarios: (1) when creating a sub-ASTContext to build Swift modules from interfaces; and (2) when creating a new Clang instance to invoke Clang dependencies scanner. This change is NFC.
…on (ep2). Fixes rdar://67704000.
…quest EmittedMembersRequest needs a stable order for synthesized members to ensure that vtable layout is computed consistently across frontend jobs. This used to use the mangled name as the sort key. However, the mangling includes the type of all outer contexts, and if an outer type is a closure, we would need to compute the type of the closure. Computing the type of a closure might require type checking its body though, which would in turn type check the local class, which would invoke EmittedMembersRequest, introducing a cycle. Instead, let's use the DeclName and string-ified type as the sort key. This is simpler to compute than th mangled name, and breaks the cycle. Fixes <rdar://problem/67842221>.
…tlang#33745) Set those at the value pre swiftlang#33388 -- this would avoid regressions of disk space usage (in particular around building Swift LTO) Addresses rdar://68091272
…12e757a0517d02574d48203 [semantic-arc] Split out owned -> guaranteed phi opt into its own file.
…g decls in SIL for debug_value. Instead, in such a case, we use the name on the debug_value instead and just use as the loc the debug_value itself. This will let me write SIL test cases for opt-remark-gen. I am going to add SIL test cases for future changes (as well as swift ones) using this technique. I am going to in forthcoming commits fill in some tests for the current opt-remark-generation here. I just want to get in this part.
kateinoigakukun
force-pushed
the
maxd/master-merge
branch
from
69c16be to
a74f7b2
Compare
This avoids to conflict between static and shared module.map of CoreFoundation. The shared version of Foundation module.map doesn't require linking CoreFoundation, but build-foundation overwrite the shared version with static version.
This reverts commit 50ec5f6.
kateinoigakukun
force-pushed
the
maxd/master-merge
branch
2 times, most recently
from
b269375 to
30f0c21
Compare
kateinoigakukun
force-pushed
the
maxd/master-merge
branch
from
30f0c21 to
a0db7cb
Compare
|
Finally, CI passed |
kateinoigakukun
approved these changes
Sep 20, 2020
This was referenced Sep 30, 2020
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.