Fix mangling of '@noDerivative' and unify function attribute mangling operators. #36772

rxwei · 2021-04-06T10:07:05Z

Unify mangling operators for attributes async, @Sendable, and @differentiable under a single Y operator. Free up operators J and j.

async ::= 'Ya'                             // 'async' annotation on function types
sendable ::= 'Yb'                          // @Sendable on function types
throws ::= 'K'                             // 'throws' annotation on function types
differentiable ::= 'Yjf'                   // @differentiable(_forward) on function type
differentiable ::= 'Yjr'                   // @differentiable(reverse) on function type
differentiable ::= 'Yjd'                   // @differentiable on function type
differentiable ::= 'Yjl'                   // @differentiable(_linear) on function type

@noDerivative was not mangled in function types, and was resolved incorrectly when there's an ownership specifier. It is fixed by this patch with the following changes:
- Add NoDerivative demangle node represented by a Yk operator.
```
list-type ::= type identifier? 'Yk'? 'z'? 'h'? 'n'? 'd'?  // type with optional label, '@noDerivative', inout convention, shared convention, owned convention, and variadic specifier
```
- Fix NoDerivative's overflown offset in ParameterTypeFlags (7 -> 6).
- In type decoder and type resolver where attributed type nodes are processed, add support for nested attributed nodes, e.g. inout @noDerivative T.
- Add TypeResolverContext::InoutFunctionInput so that when we resolve an inout @noDerivative T parameter, the @noDerivative T checking logic won't get a TypeResolverContext::None set by the caller.

Resolves rdar://76299796 and rdar://75916833.

rxwei · 2021-04-06T10:07:15Z

@swift-ci please test

swift-ci · 2021-04-06T11:36:20Z

Build failed
Swift Test Linux Platform
Git Sha - 6a1e4e76e4715434758b72d3518a3c6404d040eb

joshnewnham

LGTM

eeckstein

Can you pease not use a top-level operator ('k') for this?
We only have very few left and we should not "waste" them for something which is not critical for symbol sizes.

rxwei · 2021-04-06T18:09:27Z

Can you pease not use a top-level operator ('k') for this?
We only have very few left and we should not "waste" them for something which is not critical for symbol sizes.

Could you suggest an existing operator that I should fold under?

eeckstein · 2021-04-06T18:49:25Z

You can make a sub-operator of 'TJ', e.g. 'TJk'.
BTW, can you also change 'j' to e.g. 'TJj'?

rxwei · 2021-04-06T19:00:18Z

Should the same rationale apply to AsyncAnnotation ('Y')? I could make Y be an umbrella operator for annotations/markers if you think that is appropriate, then Ya could be async and Yk could be @noDerivative.

Similarly, J is currently used only for Node::Kind::ConcurrentFunctionType, which is an annotation just like Node::Kind::DifferentiableFunctionType. I can move both of them under Y/J if there are no objections, e.g. Yj for @Sendable and YJ for @differentiable.

rxwei · 2021-04-07T02:11:38Z

In 3c5b367 I made the change I proposed above. PTAL.

async ::= 'Ya'                             // 'async' annotation on function types
sendable ::= 'Yb'                          // @Sendable on function types
throws ::= 'K'                             // 'throws' annotation on function types
differentiable ::= 'Yjf'                   // @differentiable(_forward) on function type
differentiable ::= 'Yjr'                   // @differentiable(reverse) on function type
differentiable ::= 'Yjd'                   // @differentiable on function type
differentiable ::= 'Yjl'                   // @differentiable(_linear) on function type

DougGregor

Skimmed this, but it LGTM

rxwei · 2021-04-07T04:43:27Z

@swift-ci please test

eeckstein

Thanks, the mangling scheme looks good now.
I just have a few comments on the implementation.

include/swift/Demangling/TypeDecoder.h

lib/Demangling/Demangler.cpp

rxwei · 2021-04-07T08:24:27Z

@swift-ci please test

eeckstein

LGTM, thanks!

rxwei · 2021-04-07T10:13:31Z

@swift-ci please test

swift-ci · 2021-04-07T11:48:58Z

Build failed
Swift Test OS X Platform
Git Sha - b8a5de51e078e6f28fe099d358aeafd90fe88272

`@noDerivative` was not mangled in function types, and was resolved incorrectly when there's an ownership specifier. It is fixed by this patch with the following changes: * Add `NoDerivative` demangle node represented by a `k` operator. ``` list-type ::= type identifier? 'k'? 'z'? 'h'? 'n'? 'd'? // type with optional label, '@noDerivative', inout convention, shared convention, owned convention, and variadic specifier ``` * Fix `NoDerivative`'s overflown offset in `ParameterTypeFlags` (`7` -> `6`). * In type decoder and type resolver where attributed type nodes are processed, add support for nested attributed nodes, e.g. `inout @noDerivative T`. * Add `TypeResolverContext::InoutFunctionInput` so that when we resolve an `inout @noDerivative T` parameter, the `@noDerivative T` checking logic won't get a `TypeResolverContext::None` set by the caller. Resolves rdar://75916833.

