[Lldb-commits] [lldb] 5109de2 - Fix build break introduced by https://reviews.llvm.org/D127702

[Jeffrey Tan via lldb-commits]

Author: Jeffrey Tan
Date: 2022-06-20T17:31:26-07:00
New Revision: 5109de2da2e2b2321bd2bc504a3ddcedce51c0f8

URL: https://github.com/llvm/llvm-project/commit/5109de2da2e2b2321bd2bc504a3ddcedce51c0f8
DIFF: https://github.com/llvm/llvm-project/commit/5109de2da2e2b2321bd2bc504a3ddcedce51c0f8.diff

LOG: Fix build break introduced by https://reviews.llvm.org/D127702

Fix build break introduced by https://reviews.llvm.org/D127702

Differential Revision: https://reviews.llvm.org/D128234

Added: 
    

Modified: 
    lldb/tools/lldb-vscode/BreakpointBase.cpp
    lldb/tools/lldb-vscode/BreakpointBase.h

Removed: 
    


################################################################################
diff  --git a/lldb/tools/lldb-vscode/BreakpointBase.cpp b/lldb/tools/lldb-vscode/BreakpointBase.cpp
index 14d279dfd660..0637637b84e5 100644
--- a/lldb/tools/lldb-vscode/BreakpointBase.cpp
+++ b/lldb/tools/lldb-vscode/BreakpointBase.cpp
@@ -103,7 +103,8 @@ void BreakpointBase::SetLogMessage() {
     last_raw_text_start = curly_braces_range.second + 1;
   }
   // Trailing raw text after close curly brace.
-  if (logMessage.size() > last_raw_text_start)
+  assert(last_raw_text_start >= 0);
+  if (logMessage.size() > (size_t)last_raw_text_start)
     logMessageParts.emplace_back(
         llvm::StringRef(logMessage.c_str() + last_raw_text_start,
                         logMessage.size() - last_raw_text_start),
@@ -127,7 +128,8 @@ bool BreakpointBase::BreakpointHitCallback(
     if (messagePart.is_expr) {
       // Try local frame variables first before fall back to expression
       // evaluation
-      const char *expr = messagePart.text.str().c_str();
+      std::string expr_str = messagePart.text.str();
+      const char *expr = expr_str.c_str();
       lldb::SBValue value =
           frame.GetValueForVariablePath(expr, lldb::eDynamicDontRunTarget);
       if (value.GetError().Fail())

diff  --git a/lldb/tools/lldb-vscode/BreakpointBase.h b/lldb/tools/lldb-vscode/BreakpointBase.h
index 321c8adfbfb9..4becd4aa8196 100644
--- a/lldb/tools/lldb-vscode/BreakpointBase.h
+++ b/lldb/tools/lldb-vscode/BreakpointBase.h
@@ -20,6 +20,8 @@ namespace lldb_vscode {
 struct BreakpointBase {
   // logMessage part can be either a raw text or an expression.
   struct LogMessagePart {
+    LogMessagePart(llvm::StringRef text, bool is_expr)
+        : text(text), is_expr(is_expr) {}
     llvm::StringRef text;
     bool is_expr;
   };