Merge pull request microsoft#4716 from Microsoft/optimizeFreshTypeRelation

ahejlsberg · ahejlsberg · commit aa434a17a0a0 · 2015-09-10T16:14:29.000-07:00
Only obtain regular type of fresh object literal type if necessary
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -4640,7 +4640,9 @@ namespace ts {
                     // and intersection types are further deconstructed on the target side, we don't want to
                     // make the check again (as it might fail for a partial target type). Therefore we obtain
                     // the regular source type and proceed with that.
-                    source = getRegularTypeOfObjectLiteral(source);
+                    if (target.flags & TypeFlags.UnionOrIntersection) {
+                        source = getRegularTypeOfObjectLiteral(source);
+                    }
                 }
 
                 let saveErrorInfo = errorInfo;
@@ -5511,6 +5513,7 @@ namespace ts {
                     regularType.constructSignatures = (<ResolvedType>type).constructSignatures;
                     regularType.stringIndexType = (<ResolvedType>type).stringIndexType;
                     regularType.numberIndexType = (<ResolvedType>type).numberIndexType;
+                    (<FreshObjectLiteralType>type).regularType = regularType;
                 }
                 return regularType;
             }

Original file line number	Diff line number	Diff line change
`@@ -4640,7 +4640,9 @@ namespace ts {`
`4640`	`4640`	`// and intersection types are further deconstructed on the target side, we don't want to`
`4641`	`4641`	`// make the check again (as it might fail for a partial target type). Therefore we obtain`
`4642`	`4642`	`// the regular source type and proceed with that.`
`4643`		`- source = getRegularTypeOfObjectLiteral(source);`
	`4643`	`+ if (target.flags & TypeFlags.UnionOrIntersection) {`
	`4644`	`+ source = getRegularTypeOfObjectLiteral(source);`
	`4645`	`+ }`
`4644`	`4646`	`}`
`4645`	`4647`
`4646`	`4648`	`let saveErrorInfo = errorInfo;`
`@@ -5511,6 +5513,7 @@ namespace ts {`
`5511`	`5513`	`regularType.constructSignatures = (<ResolvedType>type).constructSignatures;`
`5512`	`5514`	`regularType.stringIndexType = (<ResolvedType>type).stringIndexType;`
`5513`	`5515`	`regularType.numberIndexType = (<ResolvedType>type).numberIndexType;`
	`5516`	`+ (<FreshObjectLiteralType>type).regularType = regularType;`
`5514`	`5517`	`}`
`5515`	`5518`	`return regularType;`
`5516`	`5519`	`}`