[Serialization] Drop overriding relationship in constructors when safe #63266
Conversation
|
@swift-ci Please smoke test |
| if (overriddenOrError) { | ||
| overridden = overriddenOrError.get(); | ||
| } else { | ||
| if (overriddenAffectsABI || !ctx.LangOpts.EnableDeserializationRecovery) { |
There was a problem hiding this comment.
Could we set overridden = nullptr if we're allowing compiler errors in this case (ie. MF.allowCompilerErrors)?
| if (firstTimeRequired && overridden->isRequired()) | ||
| firstTimeRequired = false; | ||
| } | ||
| bool overriddenAffectsABI = overriddenDeclAffectsABI(ctor, overridden); |
There was a problem hiding this comment.
Is the relationship actually useful if it doesn't?
There was a problem hiding this comment.
That's a good question. For non-resilient modules it could be used by optimizations. For resilient modules in most cases it should now be dropped by deserialization safety for the public-override-internal case, and the clang case is there more as tolerance for poor modularization and such I believe. I think we could try always dropping it when reading from a resilient module.
xymus
force-pushed
the
public-ctor-override-internal
branch
from
f7e2d14 to
963748b
Compare
Deserialization recovery lead the compiler to drop public constructors overridding internal constructors. This limits the logic to dropping the overriding relationship instead of the whole constructor. This applies when the overriden constructor fails to deserialize and only when the overriding relationship was marked as not affecting ABI. rdar://104704832
At deserialization, we can drop the overriding relationship if the overriden decl is internal and only when the overrider is in a resilient module.
xymus
force-pushed
the
public-ctor-override-internal
branch
from
963748b to
e3206ba
Compare
|
@swift-ci Please smoke test |
xymus
force-pushed
the
public-ctor-override-internal
branch
from
e3206ba to
2d8f075
Compare
|
@swift-ci Please smoke test |
|
@swift-ci please smoke test macOS |
Deserialization recovery lead the compiler to drop public constructors overriding internal constructors. This PR limits the logic to dropping only the overriding relationship instead of the whole constructor. This applies when the overriden constructor fails to deserialize and only when the overriding relationship was marked as not affecting ABI. This should realign the behavior between swiftmodules and swiftinterfaces.
rdar://104704832
Fixes: #63242
This is the equivalent of #63068 for constructors.