[lldb] Adjust SymbolFileJSON for stable/20221013

Author: JDevlieghere

lldb/include/lldb/Symbol/Symbol.h

@@ -20,11 +20,11 @@
 namespace lldb_private {
 
 struct JSONSymbol {
-  std::optional<uint64_t> address;
-  std::optional<uint64_t> value;
-  std::optional<uint64_t> size;
-  std::optional<uint64_t> id;
-  std::optional<lldb::SymbolType> type;
+  llvm::Optional<uint64_t> address;
+  llvm::Optional<uint64_t> value;
+  llvm::Optional<uint64_t> size;
+  llvm::Optional<uint64_t> id;
+  llvm::Optional<lldb::SymbolType> type;
   std::string name;
 };
 

lldb/source/Plugins/ObjectFile/JSON/CMakeLists.txt

@@ -8,5 +8,4 @@ add_lldb_library(lldbPluginObjectFileJSON PLUGIN
     lldbUtility
   LINK_COMPONENTS
     Support
-    TargetParser
   )

lldb/source/Plugins/SymbolFile/JSON/SymbolFileJSON.h

@@ -82,7 +82,7 @@ class SymbolFileJSON : public lldb_private::SymbolFileCommon {
   lldb::CompUnitSP ParseCompileUnitAtIndex(uint32_t index) override;
 
   Type *ResolveTypeUID(lldb::user_id_t type_uid) override { return nullptr; }
-  std::optional<ArrayInfo> GetDynamicArrayInfoForUID(
+  llvm::Optional<ArrayInfo> GetDynamicArrayInfoForUID(
       lldb::user_id_t type_uid,
       const lldb_private::ExecutionContext *exe_ctx) override {
     return std::nullopt;