From 8f0aa9df11195ef435717b24401fe76be06cd69f Mon Sep 17 00:00:00 2001
From: Daniel Thornburgh <dthorn@google.com>
Date: Thu, 1 Dec 2022 15:42:25 -0800
Subject: Revert "Threading: Convert Optional to std::optional"

This reverts commit 5e50b8089aee249d77542ea858d956568ec6581f.

This commit breaks the build for BOLT:
  bolt/lib/Profile/DataAggregator.cpp:264:66: error: no viable
  conversion from 'Optional<StringRef>[3]' to
  'ArrayRef<std::optional<StringRef>>'
---
 llvm/lib/Support/Threading.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'llvm/lib/Support/Threading.cpp')

diff --git a/llvm/lib/Support/Threading.cpp b/llvm/lib/Support/Threading.cpp
index 24962ae..910437c 100644
--- a/llvm/lib/Support/Threading.cpp
+++ b/llvm/lib/Support/Threading.cpp
@@ -90,7 +90,7 @@ const llvm::Optional<unsigned> llvm::thread::DefaultStackSize;
 
 #endif
 
-std::optional<ThreadPoolStrategy>
+Optional<ThreadPoolStrategy>
 llvm::get_threadpool_strategy(StringRef Num, ThreadPoolStrategy Default) {
   if (Num == "all")
     return llvm::hardware_concurrency();
@@ -98,7 +98,7 @@ llvm::get_threadpool_strategy(StringRef Num, ThreadPoolStrategy Default) {
     return Default;
   unsigned V;
   if (Num.getAsInteger(10, V))
-    return std::nullopt; // malformed 'Num' value
+    return None; // malformed 'Num' value
   if (V == 0)
     return Default;
 
-- 
cgit v1.1