)]}' { "commit": "ab930ee7cad8b8bf7968bb8d0c0d72524e2313c4", "tree": "41e9afeae88301344343366dc05ece71aee9b03a", "parents": [ "584e431a4b257098d1ff13a0e9926842222ba601" ], "author": { "name": "Fred Grim", "email": "fgrim@apple.com", "time": "Wed Jul 03 09:19:18 2024 -0700" }, "committer": { "name": "GitHub", "email": "noreply@github.com", "time": "Wed Jul 03 09:19:18 2024 -0700" }, "message": "[llvm-readobj][ELF] Alter JSON/LLVM output on note sections to allow for multiple notes per section in JSON (#96813)\n\nIt turns out that the notes section for corefiles (or really any elf\r\nfile with multiple notes) is set up in such a way for LLVM formatted\r\noutput that the JSON equivalent only has the last note since the notes\r\nare held in a dictionary with every key being Note. This pr alters the\r\nlayout for the notes to a list of dictionaries to sidestep this issue\r\nfor JSON output. Prior to this pr a note section in the output looked\r\nlike (for LLVM output):\r\n\r\n```\r\nNotes [\r\n NoteSection {\r\n Name: \u003c?\u003e\r\n Offset: 0x2148\r\n Size: 0x1F864\r\n Note {\r\n Owner: CORE\r\n Data size: 0x150\r\n Type: NT_PRSTATUS (prstatus structure)\r\n Description data (\r\n 0000: 06000000 00000000 00000000 06000000 |................|\r\n ...\r\n )\r\n }\r\n Note {\r\n Owner: CORE\r\n Data size: 0x88\r\n Type: NT_PRPSINFO (prpsinfo structure)\r\n Description data (\r\n 0000: 02440000 00000000 04054040 00000000 |.D........@@....|\r\n\t....\r\n```\r\n\r\nBut is now:\r\n\r\n```\r\nNoteSections [\r\n NoteSection {\r\n Name: \u003c?\u003e\r\n Offset: 0x2148\r\n Size: 0x1F864\r\n Notes [\r\n {\r\n Owner: CORE\r\n Data size: 0x150\r\n Type: NT_PRSTATUS (prstatus structure)\r\n Description data (\r\n 0000: 06000000 00000000 00000000 06000000 |................|\r\n ...\r\n )\r\n }\r\n {\r\n Owner: CORE\r\n Data size: 0x88\r\n Type: NT_PRPSINFO (prpsinfo structure)\r\n Description data (\r\n 0000: 02440000 00000000 04054040 00000000 |.D........@@....|\r\n\t ...\r\n```", "tree_diff": [ { "type": "modify", "old_id": "8022a49d34c6cc57249d4133413746b768a44e63", "old_mode": 33188, "old_path": "lld/test/ELF/gnu-property-align-32.s", "new_id": "c9c64f930da960831123e46b58b91a92195c50a3", "new_mode": 33188, "new_path": "lld/test/ELF/gnu-property-align-32.s" }, { "type": "modify", "old_id": "b109c09039a2c1a3128218a098d9aa9d10b5ec0c", "old_mode": 33188, "old_path": "lld/test/ELF/gnu-property-align.s", "new_id": "d920ea5d0e468df93646b27fcbd97fb09179f108", "new_mode": 33188, "new_path": "lld/test/ELF/gnu-property-align.s" }, { "type": "modify", "old_id": "c5ade3a47e052828427d11e30596a3d6167cdc66", "old_mode": 33188, "old_path": "lld/test/ELF/partition-notes.s", "new_id": "e8bc32da93d904e758dab78c16dd99196d604df4", "new_mode": 33188, "new_path": "lld/test/ELF/partition-notes.s" }, { "type": "modify", "old_id": "b68103b665db3237dabc3b2e3c43d4e4c73ed803", "old_mode": 33188, "old_path": "llvm/test/tools/llvm-objcopy/ELF/add-note.test", "new_id": "839378b2684ce815d2791011a5b24ae989791a8c", "new_mode": 33188, "new_path": "llvm/test/tools/llvm-objcopy/ELF/add-note.test" }, { "type": "modify", "old_id": "512531748cd25a044ac7e119481f4b89c713afe2", "old_mode": 33188, "old_path": "llvm/test/tools/llvm-readobj/ELF/AArch64/aarch64-feature-pauth.s", "new_id": "91cc8b0ed88fa3d475797fe41053a486503bb2f7", "new_mode": 33188, "new_path": "llvm/test/tools/llvm-readobj/ELF/AArch64/aarch64-feature-pauth.s" }, { "type": "modify", "old_id": "b517f0b3815547b46bf88c8ca46a8730b923e485", "old_mode": 33188, "old_path": "llvm/test/tools/llvm-readobj/ELF/AArch64/aarch64-note-gnu-property.s", "new_id": "37dda7aaf31fa7798a773f8e11b87a21be7fab8f", "new_mode": 33188, "new_path": "llvm/test/tools/llvm-readobj/ELF/AArch64/aarch64-note-gnu-property.s" }, { "type": "modify", "old_id": "4bc9308feda0b5e0f73373c1077f318a2ec358b7", "old_mode": 33188, "old_path": "llvm/test/tools/llvm-readobj/ELF/AArch64/memtag.test", "new_id": "213eeed9f3a0ac810c5946846463bf3e2680150a", "new_mode": 33188, "new_path": "llvm/test/tools/llvm-readobj/ELF/AArch64/memtag.test" }, { "type": "modify", "old_id": "3e48086ba6a98b773a3a835c826a679b7625c7cb", "old_mode": 33188, "old_path": "llvm/test/tools/llvm-readobj/ELF/AArch64/note-android-unknown.test", "new_id": "b6d4718d9d981d966f8965512575e53ced089fae", "new_mode": 33188, "new_path": "llvm/test/tools/llvm-readobj/ELF/AArch64/note-android-unknown.test" }, { "type": "modify", "old_id": "2f131a6cb347b461301ee6f865be9ef7837c4bde", "old_mode": 33188, "old_path": "llvm/test/tools/llvm-readobj/ELF/gnu-note-size.test", "new_id": "2b82230605ce5595f7739ff02f1e37793babf804", "new_mode": 33188, "new_path": "llvm/test/tools/llvm-readobj/ELF/gnu-note-size.test" }, { "type": "modify", "old_id": "e73238e6093a8a78a259dc4a82f893298df4695b", "old_mode": 33188, "old_path": "llvm/test/tools/llvm-readobj/ELF/gnu-notes.test", "new_id": "49b8f0dd2c5d8e649e8bb154a0e96d5ec2747e14", "new_mode": 33188, "new_path": "llvm/test/tools/llvm-readobj/ELF/gnu-notes.test" }, { "type": "modify", "old_id": "778724b8ab6cea7f793647990fd02306a3e30868", "old_mode": 33188, "old_path": "llvm/test/tools/llvm-readobj/ELF/note-amd-invalid-v2.test", "new_id": "a9b099ca48acecabc97384c17e2af70fc7db8fd7", "new_mode": 33188, "new_path": "llvm/test/tools/llvm-readobj/ELF/note-amd-invalid-v2.test" }, { "type": "modify", "old_id": "dd090b9483e2901c36c770e56eb2dde92bdcbc94", "old_mode": 33188, "old_path": "llvm/test/tools/llvm-readobj/ELF/note-amd-invalid-v3.test", "new_id": "48d4f3ee4ce85e07bfa870da04615a5b83567fd1", "new_mode": 33188, "new_path": "llvm/test/tools/llvm-readobj/ELF/note-amd-invalid-v3.test" }, { "type": "modify", "old_id": "3af1bb2acafdf85827b040c85e85bdc516a2905a", "old_mode": 33188, "old_path": "llvm/test/tools/llvm-readobj/ELF/note-amd-valid-v2.test", "new_id": "894a8993f135e62ca496537d1f78edecfccb01c4", "new_mode": 33188, "new_path": "llvm/test/tools/llvm-readobj/ELF/note-amd-valid-v2.test" }, { "type": "modify", "old_id": "73022c3c89f789570d3fc685ddeaa51a350c8e57", "old_mode": 33188, "old_path": "llvm/test/tools/llvm-readobj/ELF/note-amd-valid-v3.s", "new_id": "2397bf7e43ec599de094b26f02cef7e2a06512b4", "new_mode": 33188, "new_path": "llvm/test/tools/llvm-readobj/ELF/note-amd-valid-v3.s" }, { "type": "modify", "old_id": "260be3a725af761db6ef1f2d6dca7f117212a15f", "old_mode": 33188, "old_path": "llvm/test/tools/llvm-readobj/ELF/note-amd.s", "new_id": "0649e839f880eae90843cb57b32128048d80d902", "new_mode": 33188, "new_path": "llvm/test/tools/llvm-readobj/ELF/note-amd.s" }, { "type": "modify", "old_id": "0ed791c30954e8d1c514fc6454056834c183538f", "old_mode": 33188, "old_path": "llvm/test/tools/llvm-readobj/ELF/note-amdgpu-invalid.s", "new_id": "39f3e4b4e462318a08f07177bc588f0d5051e20b", "new_mode": 33188, "new_path": "llvm/test/tools/llvm-readobj/ELF/note-amdgpu-invalid.s" }, { "type": "modify", "old_id": "5d4f41ced9b1602e3a3e676e03f699aedab566a9", "old_mode": 33188, "old_path": "llvm/test/tools/llvm-readobj/ELF/note-amdgpu.test", "new_id": "9f86b07c40b4b0d5eb407bb20e6054fc3bf4333f", "new_mode": 33188, "new_path": "llvm/test/tools/llvm-readobj/ELF/note-amdgpu.test" }, { "type": "modify", "old_id": "f4957b42a87788ec311917259a60fb8826bc0568", "old_mode": 33188, "old_path": "llvm/test/tools/llvm-readobj/ELF/note-core-ntfile.test", "new_id": "c318234c357c65cd98687273d35550937a8a7c8f", "new_mode": 33188, "new_path": "llvm/test/tools/llvm-readobj/ELF/note-core-ntfile.test" }, { "type": "modify", "old_id": "84ec96b1702a92eeb8ac8c9d5845bc72f205d570", "old_mode": 33188, "old_path": "llvm/test/tools/llvm-readobj/ELF/note-core.test", "new_id": "395b3fecccf5fa05a7a86b892760ef21a31f91c5", "new_mode": 33188, "new_path": "llvm/test/tools/llvm-readobj/ELF/note-core.test" }, { "type": "modify", "old_id": "438c278de68ad89953ee78ab147c8818e023e941", "old_mode": 33188, "old_path": "llvm/test/tools/llvm-readobj/ELF/note-freebsd-core.test", "new_id": "200ac1eac993632dbcdd5547ad891e7c8bbc6b0c", "new_mode": 33188, "new_path": "llvm/test/tools/llvm-readobj/ELF/note-freebsd-core.test" }, { "type": "modify", "old_id": "937cb6f426b1adf99817c37fc45bb39fcfa58267", "old_mode": 33188, "old_path": "llvm/test/tools/llvm-readobj/ELF/note-freebsd.test", "new_id": "f079ac8b4c387f0207e632f2dba62eba264f5d9a", "new_mode": 33188, "new_path": "llvm/test/tools/llvm-readobj/ELF/note-freebsd.test" }, { "type": "modify", "old_id": "59df75e3ee19c17a4a5f94d5e8155008c0b49602", "old_mode": 33188, "old_path": "llvm/test/tools/llvm-readobj/ELF/note-generic.s", "new_id": "9f06d3b267d3efab19e140859164c5200be545c7", "new_mode": 33188, "new_path": "llvm/test/tools/llvm-readobj/ELF/note-generic.s" }, { "type": "modify", "old_id": "2d0d00f60639153573aff7d488823934dac671a6", "old_mode": 33188, "old_path": "llvm/test/tools/llvm-readobj/ELF/note-gnu-property.s", "new_id": "59825266b48f2db4718028000d5dde90aa4c645c", "new_mode": 33188, "new_path": "llvm/test/tools/llvm-readobj/ELF/note-gnu-property.s" }, { "type": "modify", "old_id": "5ac35d45725c0e899fec05c951006403444f0257", "old_mode": 33188, "old_path": "llvm/test/tools/llvm-readobj/ELF/note-gnu-property2.s", "new_id": "2e342a05ca28f9107103e9b534f08734889ef457", "new_mode": 33188, "new_path": "llvm/test/tools/llvm-readobj/ELF/note-gnu-property2.s" }, { "type": "modify", "old_id": "050ef9a3f465c726680ca76e5fd6bdbe76dc11c3", "old_mode": 33188, "old_path": "llvm/test/tools/llvm-readobj/ELF/note-llvmompoffload.test", "new_id": "d00b5b4b333d0d39d02e53416d56d73a790060ae", "new_mode": 33188, "new_path": "llvm/test/tools/llvm-readobj/ELF/note-llvmompoffload.test" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "868ccac7fc59c14cbdd54f6507c8c489f5e40485", "new_mode": 33188, "new_path": "llvm/test/tools/llvm-readobj/ELF/note-multiple-sections.test" }, { "type": "modify", "old_id": "aec85aa51394641b29f3e2f8e4f55ca048171b06", "old_mode": 33188, "old_path": "llvm/test/tools/llvm-readobj/ELF/note-netbsd-core.test", "new_id": "aae0870d5e21fef2d9e0775fdc04f4158c89a407", "new_mode": 33188, "new_path": "llvm/test/tools/llvm-readobj/ELF/note-netbsd-core.test" }, { "type": "modify", "old_id": "0ccb55a8d6f332391adb93bf55e20ca3e05e9c43", "old_mode": 33188, "old_path": "llvm/test/tools/llvm-readobj/ELF/note-openbsd-core.test", "new_id": "3044fded0d6fa71a5ebca2e72670afe177d0ca69", "new_mode": 33188, "new_path": "llvm/test/tools/llvm-readobj/ELF/note-openbsd-core.test" }, { "type": "modify", "old_id": "aa74b51a3541ba64a5f42153a460ee952deea81c", "old_mode": 33188, "old_path": "llvm/test/tools/llvm-readobj/ELF/note-unknown.s", "new_id": "38a3bdc52b37ee1147e88e18fef48679e46b8aa0", "new_mode": 33188, "new_path": "llvm/test/tools/llvm-readobj/ELF/note-unknown.s" }, { "type": "modify", "old_id": "3e6d74fb6608f33adbb9d96f8989c52d2564068a", "old_mode": 33188, "old_path": "llvm/test/tools/llvm-readobj/archive.test", "new_id": "ce9e9fb77e39fe16e18c76f2a942c4d06c3207f7", "new_mode": 33188, "new_path": "llvm/test/tools/llvm-readobj/archive.test" }, { "type": "modify", "old_id": "7596d90b4fcd257c1381fb0637eb745c5878c7e4", "old_mode": 33188, "old_path": "llvm/tools/llvm-readobj/ELFDumper.cpp", "new_id": "f0a22f1568bef223380791648bcbd5e07e7fb6b8", "new_mode": 33188, "new_path": "llvm/tools/llvm-readobj/ELFDumper.cpp" } ] }