Strengthen supertype reduction check to reduce breakage

Author: weswigham

src/compiler/checker.ts

@@ -11181,7 +11181,7 @@ namespace ts {
                 }
                 else {
                     const sub = instantiateType((<SubstitutionType>type).substitute, mapper);
-                    if (sub.flags & TypeFlags.AnyOrUnknown || isTypeSubtypeOf(maybeVariable, sub)) {
+                    if (sub.flags & TypeFlags.AnyOrUnknown || isTypeSubtypeOf(getRestrictiveInstantiation(maybeVariable), getRestrictiveInstantiation(sub))) {
                         return maybeVariable;
                     }
                     return sub;

tests/baselines/reference/circularlyConstrainedMappedTypeContainingConditionalNoInfiniteInstantiationDepth.errors.txt

@@ -79,7 +79,7 @@ type ComponentType<P = {}> = ComponentClass<P> | FunctionComponent<P>;
 >ComponentType : ComponentType<P>
 
 export type Shared<
->Shared : any
+>Shared : Shared<InjectedProps, DecorationTargetProps>
 
     InjectedProps,
     DecorationTargetProps extends Shared<InjectedProps, DecorationTargetProps>

tests/baselines/reference/circularlyConstrainedMappedTypeContainingConditionalNoInfiniteInstantiationDepth.types

@@ -3,7 +3,7 @@ type Omit<T, K extends keyof T> = Pick<T, Exclude<keyof T, K>>;
 >Omit : Pick<T, Exclude<keyof T, K>>
 
 type Shared< // Circularly self constraining type, defered thanks to mapping
->Shared : any
+>Shared : Shared<InjectedProps, DecorationTargetProps>
 
     InjectedProps,
     DecorationTargetProps extends Shared<InjectedProps, DecorationTargetProps>