Merge pull request #10447 from DougGregor/paren-type-equality-4.0

[4.0] [Type checker] Check type equality even for argument tuples in Swift 4.

Author: tkremenek

lib/Sema/CSSimplify.cpp

@@ -1372,7 +1372,9 @@ ConstraintSystem::matchTypes(Type type1, Type type2, ConstraintKind kind,
     typeVar2 = dyn_cast<TypeVariableType>(type2.getPointer());
 
     // If the types are obviously equivalent, we're done.
-    if (type1.getPointer() == type2.getPointer())
+    if (isa<ParenType>(type1.getPointer()) ==
+          isa<ParenType>(type2.getPointer()) &&
+        type1->isEqual(type2))
       return SolutionKind::Solved;
   } else {
     typeVar1 = desugar1->getAs<TypeVariableType>();

test/decl/protocol/conforms/associated_type.swift

@@ -1,4 +1,5 @@
-// RUN: %target-typecheck-verify-swift
+// RUN: %target-typecheck-verify-swift -swift-version 3
+// RUN: %target-typecheck-verify-swift -swift-version 4
 
 class C { }
 
@@ -9,3 +10,23 @@ protocol P {
 struct X : P { // expected-error{{type 'X' does not conform to protocol 'P'}}
   typealias AssocP = Int // expected-note{{possibly intended match 'X.AssocP' (aka 'Int') does not inherit from 'C'}}
 }
+
+// SR-5166
+protocol FooType {
+    associatedtype BarType
+
+    func foo(bar: BarType)
+    func foo(action: (BarType) -> Void)
+}
+
+protocol Bar {}
+
+class Foo: FooType {
+    typealias BarType = Bar
+
+    func foo(bar: Bar) {
+    }
+
+    func foo(action: (Bar) -> Void) {
+    }
+}