Merge branch 'main' into users/mingmingl-llvm/samplefdo-profile-formatusers/mingmingl-llvm/samplefdo-profile-format

1 files changed, 6 insertions, 5 deletions

diff --git a/lldb/source/Commands/CommandObjectFrame.cpp b/lldb/source/Commands/CommandObjectFrame.cpp
index 56926999d167..88a02dce35b9 100644
--- a/lldb/source/Commands/CommandObjectFrame.cpp
+++ b/lldb/source/Commands/CommandObjectFrame.cpp
@@ -140,7 +140,7 @@ protected:
     } else {
       StopInfoSP stop_info_sp = thread->GetStopInfo();
       if (!stop_info_sp) {
-        result.AppendError("No arguments provided, and no stop info.");
+        result.AppendError("no arguments provided, and no stop info");
         return;
       }
 
@@ -148,7 +148,7 @@ protected:
     }
 
     if (!valobj_sp) {
-      result.AppendError("No diagnosis available.");
+      result.AppendError("no diagnosis available");
       return;
     }
 
@@ -310,7 +310,7 @@ protected:
           if (frame_idx == 0) {
             // If you are already at the bottom of the stack, then just warn
             // and don't reset the frame.
-            result.AppendError("Already at the bottom of the stack.");
+            result.AppendError("already at the bottom of the stack");
             return;
           } else
             frame_idx = 0;
@@ -335,7 +335,7 @@ protected:
             if (frame_idx == num_frames - 1) {
               // If we are already at the top of the stack, just warn and don't
               // reset the frame.
-              result.AppendError("Already at the top of the stack.");
+              result.AppendError("already at the top of the stack");
               return;
             } else
               frame_idx = num_frames - 1;
@@ -349,7 +349,8 @@ protected:
             command[0].c_str());
         m_options.GenerateOptionUsage(
             result.GetErrorStream(), *this,
-            GetCommandInterpreter().GetDebugger().GetTerminalWidth());
+            GetCommandInterpreter().GetDebugger().GetTerminalWidth(),
+            GetCommandInterpreter().GetDebugger().GetUseColor());
         return;
       }