release/21.x: [lldb][lldb-dap] parse pathFormat as an optional (#155238)

[llvmbot]

Backport 749537f

Requested by: @da-viper

[llvmbot]

@ashgti What do you think about merging this PR to the release branch?

[llvmbot]

@llvm/pr-subscribers-lldb

Author: None (llvmbot)

Changes

Backport 749537f

Requested by: @da-viper

---

Full diff: https://github.com/llvm/llvm-project/pull/171587.diff

1 Files Affected:

• (modified) lldb/tools/lldb-dap/Protocol/ProtocolRequests.cpp (+1-1)

diff --git a/lldb/tools/lldb-dap/Protocol/ProtocolRequests.cpp b/lldb/tools/lldb-dap/Protocol/ProtocolRequests.cpp
index 29855ca50e9e0..ea4ab1a29c49d 100644
--- a/lldb/tools/lldb-dap/Protocol/ProtocolRequests.cpp
+++ b/lldb/tools/lldb-dap/Protocol/ProtocolRequests.cpp
@@ -219,7 +219,7 @@ bool fromJSON(const json::Value &Params, InitializeRequestArguments &IRA,
          OM.map("clientName", IRA.clientName) && OM.map("locale", IRA.locale) &&
          OM.map("linesStartAt1", IRA.linesStartAt1) &&
          OM.map("columnsStartAt1", IRA.columnsStartAt1) &&
-         OM.map("pathFormat", IRA.pathFormat) &&
+         OM.mapOptional("pathFormat", IRA.pathFormat) &&
          OM.map("$__lldb_sourceInitFile", IRA.lldbExtSourceInitFile);
 }
 

[da-viper]

Ubuntu 26.04 LTS may ship with 21.x easier to add this fix instead of a client not adding the optional arg.

[ashgti]

Should we also backport fff45dd on top of this?

[dyung]

Thanks for the patch, but as this will be the final 21.x release, we only want to include fixes for regressions, or for small fixes that have broad impacts, neither of which this change seems to meet I'm afraid, so I'm going to defer this fix to the 22.x release.