---

yaml
---
r: 341623
b: refs/heads/rxwei-patch-1
c: 64e43f6
h: refs/heads/master
i:
  341621: 0d43d7a
  341619: d42d1e0
  341615: 7823a98

Author: Marc Rasi

[refs]

@@ -1015,7 +1015,7 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2018-08-18-a: b10b1fce14385faa6d44f6b933e95
 refs/heads/rdar-43033749-fix-batch-mode-no-diags-swift-5.0-branch: a14e64eaad30de89f0f5f0b2a782eed7ecdcb255
 refs/heads/revert-19006-error-bridging-integer-type: 8a9065a3696535305ea53fe9b71f91cbe6702019
 refs/heads/revert-19050-revert-19006-error-bridging-integer-type: ecf752d54b05dd0a20f510f0bfa54a3fec3bcaca
-refs/heads/rxwei-patch-1: e434a189e9b8347dfcd7302a4700ffa7da67c33a
+refs/heads/rxwei-patch-1: 64e43f6da65af4e33975d4b1ded18388658cfc4e
 refs/heads/shahmishal-patch-1: e58ec0f7488258d42bef51bc3e6d7b3dc74d7b2a
 refs/heads/typelist-existential: 4046359efd541fb5c72d69a92eefc0a784df8f5e
 refs/tags/swift-4.2-DEVELOPMENT-SNAPSHOT-2018-08-20-a: 4319ba09e4fb8650ee86061075c74a016b6baab9

branches/rxwei-patch-1/lib/Sema/TypeCheckAttr.cpp

@@ -2822,10 +2822,8 @@ static bool checkFunctionSignature(
     return false;
 
   // Erase dynamic self types.
-  required = dyn_cast<AnyFunctionType>(
-      required->eraseDynamicSelfType()->getCanonicalType());
-  candidateFnTy = dyn_cast<AnyFunctionType>(
-      candidateFnTy->eraseDynamicSelfType()->getCanonicalType());
+  required = dyn_cast<AnyFunctionType>(required->getCanonicalType());
+  candidateFnTy = dyn_cast<AnyFunctionType>(candidateFnTy->getCanonicalType());
 
   // Check that generic signatures match.
   auto requiredGenSig = required.getOptGenericSignature();