Skip to content

Commit a5df356

Browse files
authored
Merge pull request #71730 from slavapestov/is-bindable-visitor
AST: Remove unused computation from IsBindableVisitor
2 parents 5d59985 + 8f939c4 commit a5df356

File tree

4 files changed

+42
-227
lines changed

4 files changed

+42
-227
lines changed

include/swift/AST/Types.h

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1146,25 +1146,16 @@ class alignas(1 << TypeAlignInBits) TypeBase
11461146
/// function with each archetype-to-substituted-type binding. The callback
11471147
/// may return a new type to substitute into the result type, or return
11481148
/// CanType() to error out of the operation. Each invocation of the callback
1149-
/// receives three arguments:
1149+
/// receives two arguments:
11501150
/// - The `orig` archetype from a position in `this` type.
1151-
/// - The `subst` type in the same structural position of `ty` that is trying to be bound
1152-
/// to `orig`.
1153-
/// - The `upperBound` archetype, which if set, indicates the minimum set of constraints
1154-
/// that any type substituted in this structural position must conform to. May be null,
1155-
/// indicating an unconstrained context.
1156-
/// - If `upperBound` is set, then the `substConformances` array will contain the
1157-
/// protocol conformances for `subst` to each of the protocol requirements
1158-
/// on `upperBound` in `getConformsTo` order.
1151+
/// - The `subst` type in the same structural position of `ty` that is trying
1152+
/// to be bound to `orig`.
11591153
///
11601154
/// Returns the substituted type, or a null CanType() if this type
11611155
/// is not bindable to the substituted type, or the callback returns
11621156
/// CanType().
11631157
CanType substituteBindingsTo(Type ty,
1164-
llvm::function_ref<CanType(ArchetypeType *orig,
1165-
CanType subst,
1166-
ArchetypeType *upperBound,
1167-
ArrayRef<ProtocolConformanceRef> substConformances)> substFn);
1158+
llvm::function_ref<CanType(ArchetypeType *orig, CanType subst)> substFn);
11681159

11691160
/// Determines whether this type is similar to \p other as defined by
11701161
/// \p matchOptions.

0 commit comments

Comments
 (0)