@@ -470,9 +470,6 @@ struct GenericSignatureBuilder::Implementation {
470
470
// / Whether there were any errors.
471
471
bool HadAnyError = false ;
472
472
473
- // / FIXME: Hack to work around a small number of minimization bugs.
474
- bool HadAnyRedundantConstraints = false ;
475
-
476
473
#ifndef NDEBUG
477
474
// / Whether we've already finalized the builder.
478
475
bool finalized = false ;
@@ -5870,7 +5867,6 @@ Constraint<T> GenericSignatureBuilder::checkConstraintList(
5870
5867
case ConstraintRelation::Redundant:
5871
5868
// If this requirement is not derived or inferred (but has a useful
5872
5869
// location) complain that it is redundant.
5873
- Impl->HadAnyRedundantConstraints = true ;
5874
5870
if (constraint.source ->shouldDiagnoseRedundancy (true ) &&
5875
5871
representativeConstraint &&
5876
5872
representativeConstraint->source ->shouldDiagnoseRedundancy (false )) {
@@ -7204,10 +7200,7 @@ GenericSignature GenericSignatureBuilder::computeGenericSignature(
7204
7200
// will produce the same thing.
7205
7201
//
7206
7202
// We cannot do this when there were errors.
7207
- // FIXME: The HadAnyRedundantConstraints bit is a hack because we are
7208
- // over-minimizing.
7209
- if (allowBuilderToMove && !Impl->HadAnyError &&
7210
- !Impl->HadAnyRedundantConstraints ) {
7203
+ if (allowBuilderToMove && !Impl->HadAnyError ) {
7211
7204
// Register this generic signature builder as the canonical builder for the
7212
7205
// given signature.
7213
7206
Context.registerGenericSignatureBuilder (sig, std::move (*this ));
0 commit comments