Merge pull request microsoft#8295 from Microsoft/anyDefaultsToAny

ahejlsberg · ahejlsberg · commit da0197527f1a · 2016-04-25T21:41:30.000-07:00
Variable of type any has initial type any in control flow analysis
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -7972,7 +7972,7 @@ namespace ts {
                 return type;
             }
             const declaration = localOrExportSymbol.valueDeclaration;
-            const defaultsToDeclaredType = !strictNullChecks || !declaration ||
+            const defaultsToDeclaredType = !strictNullChecks || type.flags & TypeFlags.Any || !declaration ||
                 declaration.kind === SyntaxKind.Parameter || isInAmbientContext(declaration) ||
                 getContainingFunctionOrModule(declaration) !== getContainingFunctionOrModule(node);
             if (defaultsToDeclaredType && !(type.flags & TypeFlags.Narrowable)) {
diff --git a/tests/baselines/reference/defaultOfAnyInStrictNullChecks.js b/tests/baselines/reference/defaultOfAnyInStrictNullChecks.js
@@ -0,0 +1,22 @@
+//// [defaultOfAnyInStrictNullChecks.ts]
+
+// Regression test for #8295
+
+function foo() {
+    try {
+    }
+    catch (e) {
+        let s = e.message; 
+    }
+}
+
+
+//// [defaultOfAnyInStrictNullChecks.js]
+// Regression test for #8295
+function foo() {
+    try {
+    }
+    catch (e) {
+        var s = e.message;
+    }
+}
diff --git a/tests/baselines/reference/defaultOfAnyInStrictNullChecks.symbols b/tests/baselines/reference/defaultOfAnyInStrictNullChecks.symbols
@@ -0,0 +1,18 @@
+=== tests/cases/compiler/defaultOfAnyInStrictNullChecks.ts ===
+
+// Regression test for #8295
+
+function foo() {
+>foo : Symbol(foo, Decl(defaultOfAnyInStrictNullChecks.ts, 0, 0))
+
+    try {
+    }
+    catch (e) {
+>e : Symbol(e, Decl(defaultOfAnyInStrictNullChecks.ts, 6, 11))
+
+        let s = e.message; 
+>s : Symbol(s, Decl(defaultOfAnyInStrictNullChecks.ts, 7, 11))
+>e : Symbol(e, Decl(defaultOfAnyInStrictNullChecks.ts, 6, 11))
+    }
+}
+
diff --git a/tests/baselines/reference/defaultOfAnyInStrictNullChecks.types b/tests/baselines/reference/defaultOfAnyInStrictNullChecks.types
@@ -0,0 +1,20 @@
+=== tests/cases/compiler/defaultOfAnyInStrictNullChecks.ts ===
+
+// Regression test for #8295
+
+function foo() {
+>foo : () => void
+
+    try {
+    }
+    catch (e) {
+>e : any
+
+        let s = e.message; 
+>s : any
+>e.message : any
+>e : any
+>message : any
+    }
+}
+
diff --git a/tests/cases/compiler/defaultOfAnyInStrictNullChecks.ts b/tests/cases/compiler/defaultOfAnyInStrictNullChecks.ts
@@ -0,0 +1,11 @@
+// @strictNullChecks: true
+
+// Regression test for #8295
+
+function foo() {
+    try {
+    }
+    catch (e) {
+        let s = e.message; 
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -7972,7 +7972,7 @@ namespace ts {`
`7972`	`7972`	`return type;`
`7973`	`7973`	`}`
`7974`	`7974`	`const declaration = localOrExportSymbol.valueDeclaration;`
`7975`		`- const defaultsToDeclaredType = !strictNullChecks \|\| !declaration \|\|`
	`7975`	`+ const defaultsToDeclaredType = !strictNullChecks \|\| type.flags & TypeFlags.Any \|\| !declaration \|\|`
`7976`	`7976`	`declaration.kind === SyntaxKind.Parameter \|\| isInAmbientContext(declaration) \|\|`
`7977`	`7977`	`getContainingFunctionOrModule(declaration) !== getContainingFunctionOrModule(node);`
`7978`	`7978`	`if (defaultsToDeclaredType && !(type.flags & TypeFlags.Narrowable)) {`