Merge pull request #6080 from akyrtzi/fix-crash-014

swift-ci · web-flow · commit 796994cd805d · 2016-12-05T13:30:31.000-08:00
diff --git a/lib/Parse/ParseDecl.cpp b/lib/Parse/ParseDecl.cpp
@@ -4204,7 +4204,7 @@ ParserStatus Parser::parseDeclVar(ParseDeclOptions Flags,
       if (init.hasCodeCompletion() && isCodeCompletionFirstPass()) {
 
         // Register the end of the init as the end of the delayed parsing.
-        DelayedDeclEnd = init.get() ? init.get()->getEndLoc() : SourceLoc();
+        DelayedDeclEnd = init.getPtrOrNull() ? init.get()->getEndLoc() : SourceLoc();
         return makeParserCodeCompletionStatus();
       }
 
diff --git a/validation-test/IDE/crashers/014-swift-parser-parsedeclvar.swift b/validation-test/IDE/crashers/014-swift-parser-parsedeclvar.swift
diff --git a/validation-test/IDE/crashers_fixed/014-swift-parser-parsedeclvar.swift b/validation-test/IDE/crashers_fixed/014-swift-parser-parsedeclvar.swift
@@ -0,0 +1,2 @@
+// RUN: %target-swift-ide-test -code-completion -code-completion-token=A -source-filename=%s
+protocol A{let h=o#^A^#

Original file line number	Diff line number	Diff line change
`@@ -4204,7 +4204,7 @@ ParserStatus Parser::parseDeclVar(ParseDeclOptions Flags,`
`4204`	`4204`	`if (init.hasCodeCompletion() && isCodeCompletionFirstPass()) {`
`4205`	`4205`
`4206`	`4206`	`// Register the end of the init as the end of the delayed parsing.`
`4207`		`- DelayedDeclEnd = init.get() ? init.get()->getEndLoc() : SourceLoc();`
	`4207`	`+ DelayedDeclEnd = init.getPtrOrNull() ? init.get()->getEndLoc() : SourceLoc();`
`4208`	`4208`	`return makeParserCodeCompletionStatus();`
`4209`	`4209`	`}`
`4210`	`4210`
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`	`+protocol A{let h=o#^A^#`