Merge pull request #83204 from swiftlang/jepa-main

Address rebranch deprecations

Author: AnthonyLatsis

include/swift/AST/ExtInfo.h

@@ -549,15 +549,15 @@ class ASTExtInfoBuilder {
       : ASTExtInfoBuilder(Representation::Swift, false, false, Type(),
                           DifferentiabilityKind::NonDifferentiable, nullptr,
                           FunctionTypeIsolation::forNonIsolated(),
-                          std::nullopt /* LifetimeDependenceInfo */,
+                          {} /* LifetimeDependenceInfo */,
                           false /*sendingResult*/) {}
 
   // Constructor for polymorphic type.
   ASTExtInfoBuilder(Representation rep, bool throws, Type thrownError)
       : ASTExtInfoBuilder(rep, false, throws, thrownError,
                           DifferentiabilityKind::NonDifferentiable, nullptr,
                           FunctionTypeIsolation::forNonIsolated(),
-                          std::nullopt /* LifetimeDependenceInfo */,
+                          {} /* LifetimeDependenceInfo */,
                           false /*sendingResult*/) {}
 
   // Constructor with no defaults.
@@ -1047,7 +1047,7 @@ class SILExtInfoBuilder {
             makeBits(SILFunctionTypeRepresentation::Thick, false, false, false,
                      false, false, SILFunctionTypeIsolation::forUnknown(),
                      DifferentiabilityKind::NonDifferentiable),
-            ClangTypeInfo(nullptr), /*LifetimeDependenceInfo*/ std::nullopt) {}
+            ClangTypeInfo(nullptr), /*LifetimeDependenceInfo*/ {}) {}
 
   SILExtInfoBuilder(Representation rep, bool isPseudogeneric, bool isNoEscape,
                     bool isSendable, bool isAsync, bool isUnimplementable,

include/swift/AST/Types.h

@@ -4018,7 +4018,7 @@ class FunctionType final
 
   ArrayRef<LifetimeDependenceInfo> getLifetimeDependencies() const {
     if (!hasLifetimeDependencies())
-      return std::nullopt;
+      return {};
     return {getTrailingObjects<LifetimeDependenceInfo>(),
             getNumLifetimeDependencies()};
   }
@@ -4188,7 +4188,7 @@ class GenericFunctionType final
 
   ArrayRef<LifetimeDependenceInfo> getLifetimeDependencies() const {
     if (!hasLifetimeDependencies())
-      return std::nullopt;
+      return {};
     return {getTrailingObjects<LifetimeDependenceInfo>(),
             getNumLifetimeDependencies()};
   }
@@ -5680,7 +5680,7 @@ class SILFunctionType final
   // relative to the original FunctionType.
   ArrayRef<LifetimeDependenceInfo> getLifetimeDependencies() const {
     if (!hasLifetimeDependencies())
-      return std::nullopt;
+      return {};
     return {getTrailingObjects<LifetimeDependenceInfo>(),
             NumLifetimeDependencies};
   }

include/swift/Basic/TaskQueue.h

@@ -205,8 +205,8 @@ class TaskQueue {
   /// \param Context an optional context which will be associated with the task
   /// \param SeparateErrors Controls whether error output is reported separately
   virtual void addTask(const char *ExecPath, ArrayRef<const char *> Args,
-                       ArrayRef<const char *> Env = std::nullopt,
-                       void *Context = nullptr, bool SeparateErrors = false);
+                       ArrayRef<const char *> Env = {}, void *Context = nullptr,
+                       bool SeparateErrors = false);
 
   /// Synchronously executes the tasks in the TaskQueue.
   ///
@@ -240,8 +240,8 @@ class DummyTaskQueue : public TaskQueue {
     bool SeparateErrors;
 
     DummyTask(const char *ExecPath, ArrayRef<const char *> Args,
-              ArrayRef<const char *> Env = std::nullopt,
-              void *Context = nullptr, bool SeparateErrors = false)
+              ArrayRef<const char *> Env = {}, void *Context = nullptr,
+              bool SeparateErrors = false)
         : ExecPath(ExecPath), Args(Args), Env(Env), Context(Context),
           SeparateErrors(SeparateErrors) {}
   };
@@ -254,8 +254,8 @@ class DummyTaskQueue : public TaskQueue {
   virtual ~DummyTaskQueue();
 
   void addTask(const char *ExecPath, ArrayRef<const char *> Args,
-               ArrayRef<const char *> Env = std::nullopt,
-               void *Context = nullptr, bool SeparateErrors = false) override;
+               ArrayRef<const char *> Env = {}, void *Context = nullptr,
+               bool SeparateErrors = false) override;
 
   bool
   execute(TaskBeganCallback Began = TaskBeganCallback(),

include/swift/Driver/Action.h

@@ -134,7 +134,7 @@ class CompileJobAction : public JobAction {
 
 public:
   CompileJobAction(file_types::ID OutputType)
-      : JobAction(Action::Kind::CompileJob, std::nullopt, OutputType) {}
+      : JobAction(Action::Kind::CompileJob, {}, OutputType) {}
   CompileJobAction(Action *Input, file_types::ID OutputType)
       : JobAction(Action::Kind::CompileJob, Input, OutputType) {}
 
@@ -169,8 +169,7 @@ class InterpretJobAction : public JobAction {
 
 public:
   explicit InterpretJobAction()
-      : JobAction(Action::Kind::InterpretJob, std::nullopt,
-                  file_types::TY_Nothing) {}
+      : JobAction(Action::Kind::InterpretJob, {}, file_types::TY_Nothing) {}
 
   static bool classof(const Action *A) {
     return A->getKind() == Action::Kind::InterpretJob;
@@ -209,7 +208,7 @@ class REPLJobAction : public JobAction {
   Mode RequestedMode;
 public:
   REPLJobAction(Mode mode)
-      : JobAction(Action::Kind::REPLJob, std::nullopt, file_types::TY_Nothing),
+      : JobAction(Action::Kind::REPLJob, {}, file_types::TY_Nothing),
         RequestedMode(mode) {}
 
   Mode getRequestedMode() const { return RequestedMode; }