From 8dc1747db7aae381b29b7f5f9d48d711f2df5ef5 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Tue, 13 Dec 2016 13:52:58 -0800
Subject: [PATCH 1/2] Set symbol/flags only on (fresh) object spreads

If you spread any into an object, the type is any, which should not be
changed.
---
 src/compiler/checker.ts | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 686efaa758..4c9780faa7 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -11638,8 +11638,11 @@ namespace ts {
                 if (propertiesArray.length > 0) {
                     spread = getSpreadType(spread, createObjectLiteralType(), /*isFromObjectLiteral*/ true);
                 }
-                spread.flags |= propagatedFlags;
-                spread.symbol = node.symbol;
+                if (spread.flags & TypeFlags.Object) {
+                    // only set the symbol and flags if this is a (fresh) object type
+                    spread.flags |= propagatedFlags;
+                    spread.symbol = node.symbol;
+                }
                 return spread;
             }
 

From 587ba8d0ae06025856178e1057ef1afbe72c485b Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Tue, 13 Dec 2016 13:55:13 -0800
Subject: [PATCH 2/2] Test:spreading any doesn't set flags on anyType

And update baselines
---
 .../explicitAnyAfterSpreadNoImplicitAnyError.js  | 16 ++++++++++++++++
 ...licitAnyAfterSpreadNoImplicitAnyError.symbols |  7 +++++++
 ...xplicitAnyAfterSpreadNoImplicitAnyError.types | 13 +++++++++++++
 tests/baselines/reference/objectSpread.symbols   |  1 -
 .../explicitAnyAfterSpreadNoImplicitAnyError.ts  |  3 +++
 5 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 tests/baselines/reference/explicitAnyAfterSpreadNoImplicitAnyError.js
 create mode 100644 tests/baselines/reference/explicitAnyAfterSpreadNoImplicitAnyError.symbols
 create mode 100644 tests/baselines/reference/explicitAnyAfterSpreadNoImplicitAnyError.types
 create mode 100644 tests/cases/compiler/explicitAnyAfterSpreadNoImplicitAnyError.ts

diff --git a/tests/baselines/reference/explicitAnyAfterSpreadNoImplicitAnyError.js b/tests/baselines/reference/explicitAnyAfterSpreadNoImplicitAnyError.js
new file mode 100644
index 0000000000..8715fd9eac
--- /dev/null
+++ b/tests/baselines/reference/explicitAnyAfterSpreadNoImplicitAnyError.js
@@ -0,0 +1,16 @@
+//// [explicitAnyAfterSpreadNoImplicitAnyError.ts]
+({ a: [], ...(null as any) });
+let x: any;
+
+
+//// [explicitAnyAfterSpreadNoImplicitAnyError.js]
+var __assign = (this && this.__assign) || Object.assign || function(t) {
+    for (var s, i = 1, n = arguments.length; i < n; i++) {
+        s = arguments[i];
+        for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+            t[p] = s[p];
+    }
+    return t;
+};
+(__assign({ a: [] }, null));
+var x;
diff --git a/tests/baselines/reference/explicitAnyAfterSpreadNoImplicitAnyError.symbols b/tests/baselines/reference/explicitAnyAfterSpreadNoImplicitAnyError.symbols
new file mode 100644
index 0000000000..c53845d99a
--- /dev/null
+++ b/tests/baselines/reference/explicitAnyAfterSpreadNoImplicitAnyError.symbols
@@ -0,0 +1,7 @@
+=== tests/cases/compiler/explicitAnyAfterSpreadNoImplicitAnyError.ts ===
+({ a: [], ...(null as any) });
+>a : Symbol(a, Decl(explicitAnyAfterSpreadNoImplicitAnyError.ts, 0, 2))
+
+let x: any;
+>x : Symbol(x, Decl(explicitAnyAfterSpreadNoImplicitAnyError.ts, 1, 3))
+
diff --git a/tests/baselines/reference/explicitAnyAfterSpreadNoImplicitAnyError.types b/tests/baselines/reference/explicitAnyAfterSpreadNoImplicitAnyError.types
new file mode 100644
index 0000000000..5e463e77bb
--- /dev/null
+++ b/tests/baselines/reference/explicitAnyAfterSpreadNoImplicitAnyError.types
@@ -0,0 +1,13 @@
+=== tests/cases/compiler/explicitAnyAfterSpreadNoImplicitAnyError.ts ===
+({ a: [], ...(null as any) });
+>({ a: [], ...(null as any) }) : any
+>{ a: [], ...(null as any) } : any
+>a : undefined[]
+>[] : undefined[]
+>(null as any) : any
+>null as any : any
+>null : null
+
+let x: any;
+>x : any
+
diff --git a/tests/baselines/reference/objectSpread.symbols b/tests/baselines/reference/objectSpread.symbols
index 0b2fce46b0..35c10faa9c 100644
--- a/tests/baselines/reference/objectSpread.symbols
+++ b/tests/baselines/reference/objectSpread.symbols
@@ -200,7 +200,6 @@ let cplus: { p: number, plus(): void } = { ...c, plus() { return this.p + 1; } }
 >plus : Symbol(plus, Decl(objectSpread.ts, 49, 23))
 >c : Symbol(c, Decl(objectSpread.ts, 45, 3))
 >plus : Symbol(plus, Decl(objectSpread.ts, 49, 48))
->this : Symbol(__object, Decl(objectSpread.ts, 41, 15))
 
 cplus.plus();
 >cplus.plus : Symbol(plus, Decl(objectSpread.ts, 49, 23))
diff --git a/tests/cases/compiler/explicitAnyAfterSpreadNoImplicitAnyError.ts b/tests/cases/compiler/explicitAnyAfterSpreadNoImplicitAnyError.ts
new file mode 100644
index 0000000000..1c5ebac3d9
--- /dev/null
+++ b/tests/cases/compiler/explicitAnyAfterSpreadNoImplicitAnyError.ts
@@ -0,0 +1,3 @@
+// @noImplicitAny: true
+({ a: [], ...(null as any) });
+let x: any;