[Lldb-commits] [lldb] Initialize field to appease msan (PR #141537)

[Walter Lee via lldb-commits]

https://github.com/googlewalt updated https://github.com/llvm/llvm-project/pull/141537

>From d1d4ea56e970caf92ed1e5dd5848c974e6d0b795 Mon Sep 17 00:00:00 2001
From: Walter Lee <waltl at google.com>
Date: Mon, 26 May 2025 21:15:07 -0400
Subject: [PATCH 1/2] Initialize field to appease msan

Tested with lldb and lldb-dap test suites.
---
 lldb/tools/lldb-dap/Handler/DisassembleRequestHandler.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lldb/tools/lldb-dap/Handler/DisassembleRequestHandler.cpp b/lldb/tools/lldb-dap/Handler/DisassembleRequestHandler.cpp
index c9061ef19f17a..8825c5c6413b8 100644
--- a/lldb/tools/lldb-dap/Handler/DisassembleRequestHandler.cpp
+++ b/lldb/tools/lldb-dap/Handler/DisassembleRequestHandler.cpp
@@ -27,6 +27,7 @@ namespace lldb_dap {
 
 static protocol::DisassembledInstruction GetInvalidInstruction() {
   DisassembledInstruction invalid_inst;
+  invalid_inst.address = 0;
   invalid_inst.presentationHint =
       DisassembledInstruction::eDisassembledInstructionPresentationHintInvalid;
   return invalid_inst;

>From 2bb1851dd3d0be63461b7dc9429b568cbb8d062c Mon Sep 17 00:00:00 2001
From: Walter Lee <waltl at google.com>
Date: Mon, 26 May 2025 23:40:46 -0400
Subject: [PATCH 2/2] Move the initializion to the constructor

---
 lldb/tools/lldb-dap/Handler/DisassembleRequestHandler.cpp | 1 -
 lldb/tools/lldb-dap/Protocol/ProtocolTypes.h              | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/lldb/tools/lldb-dap/Handler/DisassembleRequestHandler.cpp b/lldb/tools/lldb-dap/Handler/DisassembleRequestHandler.cpp
index 8825c5c6413b8..c9061ef19f17a 100644
--- a/lldb/tools/lldb-dap/Handler/DisassembleRequestHandler.cpp
+++ b/lldb/tools/lldb-dap/Handler/DisassembleRequestHandler.cpp
@@ -27,7 +27,6 @@ namespace lldb_dap {
 
 static protocol::DisassembledInstruction GetInvalidInstruction() {
   DisassembledInstruction invalid_inst;
-  invalid_inst.address = 0;
   invalid_inst.presentationHint =
       DisassembledInstruction::eDisassembledInstructionPresentationHintInvalid;
   return invalid_inst;
diff --git a/lldb/tools/lldb-dap/Protocol/ProtocolTypes.h b/lldb/tools/lldb-dap/Protocol/ProtocolTypes.h
index 5bac62adcdd38..f5e21c96fe17f 100644
--- a/lldb/tools/lldb-dap/Protocol/ProtocolTypes.h
+++ b/lldb/tools/lldb-dap/Protocol/ProtocolTypes.h
@@ -677,6 +677,8 @@ struct DisassembledInstruction {
   /// addresses may be presented is 'invalid.'
   /// Values: 'normal', 'invalid'
   std::optional<PresentationHint> presentationHint;
+
+  DisassembledInstruction() : address(0) {}
 };
 bool fromJSON(const llvm::json::Value &,
               DisassembledInstruction::PresentationHint &, llvm::json::Path);