Revert "Merge pull request swiftlang#27000 from rintaro/syntaxparse-roundtrip3"

rintaro · rintaro · commit 97a6fbc33203 · 2019-10-14T13:43:43.000-07:00
This reverts commit 0d84e76, reversing changes made to f262601.
diff --git a/lib/Parse/ParseType.cpp b/lib/Parse/ParseType.cpp
@@ -843,8 +843,7 @@ Parser::parseTypeSimpleOrComposition(Diag<> MessageID,
         Status |= NextTypeResult.getStatus();
         break;
       }
-      SmallVector<ParsedSyntax, 0> nodes;
-      nodes.append(Elements.begin(), Elements.end());
+      SmallVector<ParsedSyntax, 0> nodes = {FirstElement};
       nodes.append(following.begin(), following.end());
       return makeParsedResult<ParsedTypeSyntax>(nodes, NextTypeResult.getStatus());
     }
diff --git a/test/Syntax/round_trip_misc.swift b/test/Syntax/round_trip_misc.swift
@@ -25,9 +25,6 @@ do {
 do {
   typealias
 }
-do {
-  typealias Alias = A & B & C.D<>
-}
 
 // Orphan '}' at top level
 }

Original file line number	Diff line number	Diff line change
`@@ -843,8 +843,7 @@ Parser::parseTypeSimpleOrComposition(Diag<> MessageID,`
`843`	`843`	`Status \|= NextTypeResult.getStatus();`
`844`	`844`	`break;`
`845`	`845`	`}`
`846`		`- SmallVector<ParsedSyntax, 0> nodes;`
`847`		`- nodes.append(Elements.begin(), Elements.end());`
	`846`	`+ SmallVector<ParsedSyntax, 0> nodes = {FirstElement};`
`848`	`847`	`nodes.append(following.begin(), following.end());`
`849`	`848`	`return makeParsedResult<ParsedTypeSyntax>(nodes, NextTypeResult.getStatus());`
`850`	`849`	`}`