Merge pull request #13277 from Microsoft/fix13276

src/compiler/transformers/es2015.ts

@@ -882,7 +882,10 @@ namespace ts {
 
             }
 
-            const superCaptureStatus = declareOrCaptureOrReturnThisForConstructorIfNeeded(statements, constructor, !!extendsClauseElement, hasSynthesizedSuper, statementOffset);
+            // determine whether the class is known syntactically to be a derived class (e.g. a
+            // class that extends a value that is not syntactically known to be `null`).
+            const isDerivedClass = extendsClauseElement && skipOuterExpressions(extendsClauseElement.expression).kind !== SyntaxKind.NullKeyword;
+            const superCaptureStatus = declareOrCaptureOrReturnThisForConstructorIfNeeded(statements, constructor, isDerivedClass, hasSynthesizedSuper, statementOffset);
 
             // The last statement expression was replaced. Skip it.
             if (superCaptureStatus === SuperCaptureResult.ReplaceSuperCapture || superCaptureStatus === SuperCaptureResult.ReplaceWithReturn) {
@@ -899,7 +902,7 @@ namespace ts {
 
             // Return `_this` unless we're sure enough that it would be pointless to add a return statement.
             // If there's a constructor that we can tell returns in enough places, then we *do not* want to add a return.
-            if (extendsClauseElement
+            if (isDerivedClass
                 && superCaptureStatus !== SuperCaptureResult.ReplaceWithReturn
                 && !(constructor && isSufficientlyCoveredByReturnStatements(constructor.body))) {
                 statements.push(
@@ -963,11 +966,11 @@ namespace ts {
         function declareOrCaptureOrReturnThisForConstructorIfNeeded(
                     statements: Statement[],
                     ctor: ConstructorDeclaration | undefined,
-                    hasExtendsClause: boolean,
+                    isDerivedClass: boolean,
                     hasSynthesizedSuper: boolean,
                     statementOffset: number) {
             // If this isn't a derived class, just capture 'this' for arrow functions if necessary.
-            if (!hasExtendsClause) {
+            if (!isDerivedClass) {
                 if (ctor) {
                     addCaptureThisForNodeIfNeeded(statements, ctor);
                 }
@@ -1047,7 +1050,7 @@ namespace ts {
             }
 
             // Perform the capture.
-            captureThisForNode(statements, ctor, superCallExpression, firstStatement);
+            captureThisForNode(statements, ctor, superCallExpression || createActualThis(), firstStatement);
 
             // If we're actually replacing the original statement, we need to signal this to the caller.
             if (superCallExpression) {
@@ -1057,15 +1060,25 @@ namespace ts {
             return SuperCaptureResult.NoReplacement;
         }
 
+        function createActualThis() {
+            return setEmitFlags(createThis(), EmitFlags.NoSubstitution);
+        }
+
         function createDefaultSuperCallOrThis() {
-            const actualThis = createThis();
-            setEmitFlags(actualThis, EmitFlags.NoSubstitution);
-            const superCall = createFunctionApply(
-                createIdentifier("_super"),
-                actualThis,
-                createIdentifier("arguments"),
+            return createLogicalOr(
+                createLogicalAnd(
+                    createStrictInequality(
+                        createIdentifier("_super"),
+                        createNull()
+                    ),
+                    createFunctionApply(
+                        createIdentifier("_super"),
+                        createActualThis(),
+                        createIdentifier("arguments")
+                    )
+                ),
+                createActualThis()
             );
-            return createLogicalOr(superCall, actualThis);
         }
 
         /**

tests/baselines/reference/ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.js

@@ -38,7 +38,7 @@ var A;
     var Point3d = (function (_super) {
         __extends(Point3d, _super);
         function Point3d() {
-            return _super.apply(this, arguments) || this;
+            return _super !== null && _super.apply(this, arguments) || this;
         }
         return Point3d;
     }(Point));

tests/baselines/reference/ExportClassWithInaccessibleTypeInTypeParameterConstraint.js

@@ -41,7 +41,7 @@ var A;
     var Point3d = (function (_super) {
         __extends(Point3d, _super);
         function Point3d() {
-            return _super.apply(this, arguments) || this;
+            return _super !== null && _super.apply(this, arguments) || this;
         }
         return Point3d;
     }(Point));

tests/baselines/reference/abstractClassInLocalScope.js

@@ -22,7 +22,7 @@ var __extends = (this && this.__extends) || function (d, b) {
     var B = (function (_super) {
         __extends(B, _super);
         function B() {
-            return _super.apply(this, arguments) || this;
+            return _super !== null && _super.apply(this, arguments) || this;
         }
         return B;
     }(A));

tests/baselines/reference/abstractClassInLocalScopeIsAbstract.js

@@ -22,7 +22,7 @@ var __extends = (this && this.__extends) || function (d, b) {
     var B = (function (_super) {
         __extends(B, _super);
         function B() {
-            return _super.apply(this, arguments) || this;
+            return _super !== null && _super.apply(this, arguments) || this;
         }
         return B;
     }(A));

tests/baselines/reference/abstractProperty.js

@@ -35,7 +35,7 @@ var B = (function () {
 var C = (function (_super) {
     __extends(C, _super);
     function C() {
-        var _this = _super.apply(this, arguments) || this;
+        var _this = _super !== null && _super.apply(this, arguments) || this;
         _this.raw = "edge";
         _this.ro = "readonly please";
         return _this;

tests/baselines/reference/abstractPropertyNegative.js

@@ -57,7 +57,7 @@ var B = (function () {
 var C = (function (_super) {
     __extends(C, _super);
     function C() {
-        var _this = _super.apply(this, arguments) || this;
+        var _this = _super !== null && _super.apply(this, arguments) || this;
         _this.ro = "readonly please";
         return _this;
     }
@@ -78,7 +78,7 @@ var WrongTypeProperty = (function () {
 var WrongTypePropertyImpl = (function (_super) {
     __extends(WrongTypePropertyImpl, _super);
     function WrongTypePropertyImpl() {
-        var _this = _super.apply(this, arguments) || this;
+        var _this = _super !== null && _super.apply(this, arguments) || this;
         _this.num = "nope, wrong";
         return _this;
     }
@@ -92,7 +92,7 @@ var WrongTypeAccessor = (function () {
 var WrongTypeAccessorImpl = (function (_super) {
     __extends(WrongTypeAccessorImpl, _super);
     function WrongTypeAccessorImpl() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     Object.defineProperty(WrongTypeAccessorImpl.prototype, "num", {
         get: function () { return "nope, wrong"; },
@@ -104,7 +104,7 @@ var WrongTypeAccessorImpl = (function (_super) {
 var WrongTypeAccessorImpl2 = (function (_super) {
     __extends(WrongTypeAccessorImpl2, _super);
     function WrongTypeAccessorImpl2() {
-        var _this = _super.apply(this, arguments) || this;
+        var _this = _super !== null && _super.apply(this, arguments) || this;
         _this.num = "nope, wrong";
         return _this;
     }

tests/baselines/reference/accessors_spec_section-4.5_inference.js

@@ -38,7 +38,7 @@ var A = (function () {
 var B = (function (_super) {
     __extends(B, _super);
     function B() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return B;
 }(A));

tests/baselines/reference/aliasUsageInAccessorsOfClass.js

@@ -46,7 +46,7 @@ var Backbone = require("./aliasUsage1_backbone");
 var VisualizationModel = (function (_super) {
     __extends(VisualizationModel, _super);
     function VisualizationModel() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return VisualizationModel;
 }(Backbone.Model));

tests/baselines/reference/aliasUsageInArray.js

@@ -40,7 +40,7 @@ var Backbone = require("./aliasUsageInArray_backbone");
 var VisualizationModel = (function (_super) {
     __extends(VisualizationModel, _super);
     function VisualizationModel() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return VisualizationModel;
 }(Backbone.Model));

tests/baselines/reference/aliasUsageInFunctionExpression.js

@@ -39,7 +39,7 @@ var Backbone = require("./aliasUsageInFunctionExpression_backbone");
 var VisualizationModel = (function (_super) {
     __extends(VisualizationModel, _super);
     function VisualizationModel() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return VisualizationModel;
 }(Backbone.Model));

tests/baselines/reference/aliasUsageInGenericFunction.js

@@ -43,7 +43,7 @@ var Backbone = require("./aliasUsageInGenericFunction_backbone");
 var VisualizationModel = (function (_super) {
     __extends(VisualizationModel, _super);
     function VisualizationModel() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return VisualizationModel;
 }(Backbone.Model));

tests/baselines/reference/aliasUsageInIndexerOfClass.js

@@ -45,7 +45,7 @@ var Backbone = require("./aliasUsageInIndexerOfClass_backbone");
 var VisualizationModel = (function (_super) {
     __extends(VisualizationModel, _super);
     function VisualizationModel() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return VisualizationModel;
 }(Backbone.Model));

tests/baselines/reference/aliasUsageInObjectLiteral.js

@@ -40,7 +40,7 @@ var Backbone = require("./aliasUsageInObjectLiteral_backbone");
 var VisualizationModel = (function (_super) {
     __extends(VisualizationModel, _super);
     function VisualizationModel() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return VisualizationModel;
 }(Backbone.Model));

tests/baselines/reference/aliasUsageInOrExpression.js

@@ -43,7 +43,7 @@ var Backbone = require("./aliasUsageInOrExpression_backbone");
 var VisualizationModel = (function (_super) {
     __extends(VisualizationModel, _super);
     function VisualizationModel() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return VisualizationModel;
 }(Backbone.Model));

tests/baselines/reference/aliasUsageInTypeArgumentOfExtendsClause.js

@@ -43,7 +43,7 @@ var Backbone = require("./aliasUsageInTypeArgumentOfExtendsClause_backbone");
 var VisualizationModel = (function (_super) {
     __extends(VisualizationModel, _super);
     function VisualizationModel() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return VisualizationModel;
 }(Backbone.Model));
@@ -64,7 +64,7 @@ var C = (function () {
 var D = (function (_super) {
     __extends(D, _super);
     function D() {
-        var _this = _super.apply(this, arguments) || this;
+        var _this = _super !== null && _super.apply(this, arguments) || this;
         _this.x = moduleA;
         return _this;
     }

tests/baselines/reference/aliasUsageInVarAssignment.js

@@ -39,7 +39,7 @@ var Backbone = require("./aliasUsageInVarAssignment_backbone");
 var VisualizationModel = (function (_super) {
     __extends(VisualizationModel, _super);
     function VisualizationModel() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return VisualizationModel;
 }(Backbone.Model));

tests/baselines/reference/ambiguousOverloadResolution.js

@@ -22,7 +22,7 @@ var A = (function () {
 var B = (function (_super) {
     __extends(B, _super);
     function B() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return B;
 }(A));

tests/baselines/reference/apparentTypeSubtyping.js

@@ -38,7 +38,7 @@ var Base = (function () {
 var Derived = (function (_super) {
     __extends(Derived, _super);
     function Derived() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return Derived;
 }(Base));
@@ -51,7 +51,7 @@ var Base2 = (function () {
 var Derived2 = (function (_super) {
     __extends(Derived2, _super);
     function Derived2() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return Derived2;
 }(Base2));

tests/baselines/reference/apparentTypeSupertype.js

@@ -28,7 +28,7 @@ var Base = (function () {
 var Derived = (function (_super) {
     __extends(Derived, _super);
     function Derived() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return Derived;
 }(Base));

tests/baselines/reference/arrayAssignmentTest1.js

@@ -101,7 +101,7 @@ var C1 = (function () {
 var C2 = (function (_super) {
     __extends(C2, _super);
     function C2() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     C2.prototype.C2M1 = function () { return null; };
     return C2;

tests/baselines/reference/arrayAssignmentTest2.js

@@ -75,7 +75,7 @@ var C1 = (function () {
 var C2 = (function (_super) {
     __extends(C2, _super);
     function C2() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     C2.prototype.C2M1 = function () { return null; };
     return C2;

tests/baselines/reference/arrayBestCommonTypes.js

@@ -128,7 +128,7 @@ var EmptyTypes;
     var derived = (function (_super) {
         __extends(derived, _super);
         function derived() {
-            return _super.apply(this, arguments) || this;
+            return _super !== null && _super.apply(this, arguments) || this;
         }
         return derived;
     }(base));
@@ -187,7 +187,7 @@ var NonEmptyTypes;
     var derived = (function (_super) {
         __extends(derived, _super);
         function derived() {
-            return _super.apply(this, arguments) || this;
+            return _super !== null && _super.apply(this, arguments) || this;
         }
         return derived;
     }(base));

tests/baselines/reference/arrayLiteralTypeInference.js

@@ -65,14 +65,14 @@ var Action = (function () {
 var ActionA = (function (_super) {
     __extends(ActionA, _super);
     function ActionA() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return ActionA;
 }(Action));
 var ActionB = (function (_super) {
     __extends(ActionB, _super);
     function ActionB() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return ActionB;
 }(Action));

tests/baselines/reference/arrayLiterals.js

@@ -70,7 +70,7 @@ var Base = (function () {
 var Derived1 = (function (_super) {
     __extends(Derived1, _super);
     function Derived1() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return Derived1;
 }(Base));
@@ -78,7 +78,7 @@ var Derived1 = (function (_super) {
 var Derived2 = (function (_super) {
     __extends(Derived2, _super);
     function Derived2() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return Derived2;
 }(Base));

tests/baselines/reference/arrayLiteralsWithRecursiveGenerics.js

@@ -39,7 +39,7 @@ var List = (function () {
 var DerivedList = (function (_super) {
     __extends(DerivedList, _super);
     function DerivedList() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return DerivedList;
 }(List));

tests/baselines/reference/arrayOfSubtypeIsAssignableToReadonlyArray.js

@@ -33,14 +33,14 @@ var A = (function () {
 var B = (function (_super) {
     __extends(B, _super);
     function B() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return B;
 }(A));
 var C = (function (_super) {
     __extends(C, _super);
     function C() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return C;
 }(Array));

tests/baselines/reference/assignmentCompatWithCallSignatures3.js

@@ -114,21 +114,21 @@ var Base = (function () {
 var Derived = (function (_super) {
     __extends(Derived, _super);
     function Derived() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return Derived;
 }(Base));
 var Derived2 = (function (_super) {
     __extends(Derived2, _super);
     function Derived2() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return Derived2;
 }(Derived));
 var OtherDerived = (function (_super) {
     __extends(OtherDerived, _super);
     function OtherDerived() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return OtherDerived;
 }(Base));

tests/baselines/reference/assignmentCompatWithCallSignatures4.js

@@ -115,21 +115,21 @@ var Errors;
     var Derived = (function (_super) {
         __extends(Derived, _super);
         function Derived() {
-            return _super.apply(this, arguments) || this;
+            return _super !== null && _super.apply(this, arguments) || this;
         }
         return Derived;
     }(Base));
     var Derived2 = (function (_super) {
         __extends(Derived2, _super);
         function Derived2() {
-            return _super.apply(this, arguments) || this;
+            return _super !== null && _super.apply(this, arguments) || this;
         }
         return Derived2;
     }(Derived));
     var OtherDerived = (function (_super) {
         __extends(OtherDerived, _super);
         function OtherDerived() {
-            return _super.apply(this, arguments) || this;
+            return _super !== null && _super.apply(this, arguments) || this;
         }
         return OtherDerived;
     }(Base));

tests/baselines/reference/assignmentCompatWithCallSignatures5.js

@@ -80,21 +80,21 @@ var Base = (function () {
 var Derived = (function (_super) {
     __extends(Derived, _super);
     function Derived() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return Derived;
 }(Base));
 var Derived2 = (function (_super) {
     __extends(Derived2, _super);
     function Derived2() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return Derived2;
 }(Derived));
 var OtherDerived = (function (_super) {
     __extends(OtherDerived, _super);
     function OtherDerived() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return OtherDerived;
 }(Base));

tests/baselines/reference/assignmentCompatWithCallSignatures6.js

@@ -57,21 +57,21 @@ var Base = (function () {
 var Derived = (function (_super) {
     __extends(Derived, _super);
     function Derived() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return Derived;
 }(Base));
 var Derived2 = (function (_super) {
     __extends(Derived2, _super);
     function Derived2() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return Derived2;
 }(Derived));
 var OtherDerived = (function (_super) {
     __extends(OtherDerived, _super);
     function OtherDerived() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return OtherDerived;
 }(Base));

tests/baselines/reference/assignmentCompatWithConstructSignatures3.js

@@ -114,21 +114,21 @@ var Base = (function () {
 var Derived = (function (_super) {
     __extends(Derived, _super);
     function Derived() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return Derived;
 }(Base));
 var Derived2 = (function (_super) {
     __extends(Derived2, _super);
     function Derived2() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return Derived2;
 }(Derived));
 var OtherDerived = (function (_super) {
     __extends(OtherDerived, _super);
     function OtherDerived() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return OtherDerived;
 }(Base));

tests/baselines/reference/assignmentCompatWithConstructSignatures4.js

@@ -115,21 +115,21 @@ var Errors;
     var Derived = (function (_super) {
         __extends(Derived, _super);
         function Derived() {
-            return _super.apply(this, arguments) || this;
+            return _super !== null && _super.apply(this, arguments) || this;
         }
         return Derived;
     }(Base));
     var Derived2 = (function (_super) {
         __extends(Derived2, _super);
         function Derived2() {
-            return _super.apply(this, arguments) || this;
+            return _super !== null && _super.apply(this, arguments) || this;
         }
         return Derived2;
     }(Derived));
     var OtherDerived = (function (_super) {
         __extends(OtherDerived, _super);
         function OtherDerived() {
-            return _super.apply(this, arguments) || this;
+            return _super !== null && _super.apply(this, arguments) || this;
         }
         return OtherDerived;
     }(Base));

tests/baselines/reference/assignmentCompatWithConstructSignatures5.js

@@ -80,21 +80,21 @@ var Base = (function () {
 var Derived = (function (_super) {
     __extends(Derived, _super);
     function Derived() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return Derived;
 }(Base));
 var Derived2 = (function (_super) {
     __extends(Derived2, _super);
     function Derived2() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return Derived2;
 }(Derived));
 var OtherDerived = (function (_super) {
     __extends(OtherDerived, _super);
     function OtherDerived() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return OtherDerived;
 }(Base));

tests/baselines/reference/assignmentCompatWithConstructSignatures6.js

@@ -57,21 +57,21 @@ var Base = (function () {
 var Derived = (function (_super) {
     __extends(Derived, _super);
     function Derived() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return Derived;
 }(Base));
 var Derived2 = (function (_super) {
     __extends(Derived2, _super);
     function Derived2() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return Derived2;
 }(Derived));
 var OtherDerived = (function (_super) {
     __extends(OtherDerived, _super);
     function OtherDerived() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return OtherDerived;
 }(Base));

tests/baselines/reference/assignmentCompatWithNumericIndexer.js

@@ -72,7 +72,7 @@ var Generics;
     var B = (function (_super) {
         __extends(B, _super);
         function B() {
-            return _super.apply(this, arguments) || this;
+            return _super !== null && _super.apply(this, arguments) || this;
         }
         return B;
     }(A));

tests/baselines/reference/assignmentCompatWithNumericIndexer3.js

@@ -59,7 +59,7 @@ b = a; // ok
 var B2 = (function (_super) {
     __extends(B2, _super);
     function B2() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return B2;
 }(A));

tests/baselines/reference/assignmentCompatWithObjectMembers4.js

@@ -108,14 +108,14 @@ var OnlyDerived;
     var Derived = (function (_super) {
         __extends(Derived, _super);
         function Derived() {
-            return _super.apply(this, arguments) || this;
+            return _super !== null && _super.apply(this, arguments) || this;
         }
         return Derived;
     }(Base));
     var Derived2 = (function (_super) {
         __extends(Derived2, _super);
         function Derived2() {
-            return _super.apply(this, arguments) || this;
+            return _super !== null && _super.apply(this, arguments) || this;
         }
         return Derived2;
     }(Base));
@@ -167,14 +167,14 @@ var WithBase;
     var Derived = (function (_super) {
         __extends(Derived, _super);
         function Derived() {
-            return _super.apply(this, arguments) || this;
+            return _super !== null && _super.apply(this, arguments) || this;
         }
         return Derived;
     }(Base));
     var Derived2 = (function (_super) {
         __extends(Derived2, _super);
         function Derived2() {
-            return _super.apply(this, arguments) || this;
+            return _super !== null && _super.apply(this, arguments) || this;
         }
         return Derived2;
     }(Base));

tests/baselines/reference/assignmentCompatWithObjectMembersOptionality.js

@@ -103,14 +103,14 @@ var Base = (function () {
 var Derived = (function (_super) {
     __extends(Derived, _super);
     function Derived() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return Derived;
 }(Base));
 var Derived2 = (function (_super) {
     __extends(Derived2, _super);
     function Derived2() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return Derived2;
 }(Derived));

tests/baselines/reference/assignmentCompatWithObjectMembersOptionality2.js

@@ -105,14 +105,14 @@ var Base = (function () {
 var Derived = (function (_super) {
     __extends(Derived, _super);
     function Derived() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return Derived;
 }(Base));
 var Derived2 = (function (_super) {
     __extends(Derived2, _super);
     function Derived2() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return Derived2;
 }(Derived));

tests/baselines/reference/assignmentCompatWithStringIndexer.js

@@ -82,7 +82,7 @@ var Generics;
     var B = (function (_super) {
         __extends(B, _super);
         function B() {
-            return _super.apply(this, arguments) || this;
+            return _super !== null && _super.apply(this, arguments) || this;
         }
         return B;
     }(A));
@@ -93,7 +93,7 @@ var Generics;
     var B2 = (function (_super) {
         __extends(B2, _super);
         function B2() {
-            return _super.apply(this, arguments) || this;
+            return _super !== null && _super.apply(this, arguments) || this;
         }
         return B2;
     }(A));

tests/baselines/reference/asyncImportedPromise_es5.js

@@ -19,7 +19,7 @@ var __extends = (this && this.__extends) || function (d, b) {
 var Task = (function (_super) {
     __extends(Task, _super);
     function Task() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return Task;
 }(Promise));

tests/baselines/reference/asyncMethodWithSuper_es5.js

@@ -61,7 +61,7 @@ var A = (function () {
 var B = (function (_super) {
     __extends(B, _super);
     function B() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     // async method with only call/get on 'super' does not require a binding
     B.prototype.simple = function () {

tests/baselines/reference/asyncQualifiedReturnType_es5.js

@@ -13,7 +13,7 @@ var X;
     var MyPromise = (function (_super) {
         __extends(MyPromise, _super);
         function MyPromise() {
-            return _super.apply(this, arguments) || this;
+            return _super !== null && _super.apply(this, arguments) || this;
         }
         return MyPromise;
     }(Promise));

tests/baselines/reference/awaitClassExpression_es5.js

@@ -17,7 +17,7 @@ function func() {
                     _a = function (_super) {
                         __extends(D, _super);
                         function D() {
-                            return _super.apply(this, arguments) || this;
+                            return _super !== null && _super.apply(this, arguments) || this;
                         }
                         return D;
                     };

tests/baselines/reference/baseIndexSignatureResolution.js

@@ -38,7 +38,7 @@ var Base = (function () {
 var Derived = (function (_super) {
     __extends(Derived, _super);
     function Derived() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return Derived;
 }(Base));

tests/baselines/reference/baseTypeOrderChecking.js

@@ -51,7 +51,7 @@ var Class1 = (function () {
 var Class2 = (function (_super) {
     __extends(Class2, _super);
     function Class2() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return Class2;
 }(Class1));
@@ -63,7 +63,7 @@ var Class3 = (function () {
 var Class4 = (function (_super) {
     __extends(Class4, _super);
     function Class4() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return Class4;
 }(Class3));

tests/baselines/reference/baseTypeWrappingInstantiationChain.js

@@ -41,7 +41,7 @@ var CBaseBase = (function () {
 var CBase = (function (_super) {
     __extends(CBase, _super);
     function CBase() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return CBase;
 }(CBaseBase));
@@ -59,7 +59,7 @@ var Wrapper = (function () {
 var C = (function (_super) {
     __extends(C, _super);
     function C() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     C.prototype.works = function () {
         new CBaseBase(this);

tests/baselines/reference/bases.js

@@ -36,7 +36,7 @@ var B = (function () {
 var C = (function (_super) {
     __extends(C, _super);
     function C() {
-        var _this;
+        var _this = this;
         _this.x;
         any;
         return _this;

tests/baselines/reference/bestCommonTypeOfConditionalExpressions.js

@@ -44,14 +44,14 @@ var Base = (function () {
 var Derived = (function (_super) {
     __extends(Derived, _super);
     function Derived() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return Derived;
 }(Base));
 var Derived2 = (function (_super) {
     __extends(Derived2, _super);
     function Derived2() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return Derived2;
 }(Base));

tests/baselines/reference/bestCommonTypeOfConditionalExpressions2.js

@@ -40,14 +40,14 @@ var Base = (function () {
 var Derived = (function (_super) {
     __extends(Derived, _super);
     function Derived() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return Derived;
 }(Base));
 var Derived2 = (function (_super) {
     __extends(Derived2, _super);
     function Derived2() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return Derived2;
 }(Base));

tests/baselines/reference/bestCommonTypeOfTuple2.js

@@ -46,7 +46,7 @@ var E = (function () {
 var F = (function (_super) {
     __extends(F, _super);
     function F() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return F;
 }(C));
@@ -59,7 +59,7 @@ var C1 = (function () {
 var D1 = (function (_super) {
     __extends(D1, _super);
     function D1() {
-        var _this = _super.apply(this, arguments) || this;
+        var _this = _super !== null && _super.apply(this, arguments) || this;
         _this.i = "bar";
         return _this;
     }

tests/baselines/reference/callSignatureAssignabilityInInheritance2.js

@@ -84,21 +84,21 @@ var Base = (function () {
 var Derived = (function (_super) {
     __extends(Derived, _super);
     function Derived() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return Derived;
 }(Base));
 var Derived2 = (function (_super) {
     __extends(Derived2, _super);
     function Derived2() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return Derived2;
 }(Derived));
 var OtherDerived = (function (_super) {
     __extends(OtherDerived, _super);
     function OtherDerived() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return OtherDerived;
 }(Base));

tests/baselines/reference/callSignatureAssignabilityInInheritance3.js

@@ -131,21 +131,21 @@ var Errors;
     var Derived = (function (_super) {
         __extends(Derived, _super);
         function Derived() {
-            return _super.apply(this, arguments) || this;
+            return _super !== null && _super.apply(this, arguments) || this;
         }
         return Derived;
     }(Base));
     var Derived2 = (function (_super) {
         __extends(Derived2, _super);
         function Derived2() {
-            return _super.apply(this, arguments) || this;
+            return _super !== null && _super.apply(this, arguments) || this;
         }
         return Derived2;
     }(Derived));
     var OtherDerived = (function (_super) {
         __extends(OtherDerived, _super);
         function OtherDerived() {
-            return _super.apply(this, arguments) || this;
+            return _super !== null && _super.apply(this, arguments) || this;
         }
         return OtherDerived;
     }(Base));

tests/baselines/reference/callSignatureAssignabilityInInheritance4.js

@@ -64,21 +64,21 @@ var Base = (function () {
 var Derived = (function (_super) {
     __extends(Derived, _super);
     function Derived() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return Derived;
 }(Base));
 var Derived2 = (function (_super) {
     __extends(Derived2, _super);
     function Derived2() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return Derived2;
 }(Derived));
 var OtherDerived = (function (_super) {
     __extends(OtherDerived, _super);
     function OtherDerived() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return OtherDerived;
 }(Base));

tests/baselines/reference/callSignatureAssignabilityInInheritance5.js

@@ -64,21 +64,21 @@ var Base = (function () {
 var Derived = (function (_super) {
     __extends(Derived, _super);
     function Derived() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return Derived;
 }(Base));
 var Derived2 = (function (_super) {
     __extends(Derived2, _super);
     function Derived2() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return Derived2;
 }(Derived));
 var OtherDerived = (function (_super) {
     __extends(OtherDerived, _super);
     function OtherDerived() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return OtherDerived;
 }(Base));

tests/baselines/reference/callSignatureAssignabilityInInheritance6.js

@@ -67,21 +67,21 @@ var Base = (function () {
 var Derived = (function (_super) {
     __extends(Derived, _super);
     function Derived() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return Derived;
 }(Base));
 var Derived2 = (function (_super) {
     __extends(Derived2, _super);
     function Derived2() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return Derived2;
 }(Derived));
 var OtherDerived = (function (_super) {
     __extends(OtherDerived, _super);
     function OtherDerived() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return OtherDerived;
 }(Base));

tests/baselines/reference/castingTuple.js

@@ -59,7 +59,7 @@ var D = (function () {
 var E = (function (_super) {
     __extends(E, _super);
     function E() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return E;
 }(A));
@@ -67,7 +67,7 @@ var E = (function (_super) {
 var F = (function (_super) {
     __extends(F, _super);
     function F() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return F;
 }(A));

tests/baselines/reference/chainedAssignment3.js

@@ -36,7 +36,7 @@ var A = (function () {
 var B = (function (_super) {
     __extends(B, _super);
     function B() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return B;
 }(A));

tests/baselines/reference/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter.js

@@ -42,14 +42,14 @@ var A = (function () {
 var B = (function (_super) {
     __extends(B, _super);
     function B() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return B;
 }(A));
 var C = (function (_super) {
     __extends(C, _super);
     function C() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return C;
 }(B));

tests/baselines/reference/checkSuperCallBeforeThisAccessing2.js

@@ -24,7 +24,7 @@ var Based = (function () {
 var Derived = (function (_super) {
     __extends(Derived, _super);
     function Derived() {
-        var _this;
+        var _this = this;
         _this.x = 100;
         _this = _super.call(this) || this;
         _this.x = 10;

tests/baselines/reference/checkSuperCallBeforeThisAccessing3.js

@@ -29,7 +29,7 @@ var Based = (function () {
 var Derived = (function (_super) {
     __extends(Derived, _super);
     function Derived() {
-        var _this;
+        var _this = this;
         var innver = (function () {
             function innver() {
                 this.y = true;

tests/baselines/reference/checkSuperCallBeforeThisAccessing4.js

@@ -33,7 +33,7 @@ var Based = (function () {
 var Derived = (function (_super) {
     __extends(Derived, _super);
     function Derived() {
-        var _this;
+        var _this = this;
         (function () {
             _this; // No error
         });

tests/baselines/reference/checkSuperCallBeforeThisAccessing6.js

@@ -28,7 +28,7 @@ var Base = (function () {
 var Super = (function (_super) {
     __extends(Super, _super);
     function Super() {
-        var _this;
+        var _this = this;
         (function () { return _this; }); // No Error
         _this = _super.call(this) || this;
         return _this;

tests/baselines/reference/checkSuperCallBeforeThisAccessing8.js

@@ -28,7 +28,7 @@ var Base = (function () {
 var Super = (function (_super) {
     __extends(Super, _super);
     function Super() {
-        var _this;
+        var _this = this;
         var that = _this;
         _this = _super.call(this) || this;
         return _this;

tests/baselines/reference/circularImportAlias.js

@@ -32,7 +32,7 @@ var B;
     var D = (function (_super) {
         __extends(D, _super);
         function D() {
-            return _super.apply(this, arguments) || this;
+            return _super !== null && _super.apply(this, arguments) || this;
         }
         return D;
     }(B.a.C));

tests/baselines/reference/circularTypeofWithFunctionModule.js

@@ -31,7 +31,7 @@ function maker(value) {
     var Bar = (function (_super) {
         __extends(Bar, _super);
         function Bar() {
-            return _super.apply(this, arguments) || this;
+            return _super !== null && _super.apply(this, arguments) || this;
         }
         return Bar;
     }(Foo));

tests/baselines/reference/classAbstractConstructorAssignability.js

@@ -28,14 +28,14 @@ var A = (function () {
 var B = (function (_super) {
     __extends(B, _super);
     function B() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return B;
 }(A));
 var C = (function (_super) {
     __extends(C, _super);
     function C() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return C;
 }(B));

tests/baselines/reference/classAbstractCrashedOnce.js

@@ -24,7 +24,7 @@ var foo = (function () {
 var bar = (function (_super) {
     __extends(bar, _super);
     function bar() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     bar.prototype.test = function () {
         this.

tests/baselines/reference/classAbstractExtends.js

@@ -31,28 +31,28 @@ var A = (function () {
 var B = (function (_super) {
     __extends(B, _super);
     function B() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return B;
 }(A));
 var C = (function (_super) {
     __extends(C, _super);
     function C() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return C;
 }(B));
 var D = (function (_super) {
     __extends(D, _super);
     function D() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return D;
 }(B));
 var E = (function (_super) {
     __extends(E, _super);
     function E() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     E.prototype.bar = function () { };
     return E;

tests/baselines/reference/classAbstractFactoryFunction.js

@@ -31,7 +31,7 @@ var A = (function () {
 var B = (function (_super) {
     __extends(B, _super);
     function B() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return B;
 }(A));

tests/baselines/reference/classAbstractGeneric.js

@@ -39,28 +39,28 @@ var A = (function () {
 var B = (function (_super) {
     __extends(B, _super);
     function B() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return B;
 }(A));
 var C = (function (_super) {
     __extends(C, _super);
     function C() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return C;
 }(A)); // error -- inherits abstract methods
 var D = (function (_super) {
     __extends(D, _super);
     function D() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return D;
 }(A)); // error -- inherits abstract methods
 var E = (function (_super) {
     __extends(E, _super);
     function E() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     E.prototype.foo = function () { return this.t; };
     return E;
@@ -68,7 +68,7 @@ var E = (function (_super) {
 var F = (function (_super) {
     __extends(F, _super);
     function F() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     F.prototype.bar = function (t) { };
     return F;
@@ -76,7 +76,7 @@ var F = (function (_super) {
 var G = (function (_super) {
     __extends(G, _super);
     function G() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     G.prototype.foo = function () { return this.t; };
     G.prototype.bar = function (t) { };

tests/baselines/reference/classAbstractInAModule.js

@@ -24,7 +24,7 @@ var M;
     var B = (function (_super) {
         __extends(B, _super);
         function B() {
-            return _super.apply(this, arguments) || this;
+            return _super !== null && _super.apply(this, arguments) || this;
         }
         return B;
     }(A));

tests/baselines/reference/classAbstractInheritance.js

@@ -35,14 +35,14 @@ var A = (function () {
 var B = (function (_super) {
     __extends(B, _super);
     function B() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return B;
 }(A));
 var C = (function (_super) {
     __extends(C, _super);
     function C() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return C;
 }(A));
@@ -54,42 +54,42 @@ var AA = (function () {
 var BB = (function (_super) {
     __extends(BB, _super);
     function BB() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return BB;
 }(AA));
 var CC = (function (_super) {
     __extends(CC, _super);
     function CC() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return CC;
 }(AA));
 var DD = (function (_super) {
     __extends(DD, _super);
     function DD() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return DD;
 }(BB));
 var EE = (function (_super) {
     __extends(EE, _super);
     function EE() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return EE;
 }(BB));
 var FF = (function (_super) {
     __extends(FF, _super);
     function FF() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return FF;
 }(CC));
 var GG = (function (_super) {
     __extends(GG, _super);
     function GG() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return GG;
 }(CC));

tests/baselines/reference/classAbstractInstantiations1.js

@@ -41,14 +41,14 @@ var A = (function () {
 var B = (function (_super) {
     __extends(B, _super);
     function B() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return B;
 }(A));
 var C = (function (_super) {
     __extends(C, _super);
     function C() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return C;
 }(B));

tests/baselines/reference/classAbstractInstantiations2.js

@@ -82,21 +82,21 @@ new x; // okay -- undefined behavior at runtime
 var C = (function (_super) {
     __extends(C, _super);
     function C() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return C;
 }(B)); // error -- not declared abstract
 var D = (function (_super) {
     __extends(D, _super);
     function D() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return D;
 }(B)); // okay
 var E = (function (_super) {
     __extends(E, _super);
     function E() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     E.prototype.bar = function () { return 1; };
     return E;
@@ -104,7 +104,7 @@ var E = (function (_super) {
 var F = (function (_super) {
     __extends(F, _super);
     function F() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     F.prototype.bar = function () { return 2; };
     return F;

tests/baselines/reference/classAbstractOverrideWithAbstract.js

@@ -38,7 +38,7 @@ var A = (function () {
 var B = (function (_super) {
     __extends(B, _super);
     function B() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return B;
 }(A));
@@ -51,7 +51,7 @@ var AA = (function () {
 var BB = (function (_super) {
     __extends(BB, _super);
     function BB() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     BB.prototype.bar = function () { };
     return BB;
@@ -59,14 +59,14 @@ var BB = (function (_super) {
 var CC = (function (_super) {
     __extends(CC, _super);
     function CC() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return CC;
 }(BB)); // error
 var DD = (function (_super) {
     __extends(DD, _super);
     function DD() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     DD.prototype.foo = function () { };
     return DD;

tests/baselines/reference/classAbstractSuperCalls.js

@@ -42,7 +42,7 @@ var A = (function () {
 var B = (function (_super) {
     __extends(B, _super);
     function B() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     B.prototype.bar = function () { _super.prototype.foo.call(this); };
     B.prototype.baz = function () { return this.foo; };
@@ -51,7 +51,7 @@ var B = (function (_super) {
 var C = (function (_super) {
     __extends(C, _super);
     function C() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     C.prototype.foo = function () { return 2; };
     C.prototype.qux = function () { return _super.prototype.foo.call(this) || _super.prototype.foo; }; // 2 errors, foo is abstract
@@ -68,7 +68,7 @@ var AA = (function () {
 var BB = (function (_super) {
     __extends(BB, _super);
     function BB() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return BB;
 }(AA));

tests/baselines/reference/classAbstractUsingAbstractMethod1.js

@@ -31,7 +31,7 @@ var A = (function () {
 var B = (function (_super) {
     __extends(B, _super);
     function B() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     B.prototype.foo = function () { return 1; };
     return B;
@@ -39,7 +39,7 @@ var B = (function (_super) {
 var C = (function (_super) {
     __extends(C, _super);
     function C() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return C;
 }(A));

tests/baselines/reference/classAbstractUsingAbstractMethods2.js

@@ -41,21 +41,21 @@ var A = (function () {
 var B = (function (_super) {
     __extends(B, _super);
     function B() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return B;
 }(A));
 var C = (function (_super) {
     __extends(C, _super);
     function C() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return C;
 }(A));
 var D = (function (_super) {
     __extends(D, _super);
     function D() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     D.prototype.foo = function () { };
     return D;
@@ -63,7 +63,7 @@ var D = (function (_super) {
 var E = (function (_super) {
     __extends(E, _super);
     function E() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     E.prototype.foo = function () { };
     return E;
@@ -76,21 +76,21 @@ var AA = (function () {
 var BB = (function (_super) {
     __extends(BB, _super);
     function BB() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return BB;
 }(AA));
 var CC = (function (_super) {
     __extends(CC, _super);
     function CC() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return CC;
 }(AA));
 var DD = (function (_super) {
     __extends(DD, _super);
     function DD() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     DD.prototype.foo = function () { };
     return DD;

tests/baselines/reference/classConstructorAccessibility4.js

@@ -51,7 +51,7 @@ var A = (function () {
         var C = (function (_super) {
             __extends(C, _super);
             function C() {
-                return _super.apply(this, arguments) || this;
+                return _super !== null && _super.apply(this, arguments) || this;
             }
             return C;
         }(A));
@@ -73,7 +73,7 @@ var D = (function () {
         var F = (function (_super) {
             __extends(F, _super);
             function F() {
-                return _super.apply(this, arguments) || this;
+                return _super !== null && _super.apply(this, arguments) || this;
             }
             return F;
         }(D));

tests/baselines/reference/classConstructorAccessibility5.js

@@ -25,7 +25,7 @@ var Base = (function () {
 var Derived = (function (_super) {
     __extends(Derived, _super);
     function Derived() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     Derived.make = function () { new Base(); }; // ok
     return Derived;

tests/baselines/reference/classDeclarationMergedInModuleWithContinuation.js

@@ -33,7 +33,7 @@ var M;
     var O = (function (_super) {
         __extends(O, _super);
         function O() {
-            return _super.apply(this, arguments) || this;
+            return _super !== null && _super.apply(this, arguments) || this;
         }
         return O;
     }(M.N));

tests/baselines/reference/classDeclaredBeforeClassFactory.js

@@ -17,7 +17,7 @@ var __extends = (this && this.__extends) || function (d, b) {
 var Derived = (function (_super) {
     __extends(Derived, _super);
     function Derived() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return Derived;
 }(makeBaseClass()));

tests/baselines/reference/classDoesNotDependOnBaseTypes.js

@@ -31,7 +31,7 @@ var StringTreeCollectionBase = (function () {
 var StringTreeCollection = (function (_super) {
     __extends(StringTreeCollection, _super);
     function StringTreeCollection() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return StringTreeCollection;
 }(StringTreeCollectionBase));

tests/baselines/reference/classExpression2.js

@@ -16,7 +16,7 @@ var D = (function () {
 var v = (function (_super) {
     __extends(C, _super);
     function C() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return C;
 }(D));

tests/baselines/reference/classExpression3.js

@@ -15,7 +15,7 @@ var __extends = (this && this.__extends) || function (d, b) {
 var C = (function (_super) {
     __extends(class_1, _super);
     function class_1() {
-        var _this = _super.apply(this, arguments) || this;
+        var _this = _super !== null && _super.apply(this, arguments) || this;
         _this.c = 3;
         return _this;
     }
@@ -23,7 +23,7 @@ var C = (function (_super) {
 }((function (_super) {
     __extends(class_2, _super);
     function class_2() {
-        var _this = _super.apply(this, arguments) || this;
+        var _this = _super !== null && _super.apply(this, arguments) || this;
         _this.b = 2;
         return _this;
     }

tests/baselines/reference/classExpressionExtendingAbstractClass.js

@@ -22,7 +22,7 @@ var A = (function () {
 var C = (function (_super) {
     __extends(class_1, _super);
     function class_1() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return class_1;
 }(A));

tests/baselines/reference/classExtendingBuiltinType.js

@@ -20,70 +20,70 @@ var __extends = (this && this.__extends) || function (d, b) {
 var C1 = (function (_super) {
     __extends(C1, _super);
     function C1() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return C1;
 }(Object));
 var C2 = (function (_super) {
     __extends(C2, _super);
     function C2() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return C2;
 }(Function));
 var C3 = (function (_super) {
     __extends(C3, _super);
     function C3() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return C3;
 }(String));
 var C4 = (function (_super) {
     __extends(C4, _super);
     function C4() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return C4;
 }(Boolean));
 var C5 = (function (_super) {
     __extends(C5, _super);
     function C5() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return C5;
 }(Number));
 var C6 = (function (_super) {
     __extends(C6, _super);
     function C6() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return C6;
 }(Date));
 var C7 = (function (_super) {
     __extends(C7, _super);
     function C7() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return C7;
 }(RegExp));
 var C8 = (function (_super) {
     __extends(C8, _super);
     function C8() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return C8;
 }(Error));
 var C9 = (function (_super) {
     __extends(C9, _super);
     function C9() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return C9;
 }(Array));
 var C10 = (function (_super) {
     __extends(C10, _super);
     function C10() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return C10;
 }(Array));

tests/baselines/reference/classExtendingClass.js

@@ -47,7 +47,7 @@ var C = (function () {
 var D = (function (_super) {
     __extends(D, _super);
     function D() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return D;
 }(C));
@@ -66,7 +66,7 @@ var C2 = (function () {
 var D2 = (function (_super) {
     __extends(D2, _super);
     function D2() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return D2;
 }(C2));

tests/baselines/reference/classExtendingClassLikeType.js

@@ -68,7 +68,7 @@ var __extends = (this && this.__extends) || function (d, b) {
 var D0 = (function (_super) {
     __extends(D0, _super);
     function D0() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return D0;
 }(Base));
@@ -107,7 +107,7 @@ var D3 = (function (_super) {
 var D4 = (function (_super) {
     __extends(D4, _super);
     function D4() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return D4;
 }(getBase()));
@@ -115,7 +115,7 @@ var D4 = (function (_super) {
 var D5 = (function (_super) {
     __extends(D5, _super);
     function D5() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return D5;
 }(getBadBase()));

tests/baselines/reference/classExtendingNonConstructor.js

@@ -27,49 +27,49 @@ function foo() {
 var C1 = (function (_super) {
     __extends(C1, _super);
     function C1() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return C1;
 }(undefined));
 var C2 = (function (_super) {
     __extends(C2, _super);
     function C2() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return C2;
 }(true));
 var C3 = (function (_super) {
     __extends(C3, _super);
     function C3() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return C3;
 }(false));
 var C4 = (function (_super) {
     __extends(C4, _super);
     function C4() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return C4;
 }(42));
 var C5 = (function (_super) {
     __extends(C5, _super);
     function C5() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return C5;
 }("hello"));
 var C6 = (function (_super) {
     __extends(C6, _super);
     function C6() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return C6;
 }(x));
 var C7 = (function (_super) {
     __extends(C7, _super);
     function C7() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return C7;
 }(foo));

tests/baselines/reference/classExtendingNull.js

@@ -12,14 +12,12 @@ var __extends = (this && this.__extends) || function (d, b) {
 var C1 = (function (_super) {
     __extends(C1, _super);
     function C1() {
-        return _super.apply(this, arguments) || this;
     }
     return C1;
 }(null));
 var C2 = (function (_super) {
     __extends(C2, _super);
     function C2() {
-        return _super.apply(this, arguments) || this;
     }
     return C2;
 }((null)));

tests/baselines/reference/classExtendingPrimitive.js

@@ -24,28 +24,28 @@ var __extends = (this && this.__extends) || function (d, b) {
 var C = (function (_super) {
     __extends(C, _super);
     function C() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return C;
 }(number));
 var C2 = (function (_super) {
     __extends(C2, _super);
     function C2() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return C2;
 }(string));
 var C3 = (function (_super) {
     __extends(C3, _super);
     function C3() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return C3;
 }(boolean));
 var C4 = (function (_super) {
     __extends(C4, _super);
     function C4() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return C4;
 }(Void));
@@ -58,28 +58,27 @@ void {};
 var C5 = (function (_super) {
     __extends(C5, _super);
     function C5() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return C5;
 }(Null));
 var C5a = (function (_super) {
     __extends(C5a, _super);
     function C5a() {
-        return _super.apply(this, arguments) || this;
     }
     return C5a;
 }(null));
 var C6 = (function (_super) {
     __extends(C6, _super);
     function C6() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return C6;
 }(undefined));
 var C7 = (function (_super) {
     __extends(C7, _super);
     function C7() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return C7;
 }(Undefined));
@@ -90,7 +89,7 @@ var E;
 var C8 = (function (_super) {
     __extends(C8, _super);
     function C8() {
-        return _super.apply(this, arguments) || this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     return C8;
 }(E));

tests/baselines/reference/classExtendingPrimitive2.js

@@ -20,7 +20,6 @@ void {};
 var C5a = (function (_super) {
     __extends(C5a, _super);
     function C5a() {
-        return _super.apply(this, arguments) || this;
     }
     return C5a;
 }(null));

tests/baselines/reference/classExtendingQualifiedName.js

@@ -23,7 +23,7 @@ var M;
     var D = (function (_super) {
         __extends(D, _super);
         function D() {
-            return _super.apply(this, arguments) || this;
+            return _super !== null && _super.apply(this, arguments) || this;
         }
         return D;
     }(M.C));

tests/baselines/reference/classExtendingQualifiedName2.js

@@ -24,7 +24,7 @@ var M;
     var D = (function (_super) {
         __extends(D, _super);
         function D() {
-            return _super.apply(this, arguments) || this;
+            return _super !== null && _super.apply(this, arguments) || this;
         }
         return D;
     }(M.C));

tests/baselines/reference/classExtendsAcrossFiles.js

@@ -37,7 +37,7 @@ exports.b = {
         var B = (function (_super) {
             __extends(B, _super);
             function B() {
-                return _super.apply(this, arguments) || this;
+                return _super !== null && _super.apply(this, arguments) || this;
             }
             return B;
         }(A));
@@ -62,7 +62,7 @@ exports.a = {
         var B = (function (_super) {
             __extends(B, _super);
             function B() {
-                return _super.apply(this, arguments) || this;
+                return _super !== null && _super.apply(this, arguments) || this;
             }
             return B;
         }(A));

tests/baselines/reference/classExtendsClauseClassMergedWithModuleNotReferingConstructor.js

@@ -32,7 +32,7 @@ var Foo;
     var B = (function (_super) {
         __extends(B, _super);
         function B() {
-            return _super.apply(this, arguments) || this;
+            return _super !== null && _super.apply(this, arguments) || this;
         }
         return B;
     }(A));

tests/baselines/reference/classExtendsClauseClassNotReferringConstructor.js

@@ -23,7 +23,7 @@ var Foo;
     var B = (function (_super) {
         __extends(B, _super);
         function B() {
-            return _super.apply(this, arguments) || this;
+            return _super !== null && _super.apply(this, arguments) || this;
         }
         return B;
     }(A));