From 11929e33ed3514e2dc09a29ff065e4525d331587 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Mon, 13 Feb 2017 12:54:58 -0800
Subject: [PATCH] Address PR comments

---
 src/compiler/checker.ts | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 3735a01849b..6f213355679 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -7771,18 +7771,14 @@ namespace ts {
                 if (target.flags & TypeFlags.Union && containsType(targetTypes, source)) {
                     return Ternary.True;
                 }
-                const discriminantType = findMatchingDiscriminantType(source, target);
-                if (discriminantType) {
-                    return isRelatedTo(source, discriminantType, reportErrors);
-                }
-
-                const len = targetTypes.length;
-                for (let i = 0; i < len; i++) {
-                    const related = isRelatedTo(source, targetTypes[i], reportErrors && i === len - 1);
+                for (const type of targetTypes) {
+                    const related = isRelatedTo(source, type, /*reportErrors*/ false);
                     if (related) {
                         return related;
                     }
                 }
+                const discriminantType = findMatchingDiscriminantType(source, target);
+                isRelatedTo(source, discriminantType || targetTypes[targetTypes.length - 1], reportErrors);
                 return Ternary.False;
             }