Revert "Merge pull request swiftlang#27190 from compnerd/27132"

This reverts commit 4838791, reversing
changes made to 4c3f044.

Author: CodaFi

include/swift/Parse/SyntaxParsingContext.h

@@ -300,7 +300,7 @@ class alignas(1 << SyntaxAlignInBits) SyntaxParsingContext {
     return SyntaxNode(std::move(rawNode));
   }
 
-  ParsedTokenSyntax &&popToken();
+  ParsedTokenSyntax popToken();
 
   /// Create a node using the tail of the collected parts. The number of parts
   /// is automatically determined from \c Kind. Node: limited number of \c Kind

lib/Parse/ParseType.cpp

@@ -408,7 +408,7 @@ Parser::TypeASTResult Parser::parseType(Diag<> MessageID,
   }
 
   if (Tok.is(tok::arrow)) {
-    auto InputNode(std::move(SyntaxContext->popIf<ParsedTypeSyntax>().getValue()));
+    auto InputNode = SyntaxContext->popIf<ParsedTypeSyntax>().getValue();
     // Handle type-function if we have an arrow.
     auto ArrowLoc = Tok.getLoc();
     auto Arrow = consumeTokenSyntax();
@@ -741,7 +741,7 @@ Parser::TypeResult Parser::parseTypeIdentifier() {
     if (Base) {
       SyntaxContext->addSyntax(std::move(*Base));
       auto T = SyntaxContext->topNode<TypeSyntax>();
-      Junk.push_back(std::move(*SyntaxContext->popIf<ParsedTypeSyntax>()));
+      Junk.push_back(*SyntaxContext->popIf<ParsedTypeSyntax>());
       ITR = dyn_cast<IdentTypeRepr>(Generator.generate(T, BaseLoc));
     }
 
@@ -1164,10 +1164,9 @@ Parser::TypeResult Parser::parseTypeTupleBody() {
       auto InFlight = diagnose(EqualLoc, diag::tuple_type_init);
       if (Init.isNonNull())
         InFlight.fixItRemove(SourceRange(EqualLoc, Init.get()->getEndLoc()));
+      auto Expr = *SyntaxContext->popIf<ParsedExprSyntax>();
       Initializer = ParsedSyntaxRecorder::makeInitializerClause(
-          std::move(*Equal),
-          std::move(*SyntaxContext->popIf<ParsedExprSyntax>()),
-          *SyntaxContext);
+          std::move(*Equal), std::move(Expr), *SyntaxContext);
     }
 
     Comma = consumeTokenSyntaxIf(tok::comma);

lib/Parse/SyntaxParsingContext.cpp

@@ -163,8 +163,8 @@ const SyntaxParsingContext *SyntaxParsingContext::getRoot() const {
   return Curr;
 }
 
-ParsedTokenSyntax &&SyntaxParsingContext::popToken() {
-  return std::move(popIf<ParsedTokenSyntax>().getValue());
+ParsedTokenSyntax SyntaxParsingContext::popToken() {
+  return popIf<ParsedTokenSyntax>().getValue();
 }
 
 /// Add Token with Trivia to the parts.
@@ -342,7 +342,7 @@ SyntaxParsingContext::~SyntaxParsingContext() {
         Storage.push_back(std::move(BridgedNode.getValue()));
       }
     } else {
-      auto node(std::move(bridgeAs(CtxtKind, getParts()).getValue()));
+      auto node = bridgeAs(CtxtKind, getParts()).getValue();
       Storage.erase(Storage.begin() + Offset, Storage.end());
       Storage.emplace_back(std::move(node));
     }