---

yaml
---
r: 326647
b: refs/heads/tensorflow
c: df47d1b
h: refs/heads/master
i:
  326645: 71fb207
  326643: 88ecd43
  326639: edf8aef

Author: xedin

[refs]

@@ -816,7 +816,7 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2018-04-25-a: 22f738a831d43aff2b9c9773bcb65
 refs/tags/swift-DEVELOPMENT-SNAPSHOT-2018-05-08-a: 7d98cc16689baba5c8a3b90a9329bdcc1a12b4e9
 refs/heads/cherr42: a566ad54b073c2c56ac0a705d0a5bed9743135a5
 "refs/heads/codable_test_comment_fix": fc8f6824f7f347e1e8db55bff62db385c5728b5a
-refs/heads/tensorflow: cbadd7ffc29c7dc00e532943ef2edbdda5fbfc4a
+refs/heads/tensorflow: df47d1b7c5d4c111a2ed8006a994c282d6cfc9fe
 refs/tags/swift-4.1-DEVELOPMENT-SNAPSHOT-2018-05-11-a: 8126fd7a652e2f70ad6d76505239e34fb2ef3e1a
 refs/tags/swift-4.1-DEVELOPMENT-SNAPSHOT-2018-05-12-a: b3fd3dd84df6717f2e2e9df58c6d7e99fed57086
 refs/tags/swift-4.1-DEVELOPMENT-SNAPSHOT-2018-05-13-a: 71135119579039dc321c5f65d870050fe36efda2

branches/tensorflow/lib/Sema/ConstraintSystem.cpp

@@ -126,33 +126,6 @@ void ConstraintSystem::mergeEquivalenceClasses(TypeVariableType *typeVar1,
   // Merge nodes in the constraint graph.
   CG.mergeNodes(typeVar1, typeVar2);
 
-  // Let's try to de-duplicate any generic requirements
-  // associated with given type variable, if it represents
-  // a generic parameter.
-  if (typeVar1->getImpl().getGenericParameter()) {
-    auto requirements = CG.gatherConstraints(
-        typeVar1, ConstraintGraph::GatheringKind::EquivalenceClass,
-        [](Constraint *constraint) -> bool {
-          if (auto *locator = constraint->getLocator()) {
-            return locator->isLastElement(
-                       ConstraintLocator::TypeParameterRequirement) ||
-                   locator->isLastElement(
-                       ConstraintLocator::ConditionalRequirement);
-          }
-
-          return false;
-        });
-
-    llvm::SmallPtrSet<TypeBase *, 4> existingRequirements;
-    for (auto *req : requirements) {
-      auto constraintTy = req->getSecondType();
-      // If this constraint has already been recorded in the
-      // constraint system, there is no reason to check it twice.
-      if (!existingRequirements.insert(constraintTy.getPointer()).second)
-        retireConstraint(req);
-    }
-  }
-
   if (updateWorkList) {
     addTypeVariableConstraintsToWorkList(typeVar1);
   }

branches/tensorflow/lib/Sema/ConstraintSystem.h

@@ -637,8 +637,6 @@ class Solution {
   /// The list of member references which couldn't be resolved,
   /// and had to be assumed based on their use.
   llvm::SmallVector<ConstraintLocator *, 4> MissingMembers;
-  llvm::SmallVector<std::pair<GenericSignature *, unsigned>, 4>
-      FixedRequirements;
 
   /// The set of disjunction choices used to arrive at this solution,
   /// which informs constraint application.