From 3a5fb0cec6e7db434a12043909bc12bc5866a5ec Mon Sep 17 00:00:00 2001
From: Daniel Rosenwasser <Daniel.Rosenwasser@microsoft.com>
Date: Wed, 7 Sep 2016 17:10:49 -0700
Subject: [PATCH] Accepted baselines.

---
 .../noImplicitAnyMissingGetAccessor.js        |  3 +-
 .../noImplicitAnyMissingSetAccessor.js        |  3 +-
 .../underscoreThisInDerivedClass01.errors.txt | 29 +++++++++++++++++++
 3 files changed, 33 insertions(+), 2 deletions(-)
 create mode 100644 tests/baselines/reference/underscoreThisInDerivedClass01.errors.txt

diff --git a/tests/baselines/reference/noImplicitAnyMissingGetAccessor.js b/tests/baselines/reference/noImplicitAnyMissingGetAccessor.js
index 69d98d4b0c6..d0e87aba25b 100644
--- a/tests/baselines/reference/noImplicitAnyMissingGetAccessor.js
+++ b/tests/baselines/reference/noImplicitAnyMissingGetAccessor.js
@@ -26,7 +26,8 @@ var Parent = (function () {
 var Child = (function (_super) {
     __extends(Child, _super);
     function Child() {
-        _super.apply(this, arguments);
+        var _this = _super.apply(this, arguments) || this;
+        return _this;
     }
     Object.defineProperty(Child.prototype, "message", {
         set: function (str) {
diff --git a/tests/baselines/reference/noImplicitAnyMissingSetAccessor.js b/tests/baselines/reference/noImplicitAnyMissingSetAccessor.js
index 7ad703fd3b7..1b4119227bc 100644
--- a/tests/baselines/reference/noImplicitAnyMissingSetAccessor.js
+++ b/tests/baselines/reference/noImplicitAnyMissingSetAccessor.js
@@ -25,7 +25,8 @@ var Parent = (function () {
 var Child = (function (_super) {
     __extends(Child, _super);
     function Child() {
-        _super.apply(this, arguments);
+        var _this = _super.apply(this, arguments) || this;
+        return _this;
     }
     Object.defineProperty(Child.prototype, "message", {
         get: function () {
diff --git a/tests/baselines/reference/underscoreThisInDerivedClass01.errors.txt b/tests/baselines/reference/underscoreThisInDerivedClass01.errors.txt
new file mode 100644
index 00000000000..3828825cb6b
--- /dev/null
+++ b/tests/baselines/reference/underscoreThisInDerivedClass01.errors.txt
@@ -0,0 +1,29 @@
+tests/cases/compiler/underscoreThisInDerivedClass01.ts(20,13): error TS2399: Duplicate identifier '_this'. Compiler uses variable declaration '_this' to capture 'this' reference.
+
+
+==== tests/cases/compiler/underscoreThisInDerivedClass01.ts (1 errors) ====
+    // @target es5
+    
+    // Original test intent:
+    // When arrow functions capture 'this', the lexical 'this' owner
+    // currently captures 'this' using a variable named '_this'.
+    // That means that '_this' becomes a reserved identifier in certain places.
+    //
+    // Constructors have adopted the same identifier name ('_this')
+    // for capturing any potential return values from super calls,
+    // so we expect the same behavior.
+    
+    class C {
+        constructor() {
+            return {};
+        }
+    }
+    
+    class D extends C {
+        constructor() {
+            var _this = "uh-oh?";
+                ~~~~~
+!!! error TS2399: Duplicate identifier '_this'. Compiler uses variable declaration '_this' to capture 'this' reference.
+            super();
+        }
+    }
\ No newline at end of file