Index: lldb/test/Shell/ScriptInterpreter/Python/Crashlog/Inputs/interactive_crashlog/multithread-test.dSYM/Contents/Info.plist
===================================================================
--- /dev/null
+++ lldb/test/Shell/ScriptInterpreter/Python/Crashlog/Inputs/interactive_crashlog/multithread-test.dSYM/Contents/Info.plist
@@ -0,0 +1,20 @@
+
+
+
+
+ CFBundleDevelopmentRegion
+ English
+ CFBundleIdentifier
+ com.apple.xcode.dsym.multithread-test
+ CFBundleInfoDictionaryVersion
+ 6.0
+ CFBundlePackageType
+ dSYM
+ CFBundleSignature
+ ????
+ CFBundleShortVersionString
+ 1.0
+ CFBundleVersion
+ 1
+
+
Index: lldb/test/Shell/ScriptInterpreter/Python/Crashlog/Inputs/interactive_crashlog/multithread-test.ips
===================================================================
--- /dev/null
+++ lldb/test/Shell/ScriptInterpreter/Python/Crashlog/Inputs/interactive_crashlog/multithread-test.ips
@@ -0,0 +1,111 @@
+{"app_name":"multithread-test","timestamp":"2022-07-08 15:44:57.00 -0700","app_version":"","slice_uuid":"45497fbe-8951-32c4-ac25-99500d17132d","build_version":"","platform":1,"share_with_app_devs":0,"is_first_party":1,"bug_type":"309","os_version":"macOS 13.0","roots_installed":0,"incident_id":"6E96E391-F1FC-46D0-B471-247C662A58E5","name":"multithread-test"}
+{
+ "uptime" : 300000,
+ "procRole" : "Unspecified",
+ "version" : 2,
+ "userID" : 501,
+ "deployVersion" : 210,
+ "modelCode" : "MacBookPro18,2",
+ "coalitionID" : 22352,
+ "osVersion" : {
+ "train" : "macOS 13.0",
+ "build" : "",
+ "releaseType" : ""
+ },
+ "captureTime" : "2022-07-08 15:44:56.8672 -0700",
+ "incident" : "6E96E391-F1FC-46D0-B471-247C662A58E5",
+ "pid" : 57225,
+ "translated" : false,
+ "cpuType" : "ARM-64",
+ "roots_installed" : 0,
+ "bug_type" : "309",
+ "procLaunch" : "2022-07-08 15:44:56.8593 -0700",
+ "procStartAbsTime" : 7391145230766,
+ "procExitAbsTime" : 7391145411485,
+ "procName" : "multithread-test",
+ "procPath" : "\/Users\/USER\/*\/multithread-test",
+ "parentProc" : "zsh",
+ "parentPid" : 49406,
+ "coalitionName" : "com.apple.Terminal",
+ "crashReporterKey" : "CDC11418-EDBF-2A49-0D83-8B441A5004B0",
+ "responsiblePid" : 97549,
+ "responsibleProc" : "Terminal",
+ "wakeTime" : 11754,
+ "sleepWakeUUID" : "CE3B1433-3D82-4636-BC3F-D6DE0DE21E38",
+ "sip" : "disabled",
+ "vmRegionInfo" : "0 is not in any region. Bytes before following region: 4301897728\n REGION TYPE START - END [ VSIZE] PRT\/MAX SHRMOD REGION DETAIL\n UNUSED SPACE AT START\n---> \n __TEXT 10069c000-1006a0000 [ 16K] r-x\/r-x SM=COW ...tithread-test",
+ "exception" : {"codes":"0x0000000000000001, 0x0000000000000000","rawCodes":[1,0],"type":"EXC_BAD_ACCESS","signal":"SIGSEGV","subtype":"KERN_INVALID_ADDRESS at 0x0000000000000000"},
+ "termination" : {"flags":0,"code":11,"namespace":"SIGNAL","indicator":"Segmentation fault: 11","byProc":"exc handler","byPid":57225},
+ "vmregioninfo" : "0 is not in any region. Bytes before following region: 4301897728\n REGION TYPE START - END [ VSIZE] PRT\/MAX SHRMOD REGION DETAIL\n UNUSED SPACE AT START\n---> \n __TEXT 10069c000-1006a0000 [ 16K] r-x\/r-x SM=COW ...tithread-test",
+ "extMods" : {"caller":{"thread_create":0,"thread_set_state":0,"task_for_pid":0},"system":{"thread_create":0,"thread_set_state":115751,"task_for_pid":6035},"targeted":{"thread_create":0,"thread_set_state":0,"task_for_pid":0},"warnings":0},
+ "faultingThread" : 2,
+ "threads" : [{"id":8445451,"queue":"com.apple.main-thread","frames":[{"imageOffset":11268,"symbol":"__ulock_wait","symbolLocation":8,"imageIndex":0},{"imageOffset":38312,"symbol":"_pthread_join","symbolLocation":444,"imageIndex":1},{"imageOffset":103028,"symbol":"std::__1::thread::join()","symbolLocation":36,"imageIndex":2},{"imageOffset":6972,"sourceLine":31,"sourceFile":"multithread-test.cc","symbol":"main","imageIndex":3,"symbolLocation":160},{"imageOffset":23572,"symbol":"start","symbolLocation":2372,"imageIndex":4}]},{"id":8445456,"frames":[{"imageOffset":19740,"symbol":"__write_nocancel","symbolLocation":8,"imageIndex":0},{"imageOffset":211836,"symbol":"__swrite","symbolLocation":24,"imageIndex":5},{"imageOffset":77024,"symbol":"_swrite","symbolLocation":108,"imageIndex":5},{"imageOffset":69188,"symbol":"__sflush","symbolLocation":232,"imageIndex":5},{"imageOffset":20792,"symbol":"__sfvwrite","symbolLocation":792,"imageIndex":5},{"imageOffset":147836,"symbol":"fwrite","symbolLocation":152,"imageIndex":5},{"imageOffset":188548,"symbol":"std::__1::__stdoutbuf::overflow(int)","symbolLocation":96,"imageIndex":2},{"imageOffset":136884,"symbol":"std::__1::ostreambuf_iterator >::operator=(char)","symbolLocation":96,"imageIndex":2},{"imageOffset":137112,"symbol":"std::__1::basic_ostream >::put(char)","symbolLocation":200,"imageIndex":2},{"imageOffset":6740,"sourceLine":994,"sourceFile":"ostream","symbol":"std::__1::basic_ostream >& std::__1::endl >(std::__1::basic_ostream >&)","imageIndex":3,"symbolLocation":64},{"imageOffset":6664,"sourceLine":189,"sourceFile":"ostream","symbol":"std::__1::basic_ostream >::operator<<(std::__1::basic_ostream >& (*)(std::__1::basic_ostream >&))","imageIndex":3,"symbolLocation":32},{"imageOffset":6488,"sourceLine":14,"sourceFile":"multithread-test.cc","symbol":"call_and_wait(int&)","imageIndex":3,"symbolLocation":48},{"imageOffset":13956,"sourceLine":3918,"sourceFile":"type_traits","symbol":"decltype(static_cast(fp)(static_cast>(fp0))) std::__1::__invoke >(void (*&&)(int&), std::__1::reference_wrapper&&)","imageIndex":3,"symbolLocation":48},{"imageOffset":13832,"sourceLine":287,"sourceFile":"thread","symbol":"void std::__1::__thread_execute >, void (*)(int&), std::__1::reference_wrapper, 2ul>(std::__1::tuple >, void (*)(int&), std::__1::reference_wrapper >&, std::__1::__tuple_indices<2ul>)","imageIndex":3,"symbolLocation":56},{"imageOffset":11608,"sourceLine":298,"sourceFile":"thread","symbol":"void* std::__1::__thread_proxy >, void (*)(int&), std::__1::reference_wrapper > >(void*)","imageIndex":3,"symbolLocation":84},{"imageOffset":29312,"symbol":"_pthread_start","symbolLocation":148,"imageIndex":1},{"imageOffset":8268,"symbol":"thread_start","symbolLocation":8,"imageIndex":1}]},{"triggered":true,"id":8445457,"threadState":{"x":[{"value":42},{"value":105553131262416},{"value":0},{"value":0},{"value":8352},{"value":419432703},{"value":0},{"value":0},{"value":1},{"value":0},{"value":18446744067133401039},{"value":1099511628034},{"value":1},{"value":2},{"value":258},{"value":0},{"value":6576808136,"symbolLocation":0,"symbol":"pthread_setspecific"},{"value":8284496304},{"value":0},{"value":6166114304},{"value":0},{"value":0},{"value":0},{"value":0},{"value":0},{"value":0},{"value":0},{"value":0},{"value":0}],"flavor":"ARM_THREAD_STATE64","lr":{"value":4301904156},"cpsr":{"value":2147487744},"fp":{"value":6166114048},"sp":{"value":6166114016},"esr":{"value":2449473606,"description":"(Data Abort) byte write Translation fault"},"pc":{"value":4301904116,"matchesCrashFrame":1},"far":{"value":0}},"frames":[{"imageOffset":6388,"sourceLine":7,"sourceFile":"multithread-test.cc","symbol":"bar(int)","imageIndex":3,"symbolLocation":20},{"imageOffset":6428,"sourceLine":11,"sourceFile":"multithread-test.cc","symbol":"foo(int)","imageIndex":3,"symbolLocation":24},{"imageOffset":6792,"sourceLine":20,"sourceFile":"multithread-test.cc","symbol":"compute_pow(int&)","imageIndex":3,"symbolLocation":28},{"imageOffset":13956,"sourceLine":3918,"sourceFile":"type_traits","symbol":"decltype(static_cast(fp)(static_cast>(fp0))) std::__1::__invoke >(void (*&&)(int&), std::__1::reference_wrapper&&)","imageIndex":3,"symbolLocation":48},{"imageOffset":13832,"sourceLine":287,"sourceFile":"thread","symbol":"void std::__1::__thread_execute >, void (*)(int&), std::__1::reference_wrapper, 2ul>(std::__1::tuple >, void (*)(int&), std::__1::reference_wrapper >&, std::__1::__tuple_indices<2ul>)","imageIndex":3,"symbolLocation":56},{"imageOffset":11608,"sourceLine":298,"sourceFile":"thread","symbol":"void* std::__1::__thread_proxy >, void (*)(int&), std::__1::reference_wrapper > >(void*)","imageIndex":3,"symbolLocation":84},{"imageOffset":29312,"symbol":"_pthread_start","symbolLocation":148,"imageIndex":1},{"imageOffset":8268,"symbol":"thread_start","symbolLocation":8,"imageIndex":1}]}],
+ "usedImages" : [
+ {
+ "source" : "P",
+ "arch" : "arm64e",
+ "base" : 6576566272,
+ "size" : 233464,
+ "uuid" : "afeee6e2-56f8-3b4b-a2d2-55848206fa33",
+ "path" : "\/usr\/lib\/system\/libsystem_kernel.dylib",
+ "name" : "libsystem_kernel.dylib"
+ },
+ {
+ "source" : "P",
+ "arch" : "arm64e",
+ "base" : 6576799744,
+ "size" : 53244,
+ "uuid" : "55773ab2-0453-342c-ac1b-6fd2725b0c73",
+ "path" : "\/usr\/lib\/system\/libsystem_pthread.dylib",
+ "name" : "libsystem_pthread.dylib"
+ },
+ {
+ "source" : "P",
+ "arch" : "arm64e",
+ "base" : 6576046080,
+ "size" : 421876,
+ "uuid" : "d1213e6e-dae7-33e8-ad4c-6351186e84ae",
+ "path" : "\/usr\/lib\/libc++.1.dylib",
+ "name" : "libc++.1.dylib"
+ },
+ {
+ "source" : "P",
+ "arch" : "arm64",
+ "base" : 4301897728,
+ "size" : 16384,
+ "uuid" : "45497fbe-8951-32c4-ac25-99500d17132d",
+ "path" : "\/Users\/USER\/*\/multithread-test",
+ "name" : "multithread-test"
+ },
+ {
+ "source" : "P",
+ "arch" : "arm64e",
+ "base" : 8911314944,
+ "size" : 559532,
+ "uuid" : "df37084a-1c3e-308f-921f-5cf96915ed2e",
+ "path" : "\/usr\/lib\/dyld",
+ "name" : "dyld"
+ },
+ {
+ "source" : "P",
+ "arch" : "arm64e",
+ "base" : 6575517696,
+ "size" : 528380,
+ "uuid" : "e1c63ce1-f250-3c84-88c1-4e8250b0e132",
+ "path" : "\/usr\/lib\/system\/libsystem_c.dylib",
+ "name" : "libsystem_c.dylib"
+ }
+],
+ "sharedCache" : {
+ "base" : 6573424640,
+ "size" : 3560538112,
+ "uuid" : "8b59bdf6-ef4d-3d4e-9564-a2e12f2d23f4"
+},
+ "vmSummary" : "ReadOnly portion of Libraries: Total=760.5M resident=0K(0%) swapped_out_or_unallocated=760.5M(100%)\nWritable regions: Total=538.5M written=0K(0%) resident=0K(0%) swapped_out=0K(0%) unallocated=538.5M(100%)\n\n VIRTUAL REGION \nREGION TYPE SIZE COUNT (non-coalesced) \n=========== ======= ======= \nKernel Alloc Once 32K 1 \nMALLOC 145.2M 12 \nMALLOC guard page 96K 5 \nMALLOC_NANO (reserved) 384.0M 1 reserved VM address space (unallocated)\nSTACK GUARD 56.0M 3 \nStack 9264K 3 \n__AUTH 46K 11 \n__AUTH_CONST 70K 38 \n__DATA 169K 37 \n__DATA_CONST 187K 40 \n__DATA_DIRTY 78K 22 \n__LINKEDIT 755.5M 2 \n__OBJC_CONST 11K 5 \n__OBJC_RO 64.2M 1 \n__OBJC_RW 1963K 1 \n__TEXT 5076K 42 \ndyld private memory 512K 2 \nshared memory 64K 3 \n=========== ======= ======= \nTOTAL 1.4G 229 \nTOTAL, minus reserved VM space 1.0G 229 \n",
+ "legacyInfo" : {
+ "threadTriggered" : {
+
+ }
+},
+ "trialInfo" : {}
+}
Index: lldb/test/Shell/ScriptInterpreter/Python/Crashlog/Inputs/scripted_crashlog.ips
===================================================================
--- lldb/test/Shell/ScriptInterpreter/Python/Crashlog/Inputs/scripted_crashlog.ips
+++ /dev/null
@@ -1,412 +0,0 @@
-{"app_name":"@NAME@","timestamp":"2022-03-16 11:08:51.00 -0700","app_version":"","slice_uuid":"7166a382-172b-31ff-a821-66dee303ab6c","build_version":"","platform":1,"share_with_app_devs":0,"is_first_party":1,"bug_type":"309","os_version":"macOS 12.3","incident_id":"82B79418-50CC-4672-982A-46A9D8C159B6","name":"@NAME@"}
-{
- "bug_type": "309",
- "captureTime": "2022-03-16 11:08:51.2579 -0700",
- "coalitionID": 33758,
- "coalitionName": "com.apple.Terminal",
- "cpuType": "ARM-64",
- "crashReporterKey": "CDC11418-EDBF-2A49-0D83-8B441A5004B0",
- "deployVersion": 210,
- "exception": {
- "codes": "0x0000000000000001, 0x0000000000000000",
- "rawCodes": [
- 1,
- 0
- ],
- "signal": "SIGSEGV",
- "subtype": "KERN_INVALID_ADDRESS at 0x0000000000000000",
- "type": "EXC_BAD_ACCESS"
- },
- "extMods": {
- "caller": {
- "task_for_pid": 0,
- "thread_create": 0,
- "thread_set_state": 0
- },
- "system": {
- "task_for_pid": 32,
- "thread_create": 11,
- "thread_set_state": 1052
- },
- "targeted": {
- "task_for_pid": 0,
- "thread_create": 0,
- "thread_set_state": 0
- },
- "warnings": 0
- },
- "faultingThread": 2,
- "incident": "82B79418-50CC-4672-982A-46A9D8C159B6",
- "isCorpse": 1,
- "legacyInfo": {
- "threadTriggered": {}
- },
- "modelCode": "MacBookPro18,2",
- "osVersion": {
- "build": "",
- "releaseType": "",
- "train": "macOS 12.3"
- },
- "parentPid": 2976,
- "parentProc": "zsh",
- "pid": 24991,
- "procExitAbsTime": 8601841756762,
- "procLaunch": "2022-03-16 11:08:50.9857 -0700",
- "procName": "@NAME@",
- "procPath": "@EXEC@",
- "procRole": "Unspecified",
- "procStartAbsTime": 8601835247762,
- "responsiblePid": 20664,
- "responsibleProc": "Terminal",
- "sharedCache": {
- "base": 6639747072,
- "size": 3141189632,
- "uuid": "48726a6e-15bc-3826-9a66-b24b559993b5"
- },
- "sip": "enabled",
- "sleepWakeUUID": "65E63A0C-730A-4DBB-A67C-7532476614E7",
- "termination": {
- "byPid": 24991,
- "byProc": "exc handler",
- "code": 11,
- "flags": 0,
- "indicator": "Segmentation fault: 11",
- "namespace": "SIGNAL"
- },
- "threads": [
- {
- "frames": [
- {
- "imageIndex": 0,
- "imageOffset": 14420,
- "symbol": "__ulock_wait",
- "symbolLocation": 8
- },
- {
- "imageIndex": 1,
- "imageOffset": 38304,
- "symbol": "_pthread_join",
- "symbolLocation": 444
- },
- {
- "imageIndex": 2,
- "imageOffset": 104896,
- "symbol": "std::__1::thread::join()",
- "symbolLocation": 36
- },
- {
- "imageIndex": 3,
- "imageOffset": 7096,
- "sourceFile": "multithread-test.cc",
- "sourceLine": 31,
- "symbol": "main",
- "symbolLocation": 160
- },
- {
- "imageIndex": 4,
- "imageOffset": 20616,
- "symbol": "start",
- "symbolLocation": 516
- }
- ],
- "id": 5154880,
- "queue": "com.apple.main-thread"
- },
- {
- "frames": [
- {
- "imageIndex": 3,
- "imageOffset": 6632,
- "sourceFile": "multithread-test.cc",
- "sourceLine": 15,
- "symbol": "call_and_wait(int&)",
- "symbolLocation": 68
- },
- {
- "imageIndex": 3,
- "imageOffset": 6612,
- "sourceFile": "multithread-test.cc",
- "sourceLine": 14,
- "symbol": "call_and_wait(int&)",
- "symbolLocation": 48
- },
- {
- "imageIndex": 3,
- "imageOffset": 13968,
- "sourceFile": "type_traits",
- "sourceLine": 3584,
- "symbol": "decltype(static_cast(fp)(static_cast>(fp0))) std::__1::__invoke >(void (*&&)(int&), std::__1::reference_wrapper&&)",
- "symbolLocation": 48
- },
- {
- "imageIndex": 3,
- "imageOffset": 13844,
- "sourceFile": "thread",
- "sourceLine": 276,
- "symbol": "void std::__1::__thread_execute >, void (*)(int&), std::__1::reference_wrapper, 2ul>(std::__1::tuple >, void (*)(int&), std::__1::reference_wrapper >&, std::__1::__tuple_indices<2ul>)",
- "symbolLocation": 56
- },
- {
- "imageIndex": 3,
- "imageOffset": 11608,
- "sourceFile": "thread",
- "sourceLine": 287,
- "symbol": "void* std::__1::__thread_proxy >, void (*)(int&), std::__1::reference_wrapper > >(void*)",
- "symbolLocation": 84
- },
- {
- "imageIndex": 1,
- "imageOffset": 29292,
- "symbol": "_pthread_start",
- "symbolLocation": 148
- },
- {
- "imageIndex": 1,
- "imageOffset": 8332,
- "symbol": "thread_start",
- "symbolLocation": 8
- }
- ],
- "id": 5154896
- },
- {
- "frames": [
- {
- "imageIndex": 3,
- "imageOffset": 6512,
- "sourceFile": "multithread-test.cc",
- "sourceLine": 7,
- "symbol": "bar(int)",
- "symbolLocation": 20
- },
- {
- "imageIndex": 3,
- "imageOffset": 6552,
- "sourceFile": "multithread-test.cc",
- "sourceLine": 11,
- "symbol": "foo(int)",
- "symbolLocation": 24
- },
- {
- "imageIndex": 3,
- "imageOffset": 6916,
- "sourceFile": "multithread-test.cc",
- "sourceLine": 20,
- "symbol": "compute_pow(int&)",
- "symbolLocation": 28
- },
- {
- "imageIndex": 3,
- "imageOffset": 13968,
- "sourceFile": "type_traits",
- "sourceLine": 3584,
- "symbol": "decltype(static_cast(fp)(static_cast>(fp0))) std::__1::__invoke >(void (*&&)(int&), std::__1::reference_wrapper&&)",
- "symbolLocation": 48
- },
- {
- "imageIndex": 3,
- "imageOffset": 13844,
- "sourceFile": "thread",
- "sourceLine": 276,
- "symbol": "void std::__1::__thread_execute >, void (*)(int&), std::__1::reference_wrapper, 2ul>(std::__1::tuple >, void (*)(int&), std::__1::reference_wrapper >&, std::__1::__tuple_indices<2ul>)",
- "symbolLocation": 56
- },
- {
- "imageIndex": 3,
- "imageOffset": 11608,
- "sourceFile": "thread",
- "sourceLine": 287,
- "symbol": "void* std::__1::__thread_proxy >, void (*)(int&), std::__1::reference_wrapper > >(void*)",
- "symbolLocation": 84
- },
- {
- "imageIndex": 1,
- "imageOffset": 29292,
- "symbol": "_pthread_start",
- "symbolLocation": 148
- },
- {
- "imageIndex": 1,
- "imageOffset": 8332,
- "symbol": "thread_start",
- "symbolLocation": 8
- }
- ],
- "id": 5154897,
- "threadState": {
- "cpsr": {
- "value": 2147487744
- },
- "esr": {
- "description": "(Data Abort) byte write Translation fault",
- "value": 2449473606
- },
- "far": {
- "value": 0
- },
- "flavor": "ARM_THREAD_STATE64",
- "fp": {
- "value": 6097596160
- },
- "lr": {
- "value": 4370422168
- },
- "pc": {
- "matchesCrashFrame": 1,
- "value": 4370422128
- },
- "sp": {
- "value": 6097596128
- },
- "x": [
- {
- "value": 42
- },
- {
- "value": 105553169518896
- },
- {
- "value": 6097596223
- },
- {
- "value": 105553169518880
- },
- {
- "value": 6097596416
- },
- {
- "value": 419432703
- },
- {
- "value": 0
- },
- {
- "value": 0
- },
- {
- "value": 1
- },
- {
- "value": 0
- },
- {
- "value": 18446744067067154563
- },
- {
- "value": 0
- },
- {
- "value": 0
- },
- {
- "value": 0
- },
- {
- "value": 0
- },
- {
- "value": 0
- },
- {
- "symbol": "pthread_setspecific",
- "symbolLocation": 0,
- "value": 6643048712
- },
- {
- "value": 8151791216
- },
- {
- "value": 0
- },
- {
- "value": 6097596416
- },
- {
- "value": 0
- },
- {
- "value": 0
- },
- {
- "value": 0
- },
- {
- "value": 0
- },
- {
- "value": 0
- },
- {
- "value": 0
- },
- {
- "value": 0
- },
- {
- "value": 0
- },
- {
- "value": 0
- }
- ]
- },
- "triggered": true
- }
- ],
- "translated": false,
- "trialInfo": {},
- "uptime": 350000,
- "usedImages": [
- {
- "arch": "arm64e",
- "base": 6642810880,
- "name": "libsystem_kernel.dylib",
- "path": "/usr/lib/system/libsystem_kernel.dylib",
- "size": 229376,
- "source": "P",
- "uuid": "1d7b3b8e-75a1-34ea-aa52-9f7c23155c55"
- },
- {
- "arch": "arm64e",
- "base": 6643040256,
- "name": "libsystem_pthread.dylib",
- "path": "/usr/lib/system/libsystem_pthread.dylib",
- "size": 53248,
- "source": "P",
- "uuid": "cee8bc77-6923-34d9-89a3-6f8f7279605e"
- },
- {
- "arch": "arm64e",
- "base": 6642290688,
- "name": "libc++.1.dylib",
- "path": "/usr/lib/libc++.1.dylib",
- "size": 421888,
- "source": "P",
- "uuid": "06bc1ec0-9992-398e-a85b-2973eb1fdba2"
- },
- {
- "arch": "arm64",
- "base": 4370415616,
- "name": "@NAME@",
- "path": "@EXEC@",
- "size": 16384,
- "source": "P",
- "uuid": "@UUID@"
- },
- {
- "arch": "arm64e",
- "base": 4373479424,
- "name": "dyld",
- "path": "/usr/lib/dyld",
- "size": 393216,
- "source": "P",
- "uuid": "fbb89662-e6f2-3434-b542-f75185ac5e74"
- }
- ],
- "userID": 501,
- "version": 2,
- "vmRegionInfo": "0 is not in any region. Bytes before following region: 4370415616\n REGION TYPE START - END [ VSIZE] PRT/MAX SHRMOD REGION DETAIL\n UNUSED SPACE AT START\n---> \n __TEXT 1047f4000-1047f8000 [ 16K] r-x/r-x SM=COW ....test.tmp.out",
- "vmSummary": "ReadOnly portion of Libraries: Total=589.5M resident=0K(0%) swapped_out_or_unallocated=589.5M(100%)\nWritable regions: Total=666.2M written=0K(0%) resident=0K(0%) swapped_out=0K(0%) unallocated=666.2M(100%)\n\n VIRTUAL REGION \nREGION TYPE SIZE COUNT (non-coalesced) \n=========== ======= ======= \nKernel Alloc Once 32K 1 \nMALLOC 153.2M 15 \nMALLOC guard page 64.1M 7 \nMALLOC_MEDIUM (reserved) 120.0M 1 reserved VM address space (unallocated)\nMALLOC_NANO (reserved) 384.0M 1 reserved VM address space (unallocated)\nMALLOC_PROB_GUARD 138.5M 1 \nSTACK GUARD 56.0M 3 \nStack 9264K 3 \n__AUTH 46K 11 \n__AUTH_CONST 67K 38 \n__DATA 173K 36 \n__DATA_CONST 258K 40 \n__DATA_DIRTY 73K 21 \n__LINKEDIT 584.9M 3 \n__OBJC_CONST 10K 5 \n__OBJC_RO 82.9M 1 \n__OBJC_RW 3168K 1 \n__TEXT 4696K 43 \ndyld private memory 1024K 1 \nshared memory 48K 3 \n=========== ======= ======= \nTOTAL 1.6G 235 \nTOTAL, minus reserved VM space 1.1G 235 \n",
- "vmregioninfo": "0 is not in any region. Bytes before following region: 4370415616\n REGION TYPE START - END [ VSIZE] PRT/MAX SHRMOD REGION DETAIL\n UNUSED SPACE AT START\n---> \n __TEXT 1047f4000-1047f8000 [ 16K] r-x/r-x SM=COW ....test.tmp.out",
- "wakeTime": 4715
-}
Index: lldb/test/Shell/ScriptInterpreter/Python/Crashlog/scripted_crashlog_json.test
===================================================================
--- lldb/test/Shell/ScriptInterpreter/Python/Crashlog/scripted_crashlog_json.test
+++ lldb/test/Shell/ScriptInterpreter/Python/Crashlog/scripted_crashlog_json.test
@@ -1,60 +1,39 @@
# REQUIRES: python, native && target-aarch64 && system-darwin
-# rdar://93655633
-# UNSUPPORTED: arm64
-
-# RUN: %clangxx_host -std=c++17 -g %S/Inputs/multithread-test.cc -o %t.out
-
-# RUN: cp %S/Inputs/scripted_crashlog.ips %t.crash
-# RUN: %python %S/patch-crashlog.py --binary %t.out --crashlog %t.crash --offsets '{"main":160, "bar":20, "foo":24}' --json
-# RUN: %lldb %t.out -o 'command script import lldb.macosx.crashlog' -o 'crashlog -a -i %t.crash' 2>&1 -o "thread list" -o "bt all" | FileCheck %s
+# RUN: %lldb %S/Inputs/interactive_crashlog/multithread-test -o 'command script import lldb.macosx.crashlog' -o 'crashlog -a -i %S/Inputs/interactive_crashlog/multithread-test.ips' -o "thread list" -o "bt all" 2>&1 | FileCheck %s
# CHECK: "crashlog" {{.*}} commands have been installed, use the "--help" options on these commands
# CHECK: (lldb) process status
-# CHECK-NEXT: Process 24991 stopped
+# CHECK-NEXT: Process 57225 stopped
# CHECK-NEXT: * thread #3, stop reason = EXC_BAD_ACCESS
-# CHECK-NEXT: frame #0: 0x00000001047f5970 scripted_crashlog_json.test.tmp.out`bar
+# CHECK-NEXT: frame #0: 0x000000010069d8f4 multithread-test`bar
# CHECK: (lldb) thread backtrace
# CHECK-NEXT: * thread #3, stop reason = EXC_BAD_ACCESS
-# CHECK-NEXT: * frame #0: 0x00000001047f5970 scripted_crashlog_json.test.tmp.out`bar
-# CHECK-NEXT: frame #1: 0x00000001047f5998 scripted_crashlog_json.test.tmp.out`foo
-# CHECK-NEXT: frame #2: 0x00000001047f5b04 scripted_crashlog_json.test.tmp.out`compute_pow
-# CHECK-NEXT: frame #3: 0x00000001047f7690 scripted_crashlog_json.test.tmp.out`decltype
-# CHECK-NEXT: frame #4: 0x00000001047f7614 scripted_crashlog_json.test.tmp.out`void std::__1::__thread_execute
-# CHECK-NEXT: frame #5: 0x00000001047f6d58 scripted_crashlog_json.test.tmp.out`void* std::__1::__thread_proxy
-# CHECK-NEXT: frame #6: 0x000000018bf5326c libsystem_pthread.dylib`_pthread_start
-# CHECK-NEXT: frame #7: 0x000000018bf4e08c libsystem_pthread.dylib`thread_start
+# CHECK-NEXT: * frame #0: 0x000000010069d8f4 multithread-test`bar{{.*}} at multithread-test.cc:7:6 [artificial]
+# CHECK-NEXT: frame #1: 0x000000010069d91b multithread-test`foo{{.*}} at multithread-test.cc:11:25 [artificial]
+# CHECK-NEXT: frame #2: 0x000000010069da87 multithread-test`compute_pow{{.*}} at multithread-test.cc:20:32 [artificial]
# CHECK: (lldb) thread list
-# CHECK-NEXT: Process 24991 stopped
-# CHECK-NEXT: thread #1: tid = 0x4ea840, 0x000000018bf17854 libsystem_kernel.dylib`__ulock_wait{{.*}}, queue = 'com.apple.main-thread'
-# CHECK-NEXT: thread #2: tid = 0x4ea850, 0x00000001047f59e8 scripted_crashlog_json.test.tmp.out`call_and_wait
-# CHECK-NEXT: * thread #3: tid = 0x4ea851, 0x00000001047f5970 scripted_crashlog_json.test.tmp.out`bar{{.*}}, stop reason = EXC_BAD_ACCESS
-
+# CHECK-NEXT: Process 57225 stopped
+# CHECK-NEXT: thread #1: tid = 0x80de0b, 0x0000000187fe9c04 libsystem_kernel.dylib`__ulock_wait{{.*}}, queue = 'com.apple.main-thread'
+# CHECK-NEXT: thread #2: tid = 0x80de10, 0x0000000187febd1c libsystem_kernel.dylib`{{.*}}
+# CHECK-NEXT: * thread #3: tid = 0x80de11, 0x000000010069d8f4 multithread-test`bar{{.*}} at multithread-test.cc:7:6, stop reason = EXC_BAD_ACCESS
# CHECK: (lldb) bt all
-# CHECK-NEXT: thread #1
-# CHECK-NEXT: frame #0: 0x000000018bf17854 libsystem_kernel.dylib`__ulock_wait
-# CHECK-NEXT: frame #1: 0x000000018bf555a0 libsystem_pthread.dylib`_pthread_join
-# CHECK-NEXT: frame #2: 0x000000018beae9c0 libc++.1.dylib`std::__1::thread::join
-# CHECK-NEXT: frame #3: 0x00000001047f5bb8 scripted_crashlog_json.test.tmp.out`main
-# CHECK-NEXT: frame #4: 0x0000000104ae5088 dyld`start
-# CHECK-NEXT: thread #2
-# CHECK-NEXT: frame #0: 0x00000001047f59e8 scripted_crashlog_json.test.tmp.out`call_and_wait
-# CHECK-NEXT: frame #1: 0x00000001047f59d4 scripted_crashlog_json.test.tmp.out`call_and_wait
-# CHECK-NEXT: frame #2: 0x00000001047f7690 scripted_crashlog_json.test.tmp.out`decltype
-# CHECK-NEXT: frame #3: 0x00000001047f7614 scripted_crashlog_json.test.tmp.out`void std::__1::__thread_execute
-# CHECK-NEXT: frame #4: 0x00000001047f6d58 scripted_crashlog_json.test.tmp.out`void* std::__1::__thread_proxy
-# CHECK-NEXT: frame #5: 0x000000018bf5326c libsystem_pthread.dylib`_pthread_start
-# CHECK-NEXT: frame #6: 0x000000018bf4e08c libsystem_pthread.dylib`thread_start
-# CHECK-NEXT: * thread #3, stop reason = EXC_BAD_ACCESS
-# CHECK-NEXT: * frame #0: 0x00000001047f5970 scripted_crashlog_json.test.tmp.out`bar
-# CHECK-NEXT: frame #1: 0x00000001047f5998 scripted_crashlog_json.test.tmp.out`foo
-# CHECK-NEXT: frame #2: 0x00000001047f5b04 scripted_crashlog_json.test.tmp.out`compute_pow
-# CHECK-NEXT: frame #3: 0x00000001047f7690 scripted_crashlog_json.test.tmp.out`decltype
-# CHECK-NEXT: frame #4: 0x00000001047f7614 scripted_crashlog_json.test.tmp.out`void std::__1::__thread_execute
-# CHECK-NEXT: frame #5: 0x00000001047f6d58 scripted_crashlog_json.test.tmp.out`void* std::__1::__thread_proxy
-# CHECK-NEXT: frame #6: 0x000000018bf5326c libsystem_pthread.dylib`_pthread_start
-# CHECK-NEXT: frame #7: 0x000000018bf4e08c libsystem_pthread.dylib`thread_start
+# CHECK: thread #1, queue = 'com.apple.main-thread'
+# CHECK: frame #{{[0-9]+}}: 0x0000000187fe9c04 libsystem_kernel.dylib`__ulock_wait{{.*}} [artificial]
+# CHECK: frame #{{[0-9]+}}: 0x000000010069db3b multithread-test`main at multithread-test.cc:31:12 [artificial]
+# CHECK: frame #{{[0-9]+}}: 0x0000000213283c13 dyld`start{{.*}} [artificial]
+# CHECK-NEXT: thread #2
+# CHECK-NEXT: frame #0: 0x0000000187febd1c libsystem_kernel.dylib`__write_nocancel{{.*}} [artificial]
+# CHECK: frame #{{[0-9]+}}: 0x000000010069d957 multithread-test`call_and_wait{{.*}} at multithread-test.cc:14:43 [artificial]
+# CHECK: frame #{{[0-9]+}}: 0x000000018802727f libsystem_pthread.dylib`_pthread_start{{.*}} [artificial]
+# CHECK: frame #{{[0-9]+}}: 0x000000018802204b libsystem_pthread.dylib`thread_start{{.*}} [artificial]
+# CHECK-NEXT:* thread #3, stop reason = EXC_BAD_ACCESS
+# CHECK-NEXT: * frame #0: 0x000000010069d8f4 multithread-test`bar{{.*}} at multithread-test.cc:7:6 [artificial]
+# CHECK-NEXT: frame #1: 0x000000010069d91b multithread-test`foo{{.*}} at multithread-test.cc:11:25 [artificial]
+# CHECK-NEXT: frame #2: 0x000000010069da87 multithread-test`compute_pow{{.*}} at multithread-test.cc:20:32 [artificial]
+# CHECK: frame #{{[0-9]+}}: 0x000000018802727f libsystem_pthread.dylib`_pthread_start{{.*}} [artificial]
+# CHECK: frame #{{[0-9]+}}: 0x000000018802204b libsystem_pthread.dylib`thread_start{{.*}} [artificial]