Skip to content

Resolve conflicts with master #1582

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1,499 commits into from
Sep 20, 2020
Merged

Resolve conflicts with master #1582

merged 1,499 commits into from
Sep 20, 2020

Conversation

MaxDesiatov
Copy link

No description provided.

LucianoPAlmeida and others added 26 commits September 1, 2020 12:33
…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.
…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 kateinoigakukun marked this pull request as ready for review September 18, 2020 02:58
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.
@kateinoigakukun kateinoigakukun force-pushed the maxd/master-merge branch 2 times, most recently from b269375 to 30f0c21 Compare September 20, 2020 01:11
@kateinoigakukun
Copy link
Member

Finally, CI passed

@MaxDesiatov MaxDesiatov merged commit 26299c8 into swiftwasm Sep 20, 2020
@kateinoigakukun kateinoigakukun deleted the maxd/master-merge branch October 30, 2020 00:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.