[lldb/crashlog] Fix breaking changes in textual report format #83861
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@llvm/pr-subscribers-lldb Author: Med Ismail Bennani (medismailben) ChangesThis patch should address some register parsing issue in the legacy report format. rdar://107210149 Full diff: https://github.com/llvm/llvm-project/pull/83861.diff 1 Files Affected:
diff --git a/lldb/examples/python/crashlog.py b/lldb/examples/python/crashlog.py
index 9e4f94264037ae..c992348b24be17 100755
--- a/lldb/examples/python/crashlog.py
+++ b/lldb/examples/python/crashlog.py
@@ -849,10 +849,10 @@ def parse_errors(self, json_data):
class TextCrashLogParser(CrashLogParser):
parent_process_regex = re.compile(r"^Parent Process:\s*(.*)\[(\d+)\]")
- thread_state_regex = re.compile(r"^Thread \d+ crashed with")
+ thread_state_regex = re.compile(r"^Thread (\d+ crashed with|State)")
thread_instrs_regex = re.compile(r"^Thread \d+ instruction stream")
- thread_regex = re.compile(r"^Thread (\d+).*:")
- app_backtrace_regex = re.compile(r"^Application Specific Backtrace (\d+).*:")
+ thread_regex = re.compile(r"^Thread (\d+).*")
+ app_backtrace_regex = re.compile(r"^Application Specific Backtrace (\d+).*")
class VersionRegex:
version = r"\(.+\)|(?:arm|x86_)[0-9a-z]+"
@@ -1081,7 +1081,10 @@ def parse_normal(self, line):
if thread_state_match:
self.app_specific_backtrace = False
thread_state_match = self.thread_regex.search(line)
- thread_idx = int(thread_state_match.group(1))
+ if thread_state_match:
+ thread_idx = int(thread_state_match.group(1))
+ else:
+ thread_idx = self.crashlog.crashed_thread_idx
self.parse_mode = self.CrashLogParseMode.THREGS
self.thread = self.crashlog.threads[thread_idx]
return
|
|
Can you add/modify a test? |
This patch should address some register parsing issue in the legacy report format. rdar://107210149 rdar://119998761 Signed-off-by: Med Ismail Bennani <[email protected]>
medismailben
added a commit
to medismailben/llvm-project
that referenced
this pull request
Mar 4, 2024
…3861) This patch should address some register parsing issue in the legacy report format. rdar://107210149 Signed-off-by: Med Ismail Bennani <[email protected]>
medismailben
added a commit
to swiftlang/llvm-project
that referenced
this pull request
Mar 5, 2024
[lldb/crashlog] Fix breaking changes in textual report format (llvm#83861)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This patch should address some register parsing issue in the legacy report format.
rdar://107210149