Merge pull request #13480 from rintaro/4.1-parse-placeholder-disablesyntax

[4.1][Parse] Disable token receiver while parsing types in editor placeholder

Author: akyrtzi

lib/Parse/ParseExpr.cpp

@@ -2237,6 +2237,13 @@ Expr *Parser::parseExprEditorPlaceholder(Token PlaceholderTok,
 
       // Temporarily swap out the parser's current lexer with our new one.
       llvm::SaveAndRestore<Lexer *> T(L, &LocalLex);
+
+      // Don't feed to syntax token recorder.
+      ConsumeTokenReceiver DisabledRec;
+      llvm::SaveAndRestore<ConsumeTokenReceiver *> R(TokReceiver, &DisabledRec);
+      SyntaxParsingContext SContext(SyntaxContext);
+      SContext.disable();
+
       Tok.setKind(tok::unknown); // we might be at tok::eof now.
       consumeTokenWithoutFeedingReceiver();
       return parseType().getPtrOrNull();

validation-test/IDE/crashers_2_fixed/0017-editorplacehoder-at-eof.swift

@@ -0,0 +1,4 @@
+// RUN: %target-swift-ide-test -structure -source-filename=%s
+// rdar://problem/36081659
+
+var str = <#T##String#>