Skip to content

Commit 0b235a7

Browse files
authored
[AutoDiff[ Preserve substitutions maps while calculating derivative types (#65451)
The substituon map might contain proper specialization (e.g. t_0_0 -> Double) that is required to fully specify a derivate type (e.g. during reabstraction conversion from fully specified function type to a substituted one) Fixes #65073
1 parent 006537e commit 0b235a7

File tree

2 files changed

+31
-3
lines changed

2 files changed

+31
-3
lines changed

lib/SIL/IR/SILFunctionType.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -855,7 +855,7 @@ static SILFunctionType *getConstrainedAutoDiffOriginalFunctionType(
855855
original->getExtInfo(), original->getCoroutineKind(),
856856
original->getCalleeConvention(), newParameters, original->getYields(),
857857
newResults, original->getOptionalErrorResult(),
858-
/*patternSubstitutions*/ SubstitutionMap(),
858+
original->getPatternSubstitutions(),
859859
/*invocationSubstitutions*/ SubstitutionMap(), original->getASTContext(),
860860
original->getWitnessMethodConformanceOrInvalid());
861861
}
@@ -945,12 +945,12 @@ CanSILFunctionType SILFunctionType::getAutoDiffDerivativeFunctionType(
945945
// Put everything together to get the derivative function type. Then, store in
946946
// cache and return.
947947
cachedResult = SILFunctionType::get(
948-
constrainedOriginalFnTy->getSubstGenericSignature(), extInfo,
948+
constrainedOriginalFnTy->getInvocationGenericSignature(), extInfo,
949949
constrainedOriginalFnTy->getCoroutineKind(),
950950
constrainedOriginalFnTy->getCalleeConvention(), newParameters,
951951
constrainedOriginalFnTy->getYields(), newResults,
952952
constrainedOriginalFnTy->getOptionalErrorResult(),
953-
/*patternSubstitutions*/ SubstitutionMap(),
953+
constrainedOriginalFnTy->getPatternSubstitutions(),
954954
/*invocationSubstitutions*/ SubstitutionMap(),
955955
constrainedOriginalFnTy->getASTContext(),
956956
constrainedOriginalFnTy->getWitnessMethodConformanceOrInvalid());
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
// RUN: %target-swift-frontend -emit-sil -O %s
2+
3+
// Fix for https://github.com/apple/swift/issues/65073:
4+
// We need to ensure we are not dropping the substitution map during the
5+
// derivative type calculation in sil combiner that causes errors in the
6+
// subsequent optimizations as we're ending with invalid "recursive"
7+
// subsitutions
8+
9+
import _Differentiation;
10+
11+
@differentiable(reverse)
12+
func f(array: [Double]) -> Double {
13+
var array = array
14+
for index in withoutDerivative(at: 0 ..< array.count) {array.update(at: index, byCalling: { (element: inout Double) in let initialElement = element; for _ in withoutDerivative(at: 0 ..< index) {element *=
15+
initialElement}})}
16+
return 0.0
17+
}
18+
public func valueWithPullback<T>(at x: T, of f: @differentiable(reverse) (inout T) -> Void) -> (value: Void, pullback: (inout T.TangentVector) -> Void) {fatalError()}
19+
public func pullback<T>(at x: T, of f: @differentiable(reverse) (inout T) -> Void) -> (inout T.TangentVector) -> Void {return valueWithPullback(at: x, of: f).pullback}
20+
public extension Array {@differentiable(reverse) mutating func update(at index: Int, byCalling closure: @differentiable(reverse) (inout Element) -> Void) where Element: Differentiable {closure(&self[index])}}
21+
public extension Array where Element: Differentiable {
22+
@derivative(of: update(at:byCalling:))
23+
mutating func vjpUpdate(at index: Int,byCalling closure: @differentiable(reverse) (inout Element) -> Void) -> (value: Void, pullback: (inout Self.TangentVector) -> Void){
24+
let closurePullback = pullback(at: self[index], of: closure)
25+
return (value: (), pullback: { closurePullback(&$0.base[index]) })
26+
}
27+
}
28+
public struct D<I: Equatable, D> {public subscript(_ index: I) -> D? {get {fatalError()} set {fatalError()}}}

0 commit comments

Comments
 (0)