Change Optional -> llvm::Optional

Author: ahoppen

include/swift/Sema/ConstraintSystem.h

@@ -5324,10 +5324,11 @@ class ConstraintSystem {
   /// solution application target within the context.
   ///
   /// \returns true if solution cannot be applied.
-  bool applySolutionToBody(
-      Solution &solution, TapExpr *tapExpr, DeclContext *&currentDC,
-      std::function<Optional<SyntacticElementTarget>(SyntacticElementTarget)>
-          rewriteTarget);
+  bool applySolutionToBody(Solution &solution, TapExpr *tapExpr,
+                           DeclContext *&currentDC,
+                           std::function<llvm::Optional<SyntacticElementTarget>(
+                               SyntacticElementTarget)>
+                               rewriteTarget);
 
   /// Reorder the disjunctive clauses for a given expression to
   /// increase the likelihood that a favored constraint will be successfully

lib/Parse/ParseDecl.cpp

@@ -3696,7 +3696,7 @@ ParserResult<CustomAttr> Parser::parseCustomAttribute(
 
       argList = ArgumentList::createParsed(
           Context, lParenLoc, {Argument::unlabeled(CCE)}, rParenLoc,
-          /*trailingClosureIdx=*/None);
+          /*trailingClosureIdx=*/llvm::None);
       status.setHasCodeCompletionAndIsError();
     } else {
       // If we have no local context to parse the initial value into, create

lib/Sema/BuilderTransform.cpp

@@ -201,7 +201,7 @@ class ResultBuilderTransform
         // A statement that doesn't contain the code completion expression can't
         // influence the type of the code completion expression, so we can skip
         // it to improve performance.
-        return None;
+        return llvm::None;
       }
 
       auto result = visit(stmt, resultVar);