Add ASTScope support for @differentiable attribute.
#27451
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
`@differentiable` attribute where clauses may refer to generic parameters from some generic context. Without special ASTScope support for `@differentiable` attributes, ASTScopeLookup.cpp logic tries to resolve the generic parameter DeclNames in the where clause based on source location alone (`ASTScopeImpl::findChildContaining`) and fails. The fix is to add a special `DifferentiableAttributeScope`, mimicking `SpecializeAttributeScope`. Every `@differentiable` attribute has its own scope, derived from the declaration on which it is declared. Unlike `@_specialize`, `@differentiable` may also be declared on `AbstractStorageDecl` declarations (subscripts and variables). Resolves TF-815.
`Decl::getSourceRangeIncludingAttrs` should not consider implicit `@differentiable` attributes generated during `@differentiating` attribute type-checking. TF-835 tracks robust lowering for `@differentiating` attributes that does not involve generating implicit `@differentiable` attributes, circumventing this issue.
|
cc @davidungar: your review would be appreciated!
@differentiable(where T: Differentiable)
func id<T>(_ x: T) -> T { x }I mostly copied logic from |
|
@swift-ci Please test tensorflow |
dan-zheng
commented
Oct 1, 2019
| if ((false)) { | ||
| // if (useASTScopesForLookup()) { | ||
| // SWIFT_ENABLE_TENSORFLOW END | ||
| if (useASTScopesForLookup()) { |
There was a problem hiding this comment.
Note: this reverts an earlier workaround hack.
|
There's one remaining test failure, which is known and orthogonal. EDIT: macOS has one additional failure:
|
rxwei
approved these changes
Oct 1, 2019
burmako
approved these changes
Oct 1, 2019
BradLarson
approved these changes
Oct 1, 2019
dan-zheng
added a commit
to dan-zheng/swift
that referenced
this pull request
Jan 13, 2020
`@differentiable` attributes may contain `where` clauses referencing generic parameters from some generic context, just like `@_specialize` attributes. Without special ASTScope support for `@differentiable` attributes, ASTScopeLookup.cpp logic tries to resolve the generic parameter `DeclName`s in `where` clauses based on source location alone (`ASTScopeImpl::findChildContaining`) and fails. The fix is to add a special `DifferentiableAttributeScope`, mimicking `SpecializeAttributeScope`. Every `@differentiable` attribute has its own scope, derived from the declaration on which it is declared. Unlike `@_specialize`, `@differentiable` may also be declared on `AbstractStorageDecl` declarations (subscripts and variables). Upstreams swiftlang#27451. Progress towards TF-828: upstream `@differentiable` attribute type-checking.
dan-zheng
added a commit
that referenced
this pull request
Jan 14, 2020
`@differentiable` attributes may contain `where` clauses referencing generic parameters from some generic context, just like `@_specialize` attributes. Without special ASTScope support for `@differentiable` attributes, ASTScopeLookup.cpp logic tries to resolve the generic parameter `DeclName`s in `where` clauses based on source location alone (`ASTScopeImpl::findChildContaining`) and fails. The fix is to add a special `DifferentiableAttributeScope`, mimicking `SpecializeAttributeScope`. Every `@differentiable` attribute has its own scope, derived from the declaration on which it is declared. Unlike `@_specialize`, `@differentiable` may also be declared on `AbstractStorageDecl` declarations (subscripts and variables). Upstreams #27451. Progress towards TF-828: upstream `@differentiable` attribute type-checking.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
@differentiableattribute where clauses may refer to genericparameters from some generic context.
Without special ASTScope support for
@differentiableattributes,ASTScopeLookup.cpplogic tries to resolve the generic parameterDeclNames in the where clause based on source location alone
(
ASTScopeImpl::findChildContaining) and fails.The fix is to add a special
DifferentiableAttributeScope, mimickingSpecializeAttributeScope. Every@differentiableattribute has itsown scope, derived from the declaration on which it is declared.
Unlike
@_specialize,@differentiablemay also be declared onAbstractStorageDecldeclarations (subscripts and variables).Resolves TF-815.
Decl::getSourceRangeIncludingAttrsshould not consider implicit@differentiableattributes generated during@differentiatingattribute type-checking.
TF-835 tracks robust lowering for
@differentiatingattributesthat does not involve generating implicit
@differentiableattributes,circumventing this issue.
Unblocks
swift-DEVELOPMENT-SNAPSHOT-2019-09-24-amerge intotensorflow.