Skip to content

Commit 6d96447

Browse files
committed
[Typechecker] PropertyWrapperMutabilityRequest should not return None when parsing getter/setter from swiftinterface file
1 parent 1264c56 commit 6d96447

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

lib/Sema/TypeCheckStorage.cpp

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2263,9 +2263,15 @@ PropertyWrapperMutabilityRequest::evaluate(Evaluator &,
22632263
isProjectedValue = true;
22642264
}
22652265

2266-
if (var->getParsedAccessor(AccessorKind::Get))
2266+
// Make sure we don't ignore .swiftinterface files, because those will
2267+
// have the accessors printed
2268+
auto varSourceFile = var->getDeclContext()->getParentSourceFile();
2269+
auto isVarNotInInterfaceFile =
2270+
varSourceFile && varSourceFile->Kind != SourceFileKind::Interface;
2271+
2272+
if (var->getParsedAccessor(AccessorKind::Get) && isVarNotInInterfaceFile)
22672273
return None;
2268-
if (var->getParsedAccessor(AccessorKind::Set))
2274+
if (var->getParsedAccessor(AccessorKind::Set) && isVarNotInInterfaceFile)
22692275
return None;
22702276

22712277
// Figure out which member we're looking through.

0 commit comments

Comments
 (0)