From 99d640f0f0bafd029ff09d56a19766babd7d57f1 Mon Sep 17 00:00:00 2001
From: Arthur Ozga <aozgaa@umich.edu>
Date: Fri, 10 Jul 2015 17:53:55 -0700
Subject: [PATCH] Actually move check outside the loop

---
 src/compiler/checker.ts | 51 +++++++++++++++++++----------------------
 1 file changed, 23 insertions(+), 28 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index dd944b51fe5..cdaf268fdf3 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -4763,40 +4763,35 @@ namespace ts {
                 let targetSignatures = getSignaturesOfType(target, kind);
                 let result = Ternary.True;
                 let saveErrorInfo = errorInfo;
+                
+                // Because the "abstractness" of a class is the same across all construct signatures
+                // (internally we are checking the corresponding declaration), it is enough to perform 
+                // the check and report an error once over all pairs of source and target construct signatures.
+                let sourceErasedSignature = getErasedSignature(s);
+                let targetErasedSignature = getErasedSignature(t);
+
+                let sourceReturnType = sourceErasedSignature && getReturnTypeOfSignature(sourceErasedSignature);
+                let targetReturnType = targetErasedSignature && getReturnTypeOfSignature(targetErasedSignature);
+
+                let sourceReturnDecl = sourceReturnType && sourceReturnType.symbol && getDeclarationOfKind(sourceReturnType.symbol, SyntaxKind.ClassDeclaration);
+                let targetReturnDecl = targetReturnType && targetReturnType.symbol && getDeclarationOfKind(targetReturnType.symbol, SyntaxKind.ClassDeclaration);
+                let sourceIsAbstract = sourceReturnDecl && sourceReturnDecl.flags & NodeFlags.Abstract;
+                let targetIsAbstract = targetReturnDecl && targetReturnDecl.flags & NodeFlags.Abstract;
+
+                if (sourceIsAbstract && !targetIsAbstract) {
+                    if (reportErrors) {
+                        reportError(Diagnostics.Cannot_assign_an_abstract_constructor_type_to_a_non_abstract_constructor_type);
+                    }
+                    result = Ternary.False;
+                }
+
                 outer: for (let t of targetSignatures) {
                     if (!t.hasStringLiterals || target.flags & TypeFlags.FromSignature) {
                         let localErrors = reportErrors;
                         let checkedAbstractAssignability = false;
                         for (let s of sourceSignatures) {
                             if (!s.hasStringLiterals || source.flags & TypeFlags.FromSignature) {
-                                let related = Ternary.True;
-
-                                // Because the "abstractness" of a class is the same across all construct signatures
-                                // (internally we are checking the corresponding declaration), it is enough to perform 
-                                // the check and report an error once over all pairs of source and target construct signatures.
-                                if (!checkedAbstractAssignability) {
-                                    checkedAbstractAssignability = true;
-
-                                    let sourceErasedSignature = getErasedSignature(s);
-                                    let targetErasedSignature = getErasedSignature(t);
-
-                                    let sourceReturnType = sourceErasedSignature && getReturnTypeOfSignature(sourceErasedSignature);
-                                    let targetReturnType = targetErasedSignature && getReturnTypeOfSignature(targetErasedSignature);
-
-                                    let sourceReturnDecl = sourceReturnType && sourceReturnType.symbol && getDeclarationOfKind(sourceReturnType.symbol, SyntaxKind.ClassDeclaration);
-                                    let targetReturnDecl = targetReturnType && targetReturnType.symbol && getDeclarationOfKind(targetReturnType.symbol, SyntaxKind.ClassDeclaration);
-                                    let sourceIsAbstract = sourceReturnDecl && sourceReturnDecl.flags & NodeFlags.Abstract;
-                                    let targetIsAbstract = targetReturnDecl && targetReturnDecl.flags & NodeFlags.Abstract;
-
-                                    if (sourceIsAbstract && !targetIsAbstract) {
-                                        if (reportErrors) {
-                                            reportError(Diagnostics.Cannot_assign_an_abstract_constructor_type_to_a_non_abstract_constructor_type);
-                                        }
-                                        related = Ternary.False;
-                                    }
-                                }
-
-                                related &= signatureRelatedTo(s, t, localErrors);
+                                let related = signatureRelatedTo(s, t, localErrors);
                                 if (related) {
                                     result &= related;
                                     errorInfo = saveErrorInfo;