Merge pull request #6085 from nathawes/rdar28867801

benlangmuir · web-flow · commit 49f144205fd6 · 2016-12-06T11:46:26.000-08:00
[code-completion] Fix crash in printParameterList when paramListTy is…
diff --git a/lib/AST/ASTPrinter.cpp b/lib/AST/ASTPrinter.cpp
@@ -2461,7 +2461,7 @@ void PrintAST::printParameterList(ParameterList *PL, Type paramListTy,
                                   bool isCurried,
                                   std::function<bool()> isAPINameByDefault) {
   SmallVector<ParameterTypeFlags, 4> paramFlags;
-  if (paramListTy) {
+  if (paramListTy && !paramListTy->hasError()) {
     if (auto parenTy = dyn_cast<ParenType>(paramListTy.getPointer())) {
       paramFlags.push_back(parenTy->getParameterFlags());
     } else if (auto tupleTy = paramListTy->getAs<TupleType>()) {
diff --git a/validation-test/IDE/crashers/101-swift-decl-print.swift b/validation-test/IDE/crashers/101-swift-decl-print.swift
diff --git a/validation-test/IDE/crashers_fixed/101-swift-decl-print.swift b/validation-test/IDE/crashers_fixed/101-swift-decl-print.swift
@@ -0,0 +1,2 @@
+// RUN: %target-swift-ide-test -code-completion -code-completion-token=A -source-filename=%s
+class A{func b(a c s:]class c:A{#^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`	`+class A{func b(a c s:]class c:A{#^A^#`