From 69b2e7cdd339a7eb20162c2dc39f16832a96f033 Mon Sep 17 00:00:00 2001
From: gcnew <gcnew@abv.bg>
Date: Fri, 26 May 2017 21:36:15 +0300
Subject: [PATCH] Fixed rebase errors

---
 src/compiler/checker.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 246b079964a83..88c430996a03f 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -7971,9 +7971,9 @@ namespace ts {
 
         function createFakeInferenceMapper(): TypeMapper {
             const fakeSignature = <Signature>{
-                typeParameters: []
+                 typeParameters: []
             };
-            return getInferenceMapper(createInferenceContext(fakeSignature, /*inferUnionTypes*/ false, /*useAnyForNoInferences*/ false));
+            return createInferenceContext(fakeSignature, 0);
         }
 
         function combineTypeMappers(mapper1: TypeMapper, mapper2: TypeMapper): TypeMapper {
@@ -14899,7 +14899,7 @@ namespace ts {
                 // If inference has failed, use the first constituent type. During checking, the other
                 // constituents will fail to match, resulting in a nice error message pointing it out.
                 if (inferred[i] === unknownType) {
-                    inferred[i] = getInferenceCandidates(context, i)[0] || inferred[i];
+                    inferred[i] = context.inferences[i].candidates[0] || inferred[i];
                 }
             }
             return getSignatureInstantiation(signature, inferred);