diff --git a/lldb/include/lldb/Core/StructuredDataImpl.h b/lldb/include/lldb/Core/StructuredDataImpl.h --- a/lldb/include/lldb/Core/StructuredDataImpl.h +++ b/lldb/include/lldb/Core/StructuredDataImpl.h @@ -152,6 +152,8 @@ return (::snprintf(dst, dst_len, "%s", result.data())); } + StructuredData::ObjectSP GetObjectSP() const { return m_data_sp; } + private: lldb::StructuredDataPluginWP m_plugin_wp; StructuredData::ObjectSP m_data_sp; diff --git a/lldb/include/lldb/Utility/StructuredData.h b/lldb/include/lldb/Utility/StructuredData.h --- a/lldb/include/lldb/Utility/StructuredData.h +++ b/lldb/include/lldb/Utility/StructuredData.h @@ -353,6 +353,17 @@ public: Dictionary() : Object(lldb::eStructuredDataTypeDictionary), m_dict() {} + Dictionary(ObjectSP obj_sp) + : Object(lldb::eStructuredDataTypeDictionary), m_dict() { + if (!obj_sp || obj_sp->GetType() != lldb::eStructuredDataTypeDictionary) { + SetType(lldb::eStructuredDataTypeInvalid); + return; + } + + Dictionary *dict = obj_sp->GetAsDictionary(); + m_dict = dict->m_dict; + } + ~Dictionary() override = default; size_t GetSize() const { return m_dict.size(); } diff --git a/lldb/source/API/SBLaunchInfo.cpp b/lldb/source/API/SBLaunchInfo.cpp --- a/lldb/source/API/SBLaunchInfo.cpp +++ b/lldb/source/API/SBLaunchInfo.cpp @@ -380,16 +380,18 @@ void SBLaunchInfo::SetScriptedProcessDictionary(lldb::SBStructuredData dict) { LLDB_RECORD_METHOD(void, SBLaunchInfo, SetScriptedProcessDictionary, (lldb::SBStructuredData), dict); + if (!dict.IsValid() || !dict.m_impl_up) + return; - SBStream stream; - SBError error = dict.GetAsJSON(stream); + StructuredData::ObjectSP obj_sp = dict.m_impl_up->GetObjectSP(); - if (error.Fail()) + if (!obj_sp) return; - StructuredData::DictionarySP dict_sp; - llvm::json::OStream s(stream.ref().AsRawOstream()); - dict_sp->Serialize(s); + StructuredData::DictionarySP dict_sp = + std::make_shared(obj_sp); + if (!dict_sp || dict_sp->GetType() == lldb::eStructuredDataTypeInvalid) + return; m_opaque_sp->SetScriptedProcessDictionarySP(dict_sp); } diff --git a/lldb/source/Plugins/Process/scripted/ScriptedProcess.h b/lldb/source/Plugins/Process/scripted/ScriptedProcess.h --- a/lldb/source/Plugins/Process/scripted/ScriptedProcess.h +++ b/lldb/source/Plugins/Process/scripted/ScriptedProcess.h @@ -25,17 +25,15 @@ public: ScriptedProcessInfo(const ProcessLaunchInfo &launch_info) { m_class_name = launch_info.GetScriptedProcessClassName(); - m_dictionary_sp = launch_info.GetScriptedProcessDictionarySP(); + m_args_sp = launch_info.GetScriptedProcessDictionarySP(); } std::string GetClassName() const { return m_class_name; } - StructuredData::DictionarySP GetDictionarySP() const { - return m_dictionary_sp; - } + StructuredData::DictionarySP GetArgsSP() const { return m_args_sp; } private: std::string m_class_name; - StructuredData::DictionarySP m_dictionary_sp; + StructuredData::DictionarySP m_args_sp; }; public: diff --git a/lldb/source/Plugins/Process/scripted/ScriptedProcess.cpp b/lldb/source/Plugins/Process/scripted/ScriptedProcess.cpp --- a/lldb/source/Plugins/Process/scripted/ScriptedProcess.cpp +++ b/lldb/source/Plugins/Process/scripted/ScriptedProcess.cpp @@ -106,7 +106,7 @@ StructuredData::GenericSP object_sp = GetInterface().CreatePluginObject( m_scripted_process_info.GetClassName().c_str(), exe_ctx, - m_scripted_process_info.GetDictionarySP()); + m_scripted_process_info.GetArgsSP()); if (!object_sp || !object_sp->IsValid()) { error.SetErrorStringWithFormat("ScriptedProcess::%s () - ERROR: %s", diff --git a/lldb/source/Plugins/Process/scripted/ScriptedThread.cpp b/lldb/source/Plugins/Process/scripted/ScriptedThread.cpp --- a/lldb/source/Plugins/Process/scripted/ScriptedThread.cpp +++ b/lldb/source/Plugins/Process/scripted/ScriptedThread.cpp @@ -55,7 +55,7 @@ StructuredData::GenericSP object_sp = scripted_thread_interface->CreatePluginObject( class_name->c_str(), exe_ctx, - process.m_scripted_process_info.GetDictionarySP()); + process.m_scripted_process_info.GetArgsSP()); if (!object_sp || !object_sp->IsValid()) { error.SetErrorString("Failed to create valid script object"); return;