From a75fe5194e1f04944ece146d9cb7ec0d538ec771 Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Fri, 3 Aug 2018 14:44:48 -0700
Subject: [PATCH] Accept new baselines

---
 .../reference/circularTypeofWithVarOrFunc.errors.txt         | 5 ++++-
 .../reference/recursiveResolveDeclaredMembers.types          | 2 +-
 .../reference/recursiveResolveTypeMembers.errors.txt         | 5 ++++-
 .../typeGuardsWithInstanceOfByConstructorSignature.types     | 4 ++--
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/tests/baselines/reference/circularTypeofWithVarOrFunc.errors.txt b/tests/baselines/reference/circularTypeofWithVarOrFunc.errors.txt
index 26bff709ae1..3a539fcf20c 100644
--- a/tests/baselines/reference/circularTypeofWithVarOrFunc.errors.txt
+++ b/tests/baselines/reference/circularTypeofWithVarOrFunc.errors.txt
@@ -2,10 +2,11 @@ tests/cases/conformance/types/specifyingTypes/typeQueries/circularTypeofWithVarO
 tests/cases/conformance/types/specifyingTypes/typeQueries/circularTypeofWithVarOrFunc.ts(2,5): error TS2502: 'varOfAliasedType1' is referenced directly or indirectly in its own type annotation.
 tests/cases/conformance/types/specifyingTypes/typeQueries/circularTypeofWithVarOrFunc.ts(4,5): error TS2502: 'varOfAliasedType2' is referenced directly or indirectly in its own type annotation.
 tests/cases/conformance/types/specifyingTypes/typeQueries/circularTypeofWithVarOrFunc.ts(5,6): error TS2456: Type alias 'typeAlias2' circularly references itself.
+tests/cases/conformance/types/specifyingTypes/typeQueries/circularTypeofWithVarOrFunc.ts(7,18): error TS2576: Return type annotation circularly references itself.
 tests/cases/conformance/types/specifyingTypes/typeQueries/circularTypeofWithVarOrFunc.ts(9,6): error TS2456: Type alias 'typeAlias3' circularly references itself.
 
 
-==== tests/cases/conformance/types/specifyingTypes/typeQueries/circularTypeofWithVarOrFunc.ts (5 errors) ====
+==== tests/cases/conformance/types/specifyingTypes/typeQueries/circularTypeofWithVarOrFunc.ts (6 errors) ====
     type typeAlias1 = typeof varOfAliasedType1;
          ~~~~~~~~~~
 !!! error TS2456: Type alias 'typeAlias1' circularly references itself.
@@ -21,6 +22,8 @@ tests/cases/conformance/types/specifyingTypes/typeQueries/circularTypeofWithVarO
 !!! error TS2456: Type alias 'typeAlias2' circularly references itself.
     
     function func(): typeAlias3 { return null; }
+                     ~~~~~~~~~~
+!!! error TS2576: Return type annotation circularly references itself.
     var varOfAliasedType3 = func();
     type typeAlias3 = typeof varOfAliasedType3;
          ~~~~~~~~~~
diff --git a/tests/baselines/reference/recursiveResolveDeclaredMembers.types b/tests/baselines/reference/recursiveResolveDeclaredMembers.types
index 9a1aac95224..bdbc71d4a40 100644
--- a/tests/baselines/reference/recursiveResolveDeclaredMembers.types
+++ b/tests/baselines/reference/recursiveResolveDeclaredMembers.types
@@ -4,7 +4,7 @@ export interface F {
 >F : F
 
     (): E;
->E : D<any>
+>E : D<F>
 }
 export interface D<T extends F = F> {}
 >D : D<T>
diff --git a/tests/baselines/reference/recursiveResolveTypeMembers.errors.txt b/tests/baselines/reference/recursiveResolveTypeMembers.errors.txt
index 2a6bab18cba..566086a53ce 100644
--- a/tests/baselines/reference/recursiveResolveTypeMembers.errors.txt
+++ b/tests/baselines/reference/recursiveResolveTypeMembers.errors.txt
@@ -1,13 +1,16 @@
+tests/cases/compiler/recursiveResolveTypeMembers.ts(4,49): error TS2576: Return type annotation circularly references itself.
 tests/cases/compiler/recursiveResolveTypeMembers.ts(4,58): error TS2304: Cannot find name 'H'.
 tests/cases/compiler/recursiveResolveTypeMembers.ts(4,62): error TS2574: A rest element type must be an array type.
 tests/cases/compiler/recursiveResolveTypeMembers.ts(4,79): error TS2304: Cannot find name 'R'.
 
 
-==== tests/cases/compiler/recursiveResolveTypeMembers.ts (3 errors) ====
+==== tests/cases/compiler/recursiveResolveTypeMembers.ts (4 errors) ====
     // Repro from #25291
     
     type PromisedTuple<L extends any[], U = (...args: L) => void> =
         U extends (h: infer H, ...args: infer R) => [Promise<H>, ...PromisedTuple<R>] ? [] : []
+                                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2576: Return type annotation circularly references itself.
                                                              ~
 !!! error TS2304: Cannot find name 'H'.
                                                                  ~~~~~~~~~~~~~~~~~~~
diff --git a/tests/baselines/reference/typeGuardsWithInstanceOfByConstructorSignature.types b/tests/baselines/reference/typeGuardsWithInstanceOfByConstructorSignature.types
index 09a510a28a3..5ee6822ef7a 100644
--- a/tests/baselines/reference/typeGuardsWithInstanceOfByConstructorSignature.types
+++ b/tests/baselines/reference/typeGuardsWithInstanceOfByConstructorSignature.types
@@ -447,13 +447,13 @@ declare var G: GConstructor;
 >GConstructor : GConstructor
 
 var obj13: G1 | G2;
->obj13 : G2 | G1
+>obj13 : G1 | G2
 >G1 : G1
 >G2 : G2
 
 if (obj13 instanceof G) { // narrowed to G1. G1 is return type of prototype property.
 >obj13 instanceof G : boolean
->obj13 : G2 | G1
+>obj13 : G1 | G2
 >G : GConstructor
 
     obj13.foo1;