[Mangling] Include private discriminators in constructor manglings #9880
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
jrose-apple
force-pushed
the
private-init-mangling
branch
from
14f0bdd to
20fe54c
Compare
jrose-apple
changed the title
jrose-apple
force-pushed
the
private-init-mangling
branch
from
20fe54c to
20365a9
Compare
|
@swift-ci Please test |
|
@swift-ci Please test Linux |
jrose-apple
force-pushed
the
private-init-mangling
branch
from
20365a9 to
55462f1
Compare
|
Already passed full testing before I added more tests. @swift-ci Please smoke test |
eeckstein
requested changes
May 30, 2017
docs/ABI.rst
Outdated
| entity-spec ::= type 'fC' // allocating constructor | ||
| entity-spec ::= type 'fc' // non-allocating constructor | ||
| entity-spec ::= file-discriminator? type 'fC' // allocating constructor | ||
| entity-spec ::= file-discriminator? type 'fc' // non-allocating constructor |
There was a problem hiding this comment.
It's better to add the optional discriminator after the type:
entity-spec ::= type file-discriminator? 'fc'
Having optional terms at the beginning of a rule can be problematic because when demangling it's not clear if they belong to that rule or to then "enclosing" rule.
For the file-discriminator it's actually not a problem because it's not used elsewhere. But to be consistent (and future prove) I'd prefer to change it.
Alternatively you could also just add a new character to 'f' instead of file-discriminator
entity-spec ::= type identifier 'fB' // allocating file-discriminated constructor
entity-spec ::= type identifier 'fb' // non-allocating file-discriminated constructor
Previously, two constructors with the same full name and argument types would get identical manglings even if they were declared 'private' or 'fileprivate' in different files. This would lead to symbol collisions in whole-module builds. Add a new mangling node for private discriminators on base-name-less decls to make this unique. This still doesn't fix the existing issue with private members, named or not, conflicting when they're in the /same/ file, but since Swift 4 makes those members visible to one another (SE-0169) that's only an issue in Swift 3 mode anyway, and as such probably won't get fixed at all. rdar://problem/27758199
jrose-apple
force-pushed
the
private-init-mangling
branch
from
55462f1 to
7ff8e0b
Compare
|
@swift-ci Please smoke test |
eeckstein
approved these changes
Jun 1, 2017
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.
Previously, two constructors with the same full name and argument types would get identical manglings even if they were declared
privateorfileprivatein different files. This would lead to symbol collisions in whole-module builds. Add a new mangling node for private discriminators on base-name-less decls to make this unique.This still doesn't fix the existing issue with private members, named or not, conflicting when they're in the same file, but since Swift 4 makes those members visible to one another (SE-0169) that's only an issue in Swift 3 mode anyway, and as such probably won't get fixed at all.
rdar://problem/27758199