[Lldb-commits] [lldb] 9a9ae01 - [lldb-vscode] Fix TestVSCode_setBreakpoints

[Walter Erquinigo via lldb-commits]

Author: Walter Erquinigo
Date: 2020-07-13T18:27:53-07:00
New Revision: 9a9ae01f994a92900bc703cf8a512082f49ce45d

URL: https://github.com/llvm/llvm-project/commit/9a9ae01f994a92900bc703cf8a512082f49ce45d
DIFF: https://github.com/llvm/llvm-project/commit/9a9ae01f994a92900bc703cf8a512082f49ce45d.diff

LOG: [lldb-vscode] Fix TestVSCode_setBreakpoints

It was failing because some module events had empty UUID, and that was not handled correctly.
The diff that added that logic is https://reviews.llvm.org/D82477

Added: 
    

Modified: 
    lldb/tools/lldb-vscode/JSONUtils.cpp

Removed: 
    


################################################################################
diff  --git a/lldb/tools/lldb-vscode/JSONUtils.cpp b/lldb/tools/lldb-vscode/JSONUtils.cpp
index 86c29fb23811..1ebaa5c37712 100644
--- a/lldb/tools/lldb-vscode/JSONUtils.cpp
+++ b/lldb/tools/lldb-vscode/JSONUtils.cpp
@@ -331,7 +331,8 @@ llvm::json::Value CreateModule(lldb::SBModule &module) {
   llvm::json::Object object;
   if (!module.IsValid())
     return llvm::json::Value(std::move(object));
-  object.try_emplace("id", std::string(module.GetUUIDString()));
+  const char *uuid = module.GetUUIDString();
+  object.try_emplace("id", uuid ? std::string(uuid) : std::string(""));
   object.try_emplace("name", std::string(module.GetFileSpec().GetFilename()));
   char module_path_arr[PATH_MAX];
   module.GetFileSpec().GetPath(module_path_arr, sizeof(module_path_arr));