commit 115a3627c5fd413d2bf7fb92b275559f0f82c5a7
author swift-ci <swift-ci@users.noreply.github.com> Wed Nov 22 01:12:41 2017 -0800
committer GitHub <noreply@github.com> Wed Nov 22 01:12:41 2017 -0800
tree 99f0dc3b32fee9d300054e42bbc9af3d02022b32
parent b9393b1f7209cc7c61f6c076c8987530cab6f1b8
parent 4f9cb35f6afead17cbe2ba643feecff5140efe2e

Merge pull request #13049 from DougGregor/optional-nil-comparison-type-ranking

lib/Sema/CSRanking.cpp

diff --git a/lib/Sema/CSRanking.cpp b/lib/Sema/CSRanking.cpp
index 0642d9a..7ad8f5a 100644
--- a/lib/Sema/CSRanking.cpp
+++ b/lib/Sema/CSRanking.cpp
@@ -1070,12 +1070,14 @@
       if (auto nominalType2 = type2->getNominalOrBoundGenericNominal()) {
         if ((nominalType2->getName() ==
              cs.TC.Context.Id_OptionalNilComparisonType)) {
-          ++score1;
+          ++score2;
         }
-      } else if (auto nominalType1 = type1->getNominalOrBoundGenericNominal()) {
+      }
+
+      if (auto nominalType1 = type1->getNominalOrBoundGenericNominal()) {
         if ((nominalType1->getName() ==
              cs.TC.Context.Id_OptionalNilComparisonType)) {
-          ++score2;
+          ++score1;
         }
       }
     }