[Serialization] Improve extensions of nested types with the same name #7397
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
|
This looks like it needs a rebase? Excellent work though :) |
|
Yeah, it's "just" the module format version but I'm taking the opportunity to retest locally. Thanks! |
jrose-apple
force-pushed
the
these-and-only-these-extensions
branch
from
aabe0de to
087e2ff
Compare
|
@swift-ci Please test |
|
Build failed |
|
Build failed |
DougGregor
approved these changes
Feb 13, 2017
| @@ -128,12 +128,16 @@ class Serializer { | |||
|
|
|||
| // In-memory representation of what will eventually be an on-disk | |||
| // hash table of all defined Objective-C methods. | |||
| using ObjCMethodTable = llvm::DenseMap<ObjCSelector, ObjCMethodTableData>; | |||
| using ObjCMethodTable = llvm::MapVector<ObjCSelector, ObjCMethodTableData>; | |||
Previously looking up an extension would result in all extensions for types with the same name (nested or not) being deserialized; this could even bring in base types that had not been deserialized yet. Add in a string to distinguish an extension's base type; in the top-level case this is just a module name, but for nested types it's a full mangled name. This is a little heavier than I'd like it to be, since it means we mangle names and then throw them away, and since it means there's a whole bunch of extra string data in the module just for uniquely identifying a declaration. But it's correct, and does less work than before, and fixes a circularity issue with a nested type A.B.A that apparently used to work. https://bugs.swift.org/browse/SR-3915
jrose-apple
force-pushed
the
these-and-only-these-extensions
branch
from
087e2ff to
9d82c1e
Compare
|
@swift-ci Please smoke test |
jrose-apple
added a commit
to jrose-apple/swift
that referenced
this pull request
Feb 13, 2017
…swiftlang#7397) Previously looking up an extension would result in all extensions for types with the same name (nested or not) being deserialized; this could even bring in base types that had not been deserialized yet. Add in a string to distinguish an extension's base type; in the top-level case this is just a module name, but for nested types it's a full mangled name. This is a little heavier than I'd like it to be, since it means we mangle names and then throw them away, and since it means there's a whole bunch of extra string data in the module just for uniquely identifying a declaration. But it's correct, and does less work than before, and fixes a circularity issue with a nested type A.B.A that apparently used to work. https://bugs.swift.org/browse/SR-3915
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 looking up an extension would result in all extensions for types with the same name (nested or not) being deserialized; this could even bring in base types that had not been deserialized yet. Add in a string to distinguish an extension's base type; in the top-level case this is just a module name, but for nested types it's a full mangled name.
This is a little heavier than I'd like it to be, since it means we mangle names and then throw them away, and since it means there's a whole bunch of extra string data in the module just for uniquely identifying a declaration. But it's correct, and does less work than before, and fixes a circularity issue with a nested type A.B.A that apparently used to work.
SR-3915