Merge pull request #6076 from benlangmuir/fix-040

swift-ci · web-flow · commit c14391de1f73 · 2016-12-05T12:16:08.000-08:00
diff --git a/lib/Sema/TypeCheckStmt.cpp b/lib/Sema/TypeCheckStmt.cpp
@@ -1406,7 +1406,7 @@ bool TypeChecker::typeCheckConstructorBodyUntil(ConstructorDecl *ctor,
   // Determine whether we need to introduce a super.init call.
   auto nominalDecl = ctor->getDeclContext()
     ->getAsNominalTypeOrNominalTypeExtensionContext();
-  ClassDecl *ClassD = dyn_cast<ClassDecl>(nominalDecl);
+  ClassDecl *ClassD = dyn_cast_or_null<ClassDecl>(nominalDecl);
   bool wantSuperInitCall = false;
   if (ClassD) {
     bool isDelegating = false;
diff --git a/validation-test/IDE/crashers/040-swift-typechecker-typecheckconstructorbodyuntil.swift b/validation-test/IDE/crashers/040-swift-typechecker-typecheckconstructorbodyuntil.swift
diff --git a/validation-test/IDE/crashers_fixed/040-swift-typechecker-typecheckconstructorbodyuntil.swift b/validation-test/IDE/crashers_fixed/040-swift-typechecker-typecheckconstructorbodyuntil.swift
@@ -0,0 +1,2 @@
+// RUN: %target-swift-ide-test -code-completion -code-completion-token=A -source-filename=%s
+t{extension{init(){#^A^#

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+// RUN: %target-swift-ide-test -code-completion -code-completion-token=A -source-filename=%s`
	`2`	`+t{extension{init(){#^A^#`