averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

[AutoDiff] Fix incorrectly sorted members of synthesized 'TangentVector'. (#36154)

Browse Source 
Do not mark synthesized `TangentVector` members as synthesized so that the type checker won't sort them. We would like tangent vector members to have the same order as the properties in the parent declaration.

Also add `typealias TangentVector = Self` to the synthesized `TangentVector` so that it will not need its own `Differentiable` conformance derivation.

Resolves SR-14241 / rdar://74659803.
This commit is contained in:
Richard Wei
2021-02-26 15:35:31 -05:00
committed by GitHub
parent 1620f2cb49
commit 66ede5a7b3
2 changed files with 47 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
lib/Sema/DerivedConformanceDifferentiable.cpp
View File

@@ -40,7 +40,7 @@ using namespace swift;
/// If the given property is a `var`, return true because `move(by:)` can be
/// invoked regardless. Otherwise, return true if and only if the property's
/// type's 'Differentiable.move(by:)' witness is non-mutating.
static bool canInvokeMoveAlongOnProperty(
static bool canInvokeMoveByOnProperty(
VarDecl *vd, ProtocolConformanceRef diffableConformance) {
assert(diffableConformance && "Property must conform to 'Differentiable'");
// `var` always supports `move(by:)` since it is mutable.
@@ -64,7 +64,7 @@ static void
getStoredPropertiesForDifferentiation(
NominalTypeDecl *nominal, DeclContext *DC,
SmallVectorImpl<VarDecl *> &result,
bool includeLetPropertiesWithNonmutatingMoveAlong = false) {
bool includeLetPropertiesWithNonmutatingMoveBy = false) {
auto &C = nominal->getASTContext();
auto *diffableProto = C.getProtocol(KnownProtocolKind::Differentiable);
for (auto *vd : nominal->getStoredProperties()) {
@@ -90,8 +90,8 @@ getStoredPropertiesForDifferentiation(
// Skip `let` stored properties with a mutating `move(by:)` if requested.
// `mutating func move(by:)` cannot be synthesized to update `let`
// properties.
if (!includeLetPropertiesWithNonmutatingMoveAlong &&
!canInvokeMoveAlongOnProperty(vd, conformance))
if (!includeLetPropertiesWithNonmutatingMoveBy &&
!canInvokeMoveByOnProperty(vd, conformance))
continue;
result.push_back(vd);
}
@@ -450,9 +450,9 @@ getOrSynthesizeTangentVectorStruct(DerivedConformance &derived, Identifier id) {
auto *tangentProperty = new (C) VarDecl(
member->isStatic(), member->getIntroducer(),
/*NameLoc*/ SourceLoc(), member->getName(), structDecl);
tangentProperty->setSynthesized();
// Note: `tangentProperty` is not marked as implicit here, because that
// incorrectly affects memberwise initializer synthesis.
// Note: `tangentProperty` is not marked as implicit or synthesized here,
// because that incorrectly affects memberwise initializer synthesis and
// causes the type checker to not guarantee the order of these members.
auto memberContextualType =
parentDC->mapTypeIntoContext(member->getValueInterfaceType());
auto memberTanType =
@@ -507,20 +507,27 @@ getOrSynthesizeTangentVectorStruct(DerivedConformance &derived, Identifier id) {
}
}
// If nominal type is `@_fixed_layout`, also mark `TangentVector` struct as
// `@_fixed_layout`.
if (nominal->getAttrs().hasAttribute<FixedLayoutAttr>())
addFixedLayoutAttr(structDecl);
// If nominal type is `@frozen`, also mark `TangentVector` struct as
// `@frozen`.
// If nominal type is `@frozen`, also mark `TangentVector` struct.
if (nominal->getAttrs().hasAttribute<FrozenAttr>())
structDecl->getAttrs().add(new (C) FrozenAttr(/*implicit*/ true));
// Add `typealias TangentVector = Self` so that the `TangentVector` itself
// won't need its own conformance derivation.
auto *tangentEqualsSelfAlias = new (C) TypeAliasDecl(
SourceLoc(), SourceLoc(), C.Id_TangentVector, SourceLoc(),
/*GenericParams*/ nullptr, structDecl);
tangentEqualsSelfAlias->setUnderlyingType(structDecl->getSelfTypeInContext());
tangentEqualsSelfAlias->setAccess(structDecl->getFormalAccess());
tangentEqualsSelfAlias->setImplicit();
tangentEqualsSelfAlias->setSynthesized();
structDecl->addMember(tangentEqualsSelfAlias);
// If nominal type is `@usableFromInline`, also mark `TangentVector` struct as
// `@usableFromInline`.
if (nominal->getAttrs().hasAttribute<UsableFromInlineAttr>())
// If nominal type is `@usableFromInline`, also mark `TangentVector` struct.
if (nominal->getAttrs().hasAttribute<UsableFromInlineAttr>()) {
structDecl->getAttrs().add(new (C) UsableFromInlineAttr(/*implicit*/ true));
tangentEqualsSelfAlias->getAttrs().add(
new (C) UsableFromInlineAttr(/*implicit*/ true));
}
// The implicit memberwise constructor must be explicitly created so that it
// can called in `AdditiveArithmetic` and `Differentiable` methods. Normally,
@@ -593,7 +600,7 @@ static void checkAndDiagnoseImplicitNoDerivative(ASTContext &Context,
TypeChecker::conformsToProtocol(varType, diffableProto, nominal);
// If stored property should not be diagnosed, continue.
if (diffableConformance &&
canInvokeMoveAlongOnProperty(vd, diffableConformance))
canInvokeMoveByOnProperty(vd, diffableConformance))
continue;
// Otherwise, add an implicit `@noDerivative` attribute.
vd->getAttrs().add(new (Context) NoDerivativeAttr(/*Implicit*/ true));