Skip to content

Commit 7267d58

Browse files
committed
updates
1 parent ab3b5ad commit 7267d58

File tree

3 files changed

+3
-4
lines changed

3 files changed

+3
-4
lines changed

lib/AST/DeclContext.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -467,7 +467,7 @@ swift::FragileFunctionKindRequest::evaluate(Evaluator &evaluator,
467467
auto effectiveAccess =
468468
VD->getFormalAccessScope(/*useDC=*/nullptr,
469469
/*treatUsableFromInlineAsPublic=*/true);
470-
if (effectiveAccess.isPublic() || effectiveAccess.isPackage()) {
470+
if (effectiveAccess.isPublic()) {
471471
return {FragileFunctionKind::DefaultArgument};
472472
}
473473

lib/SIL/IR/SILWitnessTable.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ bool SILWitnessTable::conformanceIsSerialized(
171171
if (normalConformance && normalConformance->isResilient())
172172
return false;
173173

174-
if (conformance->getProtocol()->getEffectiveAccess() < AccessLevel::Package)
174+
if (conformance->getProtocol()->getEffectiveAccess() < AccessLevel::Public)
175175
return false;
176176

177177
auto *nominal = conformance->getDeclContext()->getSelfNominalTypeDecl();

test/Sema/package_resilience_access.swift

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,9 +143,8 @@ package class PkgKlass: PkgProto {
143143
// UTILS-COMMON-LABEL: // default argument 0 of PkgKlass.init(data:)
144144
// UTILS-COMMON-NEXT: sil [ossa] @$s5Utils8PkgKlassC4dataACSi_tcfcfA_ : $@convention(thin) () -> Int {
145145

146-
// FIXME: __allocating_init for a `package` class should not be serialized in resilient Utils.
147146
// UTILS-COMMON-LABEL: // PkgKlass.__allocating_init(data:)
148-
// UTILS-COMMON-NEXT: sil [serialized] [exact_self_class] [ossa] @$s5Utils8PkgKlassC4dataACSi_tcfC : $@convention(method) (Int, @thick PkgKlass.Type) -> @owned PkgKlass {
147+
// UTILS-COMMON-NEXT: sil [exact_self_class] [ossa] @$s5Utils8PkgKlassC4dataACSi_tcfC : $@convention(method) (Int, @thick PkgKlass.Type) -> @owned PkgKlass {
149148

150149
// UTILS-COMMON-LABEL: // PkgKlass.init(data:)
151150
// UTILS-COMMON-NEXT: sil [ossa] @$s5Utils8PkgKlassC4dataACSi_tcfc : $@convention(method) (Int, @owned PkgKlass) -> @owned PkgKlass {

0 commit comments

Comments
 (0)