File tree Expand file tree Collapse file tree 1 file changed +4
-6
lines changed Expand file tree Collapse file tree 1 file changed +4
-6
lines changed Original file line number Diff line number Diff line change @@ -3095,14 +3095,12 @@ bool swift::conflicting(const OverloadSignature& sig1,
3095
3095
// versions, as that is what the async overloading aimed to address.
3096
3096
//
3097
3097
// Note also, that overloading on throws is already illegal anyway.
3098
- if (sig1.IsDistributed || sig2.IsDistributed ) {
3099
- if (sig1.IsAsyncFunction != sig2.IsAsyncFunction )
3100
- return true ;
3101
- } else {
3102
- // Otherwise one is an async function and the other is not, they don't conflict.
3098
+ if (!sig1.IsDistributed && !sig2.IsDistributed ) {
3099
+ // For non-distributed functions,
3100
+ // if one is an async function and the other is not, they don't conflict.
3103
3101
if (sig1.IsAsyncFunction != sig2.IsAsyncFunction )
3104
3102
return false ;
3105
- }
3103
+ } // else, if any of the methods was distributed, continue checking
3106
3104
3107
3105
// If one is a macro and the other is not, they can't conflict.
3108
3106
if (sig1.IsMacro != sig2.IsMacro )
You can’t perform that action at this time.
0 commit comments