Skip to content

[5.1] Allow inheritance from resilient classes with missing members #24914

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
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion lib/Sema/TypeCheckDecl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2754,7 +2754,9 @@ class DeclChecker : public DeclVisitor<DeclChecker> {
break;
}

if (!isInvalidSuperclass && Super->hasMissingVTableEntries()) {
if (!isInvalidSuperclass && Super->hasMissingVTableEntries() &&
!Super->isResilient(CD->getParentModule(),
ResilienceExpansion::Minimal)) {
auto *superFile = Super->getModuleScopeContext();
if (auto *serialized = dyn_cast<SerializedASTFile>(superFile)) {
if (serialized->getLanguageVersionBuiltWith() !=
Expand Down
52 changes: 52 additions & 0 deletions test/decl/class/override-implementationOnly.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
// RUN: %empty-directory(%t)

// For convenience, this file includes the three different "files" used in this
// test. It selects one with -DCoreDishwasher, -DDishwasherKit, or neither.

// RUN: %target-swift-frontend -emit-module %s -DCoreDishwasher -module-name CoreDishwasher -o %t/CoreDishwasher -emit-module-path %t/CoreDishwasher.swiftmodule -I %t
// RUN: %target-swift-frontend -emit-module %s -DDishwasherKit -module-name DishwasherKit -o %t/DishwasherKit -emit-module-path %t/DishwasherKit.swiftmodule -enable-library-evolution -I %t
// RUN: %target-typecheck-verify-swift -I %t

#if CoreDishwasher

public struct SpimsterWicket {
public init() {}
}

#elseif DishwasherKit

@_implementationOnly import CoreDishwasher

open class Dishwasher {
public init() {}

var wicket = SpimsterWicket()

open var modelName: String { "Dishwasher" }
}

open class NoUserServiceablePartsInside {
public init() {}
internal init(wicket: SpimsterWicket) {}
public convenience init(inconvenient: ()) {
self.init()
}
}

#else

import DishwasherKit

class FancyDishwasher: Dishwasher {
override var modelName: String { "Fancy \(super.modelName)" }
}

class VoidedWarranty: NoUserServiceablePartsInside {
override init() { super.init() }
}

// FIXME: This diagnostic should be better, but it matches what we're already
// doing for disallowed convenience inits.
let notAllowed = VoidedWarranty(inconvenient: ()) // expected-error{{argument passed to call that takes no arguments}}

#endif