Merge pull request swiftlang#5567 from medismailben/stable/20220421

Author: medismailben

lldb/examples/python/crashlog.py

@@ -645,7 +645,7 @@ class TextCrashLogParser(CrashLogParser):
                              r'(.+?)\s+'               # img_name
                              r'(?:' +version+ r'\s+)?' # img_version
                              r'(0x[0-9a-fA-F]{4,})'    # addr (4 chars or more)
-                             r' +(.*)'                 # offs
+                             r'(?: +(.*))?'            # offs
                             )
     null_frame_regex = re.compile(r'^\d+\s+\?\?\?\s+0{4,} +')
     image_regex_uuid = re.compile(r'(0x[0-9a-fA-F]+)'          # img_lo
@@ -1104,7 +1104,7 @@ def load_crashlog_in_scripted_process(debugger, crash_log_file, options, result)
         raise InteractiveCrashLogException("couldn't import crashlog scripted process module")
 
     structured_data = lldb.SBStructuredData()
-    structured_data.SetFromJSON(json.dumps({ "crashlog_path" : crashlog_path,
+    structured_data.SetFromJSON(json.dumps({ "file_path" : crashlog_path,
                                              "load_all_images": options.load_all_images }))
     launch_info = lldb.SBLaunchInfo(None)
     launch_info.SetProcessPluginName("ScriptedProcess")

lldb/examples/python/scripted_process/crashlog_scripted_process.py

@@ -71,7 +71,7 @@ def __init__(self, target: lldb.SBTarget, args : lldb.SBStructuredData):
 
         self.crashlog_path = None
 
-        crashlog_path = args.GetValueForKey("crashlog_path")
+        crashlog_path = args.GetValueForKey("file_path")
         if crashlog_path and crashlog_path.IsValid():
             if crashlog_path.GetType() == lldb.eStructuredDataTypeString:
                 self.crashlog_path = crashlog_path.GetStringValue(4096)

lldb/test/Shell/ScriptInterpreter/Python/Crashlog/Inputs/a.out.crash

@@ -29,7 +29,7 @@ Terminating Process:   exc handler [21606]
 
 Thread 0 Crashed:: Dispatch queue: com.apple.main-thread
 0   a.out                         	@foo@ foo + 16 (test.c:3)
-1   a.out                         	@bar@ bar + 9 (test.c:6)
+1   a.out                         	@bar@
 2   a.out                         	@main@ main + 20 (test.c:8)
 3   libdyld.dylib                 	0x1000000 start + 1
 

lldb/unittests/Utility/StructuredDataTest.cpp

@@ -38,7 +38,7 @@ TEST(StructuredDataTest, GetDescriptionEmpty) {
 
   StreamString S;
   object_sp->GetDescription(S);
-  EXPECT_EQ(0, S.GetSize());
+  EXPECT_EQ(0u, S.GetSize());
 }
 
 TEST(StructuredDataTest, GetDescriptionBasic) {