Merge pull request microsoft#25136 from Microsoft/useGetObjectFlags

DanielRosenwasser · web-flow · commit b4cf51365dd1 · 2018-06-21T14:30:59.000-07:00
Use `getObjectFlags` as suggested in previous PR.
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -10833,13 +10833,15 @@ namespace ts {
             }
 
             function findMatchingTypeReferenceOrTypeAliasReference(source: Type, unionTarget: UnionOrIntersectionType) {
-                if (source.flags & TypeFlags.Object && (source as ObjectType).objectFlags & (ObjectFlags.Reference | ObjectFlags.Anonymous) && unionTarget.flags & TypeFlags.Union) {
+                const sourceObjectFlags = getObjectFlags(source);
+                if (sourceObjectFlags & (ObjectFlags.Reference | ObjectFlags.Anonymous) && unionTarget.flags & TypeFlags.Union) {
                     return find(unionTarget.types, target => {
                         if (target.flags & TypeFlags.Object) {
-                            if ((source as ObjectType).objectFlags & (target as ObjectType).objectFlags & ObjectFlags.Reference) {
+                            const overlapObjFlags = sourceObjectFlags & getObjectFlags(target);
+                            if (overlapObjFlags & ObjectFlags.Reference) {
                                 return (source as TypeReference).target === (target as TypeReference).target;
                             }
-                            if ((source as ObjectType).objectFlags & (target as ObjectType).objectFlags & ObjectFlags.Anonymous) {
+                            if (overlapObjFlags & ObjectFlags.Anonymous) {
                                 return !!(source as AnonymousType).aliasSymbol && (source as AnonymousType).aliasSymbol === (target as AnonymousType).aliasSymbol;
                             }
                         }

Original file line number	Diff line number	Diff line change
`@@ -10833,13 +10833,15 @@ namespace ts {`
`10833`	`10833`	`}`
`10834`	`10834`
`10835`	`10835`	`function findMatchingTypeReferenceOrTypeAliasReference(source: Type, unionTarget: UnionOrIntersectionType) {`
`10836`		`- if (source.flags & TypeFlags.Object && (source as ObjectType).objectFlags & (ObjectFlags.Reference \| ObjectFlags.Anonymous) && unionTarget.flags & TypeFlags.Union) {`
	`10836`	`+ const sourceObjectFlags = getObjectFlags(source);`
	`10837`	`+ if (sourceObjectFlags & (ObjectFlags.Reference \| ObjectFlags.Anonymous) && unionTarget.flags & TypeFlags.Union) {`
`10837`	`10838`	`return find(unionTarget.types, target => {`
`10838`	`10839`	`if (target.flags & TypeFlags.Object) {`
`10839`		`- if ((source as ObjectType).objectFlags & (target as ObjectType).objectFlags & ObjectFlags.Reference) {`
	`10840`	`+ const overlapObjFlags = sourceObjectFlags & getObjectFlags(target);`
	`10841`	`+ if (overlapObjFlags & ObjectFlags.Reference) {`
`10840`	`10842`	`return (source as TypeReference).target === (target as TypeReference).target;`
`10841`	`10843`	`}`
`10842`		`- if ((source as ObjectType).objectFlags & (target as ObjectType).objectFlags & ObjectFlags.Anonymous) {`
	`10844`	`+ if (overlapObjFlags & ObjectFlags.Anonymous) {`
`10843`	`10845`	`return !!(source as AnonymousType).aliasSymbol && (source as AnonymousType).aliasSymbol === (target as AnonymousType).aliasSymbol;`
`10844`	`10846`	`}`
`10845`	`10847`	`}`