Skip to content

[lldb] Correct invalid format style #98089

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 9, 2024

Conversation

bulbazord
Copy link
Member

Fixes #97511

@bulbazord bulbazord requested a review from JDevlieghere as a code owner July 8, 2024 22:31
@llvmbot llvmbot added the lldb label Jul 8, 2024
@llvmbot
Copy link
Member

llvmbot commented Jul 8, 2024

@llvm/pr-subscribers-lldb

Author: Alex Langford (bulbazord)

Changes

Fixes #97511


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

1 Files Affected:

  • (modified) lldb/source/Target/StackFrameList.cpp (+3-3)
diff --git a/lldb/source/Target/StackFrameList.cpp b/lldb/source/Target/StackFrameList.cpp
index 314b5e39c71699..0cf9ce1bf043f5 100644
--- a/lldb/source/Target/StackFrameList.cpp
+++ b/lldb/source/Target/StackFrameList.cpp
@@ -966,9 +966,9 @@ size_t StackFrameList::GetStatus(Stream &strm, uint32_t first_frame,
     // Check for interruption here.  If we're fetching arguments, this loop
     // can go slowly:
     Debugger &dbg = m_thread.GetProcess()->GetTarget().GetDebugger();
-    if (INTERRUPT_REQUESTED(dbg, 
-          "Interrupted dumping stack for thread {0:hex} with {1} shown.",
-          m_thread.GetID(), num_frames_displayed))
+    if (INTERRUPT_REQUESTED(
+            dbg, "Interrupted dumping stack for thread {0:x} with {1} shown.",
+            m_thread.GetID(), num_frames_displayed))
       break;
 
 

@bulbazord
Copy link
Member Author

This is the exact same PR as swiftlang#8952 (on apple's LLVM fork). It should have gone here first.

@DavidSpickett DavidSpickett merged commit cd89d92 into llvm:main Jul 9, 2024
8 checks passed
@bulbazord bulbazord deleted the formatter-assertion branch July 9, 2024 17:11
aaryanshukla pushed a commit to aaryanshukla/llvm-project that referenced this pull request Jul 14, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Synchronous mode, Ctrl-C operation leads to an assertion fails.
5 participants