rxwei · 2021-04-07T22:45:51Z

@swift-ci please test and merge

@differentiable

…and `@noDerivative`. Repurpose mangling operator `Y` as an umbrella operator that covers new attributes on function types. Free up operators `J`, `j`, and `k`. ``` async ::= 'Ya' // 'async' annotation on function types sendable ::= 'Yb' // @sendable on function types throws ::= 'K' // 'throws' annotation on function types differentiable ::= 'Yjf' // @differentiable(_forward) on function type differentiable ::= 'Yjr' // @differentiable(reverse) on function type differentiable ::= 'Yjd' // @differentiable on function type differentiable ::= 'Yjl' // @differentiable(_linear) on function type ``` Resolves rdar://76299796.

rxwei · 2021-04-08T00:50:04Z

@swift-ci please test and merge

rxwei · 2021-04-08T01:08:50Z

@swift-ci please test macos

rxwei · 2021-04-08T09:27:27Z

@swift-ci please test macos

rxwei requested review from DougGregor and joshnewnham April 6, 2021 10:07

rxwei requested a review from eeckstein April 6, 2021 10:08

joshnewnham approved these changes Apr 6, 2021

View reviewed changes

eeckstein requested changes Apr 6, 2021

View reviewed changes

rxwei changed the title ~~[AutoDiff] Fix mangling of '@noDerivative' in function types.~~ Fix mangling of '@noDerivative' and unify function attribute mangling operators. Apr 7, 2021

rxwei force-pushed the 75916833-noderivative branch from 3c5b367 to f41e130 Compare April 7, 2021 02:29

rxwei requested a review from eeckstein April 7, 2021 02:32

rxwei force-pushed the 75916833-noderivative branch from f41e130 to a626cdb Compare April 7, 2021 02:43

DougGregor approved these changes Apr 7, 2021

View reviewed changes

rxwei force-pushed the 75916833-noderivative branch from a626cdb to 53b5fc9 Compare April 7, 2021 04:42

eeckstein requested changes Apr 7, 2021

View reviewed changes

include/swift/Demangling/TypeDecoder.h Outdated Show resolved Hide resolved

lib/Demangling/Demangler.cpp Outdated Show resolved Hide resolved

lib/Demangling/Demangler.cpp Outdated Show resolved Hide resolved

rxwei force-pushed the 75916833-noderivative branch from 53b5fc9 to 52bf864 Compare April 7, 2021 08:23

eeckstein approved these changes Apr 7, 2021

View reviewed changes

rxwei force-pushed the 75916833-noderivative branch from 52bf864 to b8a5de5 Compare April 7, 2021 10:12

rxwei force-pushed the 75916833-noderivative branch from b8a5de5 to faec5d0 Compare April 7, 2021 22:41

rxwei force-pushed the 75916833-noderivative branch from faec5d0 to 171c92c Compare April 7, 2021 22:45

rxwei force-pushed the 75916833-noderivative branch from 171c92c to fb66de6 Compare April 8, 2021 00:49

rxwei merged commit fd06683 into swiftlang:main Apr 8, 2021

rxwei deleted the 75916833-noderivative branch April 8, 2021 16:40

Fix mangling of '@noDerivative' and unify function attribute mangling operators. #36772

Fix mangling of '@noDerivative' and unify function attribute mangling operators. #36772

Uh oh!

Conversation

rxwei commented Apr 6, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rxwei commented Apr 6, 2021

Uh oh!

swift-ci commented Apr 6, 2021

Uh oh!

joshnewnham left a comment

Choose a reason for hiding this comment

Uh oh!

eeckstein left a comment

Choose a reason for hiding this comment

Uh oh!

rxwei commented Apr 6, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

eeckstein commented Apr 6, 2021

Uh oh!

rxwei commented Apr 6, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rxwei commented Apr 7, 2021

Uh oh!

DougGregor left a comment

Choose a reason for hiding this comment

Uh oh!

rxwei commented Apr 7, 2021

Uh oh!

eeckstein left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

rxwei commented Apr 7, 2021

Uh oh!

eeckstein left a comment

Choose a reason for hiding this comment

Uh oh!

rxwei commented Apr 7, 2021

Uh oh!

swift-ci commented Apr 7, 2021

Uh oh!

rxwei commented Apr 7, 2021

Uh oh!

rxwei commented Apr 8, 2021

Uh oh!

rxwei commented Apr 8, 2021

Uh oh!

rxwei commented Apr 8, 2021

Uh oh!

Uh oh!

rxwei commented Apr 6, 2021 •

edited

Loading

rxwei commented Apr 6, 2021 •

edited

Loading

rxwei commented Apr 6, 2021 •

edited

Loading