Serialization: Recover from failure to deserialize inheritance clause entries #24912
Conversation
slavapestov
force-pushed
the
drop-inherited-clause-entries
branch
from
f853af0 to
939a248
Compare
| handleInherited(theEnum, | ||
| rawInheritedAndDependencyIDs.slice(0, numInheritedTypes)); | ||
| auto rawInheritedIDs = rawInheritedAndDependencyIDs.slice(0, numInherited); | ||
| handleInherited(theEnum, rawInheritedIDs); |
There was a problem hiding this comment.
I just merged the class and struct versions for this, so you can switch to it if you want.
|
|
||
| public struct S : PrivateProtocol, PublicProtocol {} | ||
| public enum E : PrivateProtocol, PublicProtocol {} | ||
| public class C : PrivateProtocol, PublicProtocol {} |
There was a problem hiding this comment.
Needs an extension test case that doesn't involve nested types. I wonder if just asking swift-ide-test to print the module will have the right balance of "deserialize all the things, but don't do any lookups".
| if (!module) | ||
| module = getAssociatedModule(); | ||
| return llvm::make_error<XRefNonLoadedModuleError>(getIdentifier(moduleID)); | ||
|
|
||
| SmallVector<ProtocolConformance *, 2> conformances; | ||
| nominal->lookupConformance(module, proto, conformances); | ||
| PrettyStackTraceModuleFile traceMsg( | ||
| "If you're seeing a crash here, check that your SDK and dependencies " | ||
| "are at least as new as the versions used to build", *this); |
There was a problem hiding this comment.
When this is working, this crash message can go away, since it's going to recover.
| auto conf = readConformance(DeclTypeCursor); | ||
| auto maybeConf = readConformanceChecked(DeclTypeCursor); | ||
| if (!maybeConf) { | ||
| llvm::consumeError(maybeConf.takeError()); |
There was a problem hiding this comment.
This absolutely can't happen until we can drop BoundGenericTypes that rely on the conformance. :-(
slavapestov
force-pushed
the
drop-inherited-clause-entries
branch
from
939a248 to
8875b48
Compare
|
Here's a new version with the first commit only, and a test case that use swift-ide-test to trigger extension deserialization but not member lookup. |
|
@swift-ci Please smoke test |
|
Can you make sure this doesn't recover transparently for protocols? I don't want to introduce miscompiles. |
… entries ... by dropping them. Fixes <rdar://problem/50473619>.
slavapestov
force-pushed
the
drop-inherited-clause-entries
branch
from
8875b48 to
5b2211d
Compare
|
@jrose-apple Done. |
|
@swift-ci Please smoke test |
|
@swift-ci Please test source compatibility |
... by dropping them.
Fixes rdar://problem/50473619.