From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-oln040092066051.outbound.protection.outlook.com [40.92.66.51]) by sourceware.org (Postfix) with ESMTPS id 770343858401 for ; Sun, 5 Sep 2021 19:16:11 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 770343858401 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=hotmail.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=hotmail.de ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iEm2vCOPkdPeo3b8RmIqMtkdKK5gG9JP/8a28kQr2gJNlwpWmamvn3y8zAWwOD6GMDVTQ6BUMUJIBFrk2kA6oIWrdfDxO7jMVL7LvHRsSJwB4RSKnROel8tXeVAtobUMYKK/s58SoK00/OW+vG9DizWdtyNQAQD7ap7EprYcT7i/PwJiy6qV267Wag5GiV7/gEfs6cD05tWPdG72mgoRRjiI8WSU/ZFZil9N7Kq2auWOHgDe+c5Kr97/zcz6PmzyaQqEYshkCzbot0V5/9mTyfFLzJoBRL9iD3m0bAWaPkKOZncx4gqm+YIwAamIJV+5SMkHKnN17XzYW8+opwe9UQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=8cAPGf2OMa1WDrQqfKwVNWGLUj8trFLiH5yta6mOAXE=; b=N9vrrmdMsxbE7n8NTi0c3HpDc/N0HdATj47T5u2HGht+psW9KhKnJdnw0lNg2D/8UOCOwFBX6r1gtnby2aLBe9WmLiucAXngcGSqdbMfL/foy7PXvi6VWWfWHTxXYvKlHdjxR2VRDiCqdXaRFi17zfFoAMbHJafTEZiPyVS8AgHC+1ddNyln2FeGmp1A35WFHgDlCGOCK8kWWO3/RLY7Ne9uuxUSwCjqlr9Ug/Sgbod2TCXqRicQWhN+RsIp7sZSp6cKWAxFxexX0TGIq7fRlSQ1HBTkg9dniE/WtApTt9NaG9GTXXNig9LRdSsZJXIAXeUDxrcvJD24nPXnfBuvfw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none Received: from VE1EUR01FT026.eop-EUR01.prod.protection.outlook.com (2a01:111:e400:7e19::46) by VE1EUR01HT225.eop-EUR01.prod.protection.outlook.com (2a01:111:e400:7e19::260) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.19; Sun, 5 Sep 2021 19:16:10 +0000 Received: from AM8PR10MB4708.EURPRD10.PROD.OUTLOOK.COM (2a01:111:e400:7e19::53) by VE1EUR01FT026.mail.protection.outlook.com (2a01:111:e400:7e19::212) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.19 via Frontend Transport; Sun, 5 Sep 2021 19:16:10 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:D8ACD4201959AD6C94B2F95127AFD8E0591D3CA1AC484E8A5183EFCCAE50BA3A; UpperCasedChecksum:DA084CF67CDA8E0A97F37A0FA54F23354BA4753C397030726325836C1A575E21; SizeAsReceived:7658; Count:44 Received: from AM8PR10MB4708.EURPRD10.PROD.OUTLOOK.COM ([fe80::351b:6ea6:4f4a:36a]) by AM8PR10MB4708.EURPRD10.PROD.OUTLOOK.COM ([fe80::351b:6ea6:4f4a:36a%8]) with mapi id 15.20.4478.025; Sun, 5 Sep 2021 19:16:10 +0000 To: "gdb-patches@sourceware.org" From: Bernd Edlinger Subject: [PATCH v3 3/3] Fix handling of DW_AT_entry_pc of inlined subroutines Message-ID: Date: Sun, 5 Sep 2021 21:16:07 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.6.1 Content-Type: multipart/mixed; boundary="------------723D152FEAC7C2E58E2B4096" Content-Language: en-US X-TMN: [nYF5cOh9WIzvZF2Aq/NGVG4mxph4zXTI] X-ClientProxiedBy: FR3P281CA0024.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1c::15) To AM8PR10MB4708.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:364::23) X-Microsoft-Original-Message-ID: <2a93f927-a845-7812-cdff-82cdbedd4cb9@hotmail.de> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from [192.168.1.101] (146.60.254.137) by FR3P281CA0024.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1c::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.4 via Frontend Transport; Sun, 5 Sep 2021 19:16:09 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 44 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 32fa6cbc-2859-426f-64ee-08d970a19e4a X-MS-TrafficTypeDiagnostic: VE1EUR01HT225: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 5ltFu5jyLvfkLd3NRP4ncxlBOzcnfReRd2a9XRqiXzc+SEvVeIy5D44ST3pyS9e84PvhQqEo+C3/ABeM4gINWJZ5Sh+RBxRjEKFz2s44jDS3bBmaHmksW1xYDCvVnyXk1CMG81tgtKTQR8tjau52VnyQP3OTdtboW8pW7aV71Oq1c+PFOMSZ8JVEGWTB6ULDhcP//bZRbO5+mgd9IDeyXbbfAjb2bFSadqLXaU4mfT+ogSmPEMivFvwoHpUcvNtP+zh2+toSbcv8TG+gfLJbxzIP4lDSgvcTfH5TxRaEL5CiWJilzJdTn5w4B9vg72El13fczHtKifvIbibI1QRMkLgt1O0jAzwKIm+r4cUjnBNe+EAgu1hjazx/Xvqx8J+03W9qQPBhf1l4NYRB94zRdGjSvhtqZlEPWL1WqqDja+8Ts+pbkb/HfoROGOzue/Uv X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: L4/zEbBKyD/1ZiB6A/3hMq+MZVQuQkaXgnSptogblAon0salSjz1TvOC2VJqz8wiHmGoee4TLIwbnfLIYOZzjbKzDwMzbHoRjIbHgDyysAs6YAZGx0M2d8YzcAKW8jVWVEo/zge4QwTlGmQ5CpQPMQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 32fa6cbc-2859-426f-64ee-08d970a19e4a X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Sep 2021 19:16:09.9388 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: VE1EUR01FT026.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1EUR01HT225 X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00, FORGED_MUA_MOZILLA, FREEMAIL_FROM, GIT_PATCH_0, KAM_DMARC_STATUS, MSGID_FROM_MTA_HEADER, RCVD_IN_BARRACUDACENTRAL, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_PASS, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Sep 2021 19:16:12 -0000 --------------723D152FEAC7C2E58E2B4096 Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit It may happen that the inline entry point is not the start address of the first sub-range of an inline function. But the PC for a breakpoint on an inlined subroutine is always the start address of the first sub-range. This patch moves the sub-range starting at the entry point to the first position of the block list. Therefore the breakpoint on an inlined function changes in rare cases from the start address of the first sub-range to the real entry point. There should always be a subrange that starts at the entry point, even if that is an empty sub-range. 2021-01-01 Bernd Edlinger * dwarf2/read.c (dwarf2_record_block_ranges): Move range beginning at DW_AT_entry_pc to the first block range. --- gdb/dwarf2/read.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) --------------723D152FEAC7C2E58E2B4096 Content-Type: text/x-patch; name="0003-Fix-handling-of-DW_AT_entry_pc-of-inlined-subroutine.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename*0="0003-Fix-handling-of-DW_AT_entry_pc-of-inlined-subroutine.pa"; filename*1="tch" RnJvbSA0OTUzZjA4OTFiNjI0NDRjYzZlNTlkMzc3MDkwNTE5MjVhYTI3Yjc4IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBCZXJuZCBFZGxpbmdlciA8YmVybmQuZWRsaW5nZXJAaG90bWFp bC5kZT4KRGF0ZTogVHVlLCAzIE5vdiAyMDIwIDE4OjQxOjQzICswMTAwClN1YmplY3Q6IFtQQVRD SCB2MyAzLzNdIEZpeCBoYW5kbGluZyBvZiBEV19BVF9lbnRyeV9wYyBvZiBpbmxpbmVkIHN1YnJv dXRpbmVzCgpJdCBtYXkgaGFwcGVuIHRoYXQgdGhlIGlubGluZSBlbnRyeSBwb2ludCBpcyBub3Qg dGhlCnN0YXJ0IGFkZHJlc3Mgb2YgdGhlIGZpcnN0IHN1Yi1yYW5nZSBvZiBhbiBpbmxpbmUKZnVu Y3Rpb24uCgpCdXQgdGhlIFBDIGZvciBhIGJyZWFrcG9pbnQgb24gYW4gaW5saW5lZCBzdWJyb3V0 aW5lCmlzIGFsd2F5cyB0aGUgc3RhcnQgYWRkcmVzcyBvZiB0aGUgZmlyc3Qgc3ViLXJhbmdlLgoK VGhpcyBwYXRjaCBtb3ZlcyB0aGUgc3ViLXJhbmdlIHN0YXJ0aW5nIGF0IHRoZSBlbnRyeQpwb2lu dCB0byB0aGUgZmlyc3QgcG9zaXRpb24gb2YgdGhlIGJsb2NrIGxpc3QuCgpUaGVyZWZvcmUgdGhl IGJyZWFrcG9pbnQgb24gYW4gaW5saW5lZCBmdW5jdGlvbgpjaGFuZ2VzIGluIHJhcmUgY2FzZXMg ZnJvbSB0aGUgc3RhcnQgYWRkcmVzcyBvZgp0aGUgZmlyc3Qgc3ViLXJhbmdlIHRvIHRoZSByZWFs IGVudHJ5IHBvaW50LgoKVGhlcmUgc2hvdWxkIGFsd2F5cyBiZSBhIHN1YnJhbmdlIHRoYXQgc3Rh cnRzIGF0IHRoZQplbnRyeSBwb2ludCwgZXZlbiBpZiB0aGF0IGlzIGFuIGVtcHR5IHN1Yi1yYW5n ZS4KCjIwMjEtMDEtMDEgIEJlcm5kIEVkbGluZ2VyICA8YmVybmQuZWRsaW5nZXJAaG90bWFpbC5k ZT4KCgkqIGR3YXJmMi9yZWFkLmMgKGR3YXJmMl9yZWNvcmRfYmxvY2tfcmFuZ2VzKTogTW92ZSBy YW5nZSBiZWdpbm5pbmcKCWF0IERXX0FUX2VudHJ5X3BjIHRvIHRoZSBmaXJzdCBibG9jayByYW5n ZS4KLS0tCiBnZGIvZHdhcmYyL3JlYWQuYyB8IDE0ICsrKysrKysrKysrKysrCiAxIGZpbGUgY2hh bmdlZCwgMTQgaW5zZXJ0aW9ucygrKQoKZGlmZiAtLWdpdCBhL2dkYi9kd2FyZjIvcmVhZC5jIGIv Z2RiL2R3YXJmMi9yZWFkLmMKaW5kZXggMzU4MjY2YS4uNGE5ZjQ3ZSAxMDA2NDQKLS0tIGEvZ2Ri L2R3YXJmMi9yZWFkLmMKKysrIGIvZ2RiL2R3YXJmMi9yZWFkLmMKQEAgLTE0MjY1LDYgKzE0MjY1 LDE4IEBAIGNsYXNzIHByb2Nlc3NfZGllX3Njb3BlCiAgICAgICBpZiAoZGllLT50YWcgIT0gRFdf VEFHX2NvbXBpbGVfdW5pdCkKIAlyYW5nZXNfb2Zmc2V0ICs9IGN1LT5nbnVfcmFuZ2VzX2Jhc2U7 CiAKKyAgICAgIENPUkVfQUREUiBlbnRyeV9wYyA9IChDT1JFX0FERFIpIC0xOworICAgICAgaWYg KGRpZS0+dGFnID09IERXX1RBR19pbmxpbmVkX3N1YnJvdXRpbmUpCisJeworCSAgYXR0ciA9IGR3 YXJmMl9hdHRyIChkaWUsIERXX0FUX2VudHJ5X3BjLCBjdSk7CisJICBpZiAoYXR0ciAhPSBudWxs cHRyKQorCSAgICB7CisJICAgICAgZW50cnlfcGMgPSBhdHRyLT5hc19hZGRyZXNzICgpOworCSAg ICAgIGVudHJ5X3BjICs9IGJhc2VhZGRyOworCSAgICAgIGVudHJ5X3BjID0gZ2RiYXJjaF9hZGp1 c3RfZHdhcmYyX2FkZHIgKGdkYmFyY2gsIGVudHJ5X3BjKTsKKwkgICAgfQorCX0KKwogICAgICAg c3RkOjp2ZWN0b3I8YmxvY2tyYW5nZT4gYmxvY2t2ZWM7CiAgICAgICBkd2FyZjJfcmFuZ2VzX3By b2Nlc3MgKHJhbmdlc19vZmZzZXQsIGN1LCBkaWUtPnRhZywKIAlbJl0gKENPUkVfQUREUiBzdGFy dCwgQ09SRV9BRERSIGVuZCkKQEAgLTE0Mjc1LDYgKzE0Mjg3LDggQEAgY2xhc3MgcHJvY2Vzc19k aWVfc2NvcGUKIAkgIGVuZCA9IGdkYmFyY2hfYWRqdXN0X2R3YXJmMl9hZGRyIChnZGJhcmNoLCBl bmQpOwogCSAgY3UtPmdldF9idWlsZGVyICgpLT5yZWNvcmRfYmxvY2tfcmFuZ2UgKGJsb2NrLCBz dGFydCwgZW5kIC0gMSk7CiAJICBibG9ja3ZlYy5lbXBsYWNlX2JhY2sgKHN0YXJ0LCBlbmQpOwor CSAgaWYgKGVudHJ5X3BjID09IHN0YXJ0ICYmIGJsb2NrdmVjLnNpemUgKCkgPiAxKQorCSAgICBz dGQ6OnN3YXAgKGJsb2NrdmVjWzBdLCBibG9ja3ZlY1tibG9ja3ZlYy5zaXplICgpIC0gMV0pOwog CX0pOwogCiAgICAgICBCTE9DS19SQU5HRVMoYmxvY2spID0gbWFrZV9ibG9ja3JhbmdlcyAob2Jq ZmlsZSwgYmxvY2t2ZWMpOwotLSAKMS45LjEKCg== --------------723D152FEAC7C2E58E2B4096--