From patchwork Fri Mar 24 13:36:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nick Alcock X-Patchwork-Id: 74544 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp631084vqo; Fri, 24 Mar 2023 06:37:00 -0700 (PDT) X-Google-Smtp-Source: AKy350bEWU2ReHBy9VZmYSzGkDSJRTi7ZUgiORmyBQWMfwquuFeh+baPXknmW3QnU9ojdY04rS8x X-Received: by 2002:a17:907:170d:b0:92f:f2cc:93 with SMTP id le13-20020a170907170d00b0092ff2cc0093mr2719268ejc.22.1679665020397; Fri, 24 Mar 2023 06:37:00 -0700 (PDT) Received: from sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id gx10-20020a170906f1ca00b008cc93fd1626si20778216ejb.954.2023.03.24.06.37.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Mar 2023 06:37:00 -0700 (PDT) Received-SPF: pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=MH0EPomC; arc=fail (signature failed); spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 8698B387688D for ; Fri, 24 Mar 2023 13:36:44 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 8698B387688D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1679665004; bh=2pVPIu7UDXMN7wkLRonoPzrjKV+8Zlp0M2+4lmBKe0M=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=MH0EPomC/XguqEt3lLVzjMxHRq2BKgTF8BFg2hvyg1/cetoAqdQ6ZuvMj73s/muFi 94ssxxlgtaJO9XGpLqzr4WZOfVwJomA8yWr8Yi96SWpq8KVi8AvLrNaV5FwWPPXHKR 27g4lRk0zDdy045efNYWzjBCtO+RPB0LojURV6jU= X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by sourceware.org (Postfix) with ESMTPS id DC9F538708F3 for ; Fri, 24 Mar 2023 13:36:36 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org DC9F538708F3 Received: from pps.filterd (m0246631.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 32ODJmFQ004625 for ; Fri, 24 Mar 2023 13:36:36 GMT Received: from phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta03.appoci.oracle.com [138.1.37.129]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3phcn181vb-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Fri, 24 Mar 2023 13:36:36 +0000 Received: from pps.filterd (phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.5/8.17.1.5) with ESMTP id 32OCn8RQ001643 for ; Fri, 24 Mar 2023 13:36:35 GMT Received: from nam04-mw2-obe.outbound.protection.outlook.com (mail-mw2nam04lp2173.outbound.protection.outlook.com [104.47.73.173]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3pgxk42144-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Fri, 24 Mar 2023 13:36:35 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NrbJG7wJgFcgcXHqPOBe0EzgWwaOvoxYCGNXUcDoRJG+KAACYybhZpBk+llxUsmrc59Ldcnjx4Dz7V0IHAu868IRDddTIOr3W/xZ30PDvTK9PDCMG/lmDbUrn6yd9wcnfF+LCfK7O7VwEvxuiWfYXzzDr9Uai9zugbfsrqZkXyMVtCbDZtmTWHcDjqGweSTJG2eM2rs4+7/asd1YmNKmxn4wv7Y80DUjxnefTuoSM8puJBuIgq/uVYyWYiMTuNKcPtPTfu5Hx3D2ZDpkjpYK6VIbCuK976wo4POToxfndCbkcgy0/UlTDvA7ZrjlDTCL1mStUe5xC5JVpaGyTXavug== 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:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=2pVPIu7UDXMN7wkLRonoPzrjKV+8Zlp0M2+4lmBKe0M=; b=Vt4Iy/j+t0RadmgOMsl1gZQciBJ1U9ScbW8+gYtnxXwKW6tN8XX9RoW7p/mhTUW9pTKK+uW6lEtL4VTxaMyngQJD50BlQWmjmK3ZUvHlmWZDtgiwIRCZSs7nmUest0E10jRB5sPViCWALXlI9/9MUL0NdBtaMVz8PbtwIrNSEqonBGgNeFDO55UqnB5yN3nmKChNA/S8ZoA1Zgfbwm3AhfUUk+4S8BuVWfp45TSAD+DtaGeI7kYDPA5n/8pKRKAcn/B+2EEg1GhVkgW3282CQ//d9YIGz+bkp1E23yIfl20Z81MIPW67+2Z4LFfwu+bij44T7Apz/zzxWOMvZ8cUVw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none Received: from DS0PR10MB6798.namprd10.prod.outlook.com (2603:10b6:8:13c::20) by BY5PR10MB4257.namprd10.prod.outlook.com (2603:10b6:a03:211::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.38; Fri, 24 Mar 2023 13:36:33 +0000 Received: from DS0PR10MB6798.namprd10.prod.outlook.com ([fe80::d0f7:e4fd:bd4:b760]) by DS0PR10MB6798.namprd10.prod.outlook.com ([fe80::d0f7:e4fd:bd4:b760%3]) with mapi id 15.20.6178.038; Fri, 24 Mar 2023 13:36:33 +0000 To: binutils@sourceware.org Subject: [PATCH 1/4] libctf: fix assertion failure with no system qsort_r Date: Fri, 24 Mar 2023 13:36:22 +0000 Message-Id: <20230324133625.450723-1-nick.alcock@oracle.com> X-Mailer: git-send-email 2.39.1.268.g9de2f9a303 X-ClientProxiedBy: LO2P123CA0039.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600::27) To DS0PR10MB6798.namprd10.prod.outlook.com (2603:10b6:8:13c::20) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR10MB6798:EE_|BY5PR10MB4257:EE_ X-MS-Office365-Filtering-Correlation-Id: 65db8876-a680-4865-3b8a-08db2c6cc846 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: uzI9+EldSFyKtHkPmp3AvxvXdib1GdRL+kZ3RdsnbHzzNQc8ZcH7G8qCwV6iZyy2D6EQksNPdMvnHPCRmKEWlkeqAaSg9UecJPAFz3HOhGyqOBzw+pVZGdXzn3UdkMv0aGUxdeNW52gIQhCASqabfkb3p3PhLqJhzppgdqoEN+yOICwgyXSp55S0yxM0XAB2tXOzCo43luxqdPHIjXeUE1iBKQ3wjdrm4zEerzlLFlk0y82bilek+CQlTw22wCVXItWvK9sFzS6sqy/BTP5foP7n8HIlK4/+OX0OSdlZ+6+LH9WIg/9G+gAeLFvisbJeXa7QQCivSqewEXDQSXADOOYVrBKXlmWY5y39u7eB1KAAKy+ONm8OdY4ul1OKpVB2gyRr3cn6Jwj5usMpq+e43+NKzaNsvUiNTd8ETBC4LH6dxG9I+XS1rL+UhpVVqDWh4pXpwf3l0BlCqdESWsOGp3TcvLiD8pUDx0qv0fFPRKr7MLcpxNWo3VYnibkQMfsJYIXY0MDYzvaWK+h/c6SOKGoxUhNX+yU1beNrrxaS0jOClaa1W3Ap++YREkqhDuCeEDMDgZXdlM2A8m7do1TDLCU+R+yEWYwH1UHBxrifbVluakUGItZk9CSEKE0KMI8IbK2tQ0ZINZjnsHXymt0RAA== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DS0PR10MB6798.namprd10.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230025)(376002)(136003)(396003)(366004)(346002)(39860400002)(451199018)(2906002)(38100700002)(478600001)(83380400001)(6486002)(186003)(2616005)(36756003)(86362001)(316002)(66946007)(66476007)(8676002)(5660300002)(66556008)(6666004)(6916009)(8936002)(1076003)(6506007)(6512007)(44832011)(41300700001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: k08gAvGBxkNrXmH4Deuq74cm/GT8dEiH4A02+w77onQBw3z5oqwkz3QnvA/gQWf5wYxVwu6+bh34ATo6efmDTx0p1uhT6fw7BCqobPuwN//37sGAL8Qn2JqBr3MU8nXVrDn0X25DNquzAF5/rYSTgFxTOCY3X4uFzB2UzfLI0hm6XC+R0hUMIlDS/VqCYfShoUhK9/6k3XYeYsxEZ7Hxxhajv/x8RaRh97ObbThmImRj/dxbMXtTKHdbw43T9q2YtkDuvoZyRrpf23LlpyEKJozjjIiZc83OzG6zyQdTS14olwZvlaUCeVlAdLIbDQD3uRndcAgfU/R/NLBuwf2Ahl2sSItOyx6I++Wq0/MGGB5xludWImB+3pMrmwUxoC7k2sioF6DEREopig59lN6tu0MI29z3W9pMyjlnTlP0np1tuzktAxqUAr636eifVautlkUjz9g8Q30MQMWjVL4fGX4lZtv70528C6H2v8pJ6ZCqz1zcl/dJ0EHMQArSuHy57Zr7EI4PfI8JGT09I0fHa8MNRrknm/f8TJyOHclSCG8ulsqIN8C44jcsgkeQ9aOgv5WOx+tGSEyLUIBX/UaTwhYklcCEuW7a28MU+09nzf67LjM0jukBNkhAPPRcGUQSsUEPH1duRVg0OkewxTPmiWyIELrJThwfENHdhf2ZgccwLQc6l/FizKBlZshsJWH3C3xG/FIGdIEHI5YGgGJu0HQENeUKWj08Rw9E2Pgg8JoA0GjzY5aRrUq1Ygv4LF63ndXqRppNRCLM5XOz6KA5NRlmPvbvegQ4Pbd3IVlXrb86amFDfKER680r3n/l7KZ7kaCIMzM+Frp6bv7IZQ2ECdHAtZW8+MSfTLKbVyGQypSOJB0Ec8TSfx+X/scXoiushZUKiptIHPG7G20bLj0lfYJuIoEriB+BRNOOtuJMN8UOn00y7tATYO4kayof8NccqZX2TedeCeNnwZWY2Dva5ZDe1EwZ6T9xu/DAO/kYhGyLXNi5sif+79XQ54pYsJzBS3/64Ss9oCIUepUi0yX4YAxG+pG4rouNiD4pAOEGrEq/05E7a9tBJnwAMiNC6zgRoOJVFwHp7doUwKWas8zHQ1WokWUaOqP4O4oW9NSio0S2u5i/YkFzl95FPobK6YOnYAOfDICqXnkr2ErKW0RYn/KT5xKH5x22QhTk5R08RNegHmugK3FioUdV8W8Iq0StDpbj65m9gnIVgD51UG5JZBmSATfiaJXdfxh38iyNSDEIS9LCibZYPm21CGxLsnvJ74XZtsR066aOItJ98abCxR2/i3LeB/RdjneFRMnaUt1VZsJjfuIEWMtTD+g8EjIzMvIq83LPG04VvC0x4NGMkjOeShu19yT8KGspuNIcUy391jLgEDSs+4yaiMbSWQr3DUnvb7se0s5eaa7FY/5Saq8+88VFdGW3o5tT4aDC3GXAtZSdSi/l0PrWg8WQAC+gjHkursiR1ny+6M1BNc0QK4PktNbRRAGugD4FanUHLEgNwVUXfVyruZbcVzQoQpM26vgJDy2QgBUVZyEmJS/qXj5QuvS0er2DRk/zUrXGuz8uSacul+xzUzNaPQpFhiGuXil4ikl7TjqWgZrJtIObqA== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: chlGt1CZ7rTpCj6BauYGiwVUsdb4L0IOS0fgn1OmFFHlQCKmPIF9t2p8kgFHLGTd8xYcUbIAf1+7l0eClI6UPl9tRWfdixhEf0kdBNJ4ea7DZO25msNelF1K8LxXVEzh2i+hUpCfomiO/gIJoxnj3hjGo661hh0WDdV7HSCgPbpNSyIenmWxmwqU+gMYE0WsPC6Z88A2HE4rnx0xRlOjvtTHptauFSmeH9WvNYuwAUP0wvePM9UC4R4jFfJz34Nq53yK2Q3EfkVjs/XxkOKFy8cuziBUcCAB6f8Bw5E88MGOQVIkX1rjefYdmhupx5TREgivTsfjRDngDLec0y2fLTaSDtNwByBdhGM1zKcHqGu8aQqEExJN28AgNaBVZAGsyWgn0RjxJ45DndEbnc7Njdmdl4zqSfTfOm+rMD9KH0dx1xnhm4bwIWWYYo5uVTpsX/YFbEf32xry6m8XxIPhdskPZPfbJ3GMAgx7N5SwBuVde3FF8yRyMtzA2LCSudeIqz7w5rxSvlKz3KeR/f7oA+2/9mB+D6VwPHzvfQN09WdksX46mly2dCf4kNJvFG51UxTFd3r+rBSUeaACiRmUuJg29nHqSPzsXFea5zYD0DqDb7DUKFGAOn3joomU/O29tRefAMnRnuqNQOtN1j5okuVrKiQ1At3MmkxCQeg/g4nqVi4yjcLuTySBsY6ITti6/A7J4QO9+sjDoXoDd6gY+wGc8bPr1/FHBPzhE0hheuOQpICCWmY1b/6yZ30tB0aT X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 65db8876-a680-4865-3b8a-08db2c6cc846 X-MS-Exchange-CrossTenant-AuthSource: DS0PR10MB6798.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Mar 2023 13:36:33.2599 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: wv4S6TPk8izArZu4g+uhaR2hJq6uYgLi3V3NN06fX7azQdGG+h0RUXFdzI+EbE1GKlXChjGW/hsZl9Gqxo3Ogg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR10MB4257 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-03-24_08,2023-03-24_01,2023-02-09_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 malwarescore=0 mlxlogscore=999 spamscore=0 adultscore=0 bulkscore=0 mlxscore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2303200000 definitions=main-2303240109 X-Proofpoint-ORIG-GUID: cAknOahoTexycSIHeTuIdITyF_5tLTCw X-Proofpoint-GUID: cAknOahoTexycSIHeTuIdITyF_5tLTCw X-Spam-Status: No, score=-11.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: binutils@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Nick Alcock via Binutils From: Nick Alcock Reply-To: Nick Alcock Errors-To: binutils-bounces+ouuuleilei=gmail.com@sourceware.org Sender: "Binutils" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1761256428220443664?= X-GMAIL-MSGID: =?utf-8?q?1761256428220443664?= If no suitable qsort_r is found in libc, we fall back to an implementation in ctf-qsort.c. But this implementation routinely calls the comparison function with two identical arguments. The comparison function that ensures that the order of output types is stable is not ready for this, misinterprets it as a type appearing more that once (a can-never-happen condition) and fails with an assertion failure. Fixed, audited for further instances of the same failure (none found) and added a no-qsort test to my regular testsuite run. libctf/: PR libctf/30013 * ctf-dedup.c (sort_output_mapping): Inputs are always equal to themselves. --- libctf/ctf-dedup.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libctf/ctf-dedup.c b/libctf/ctf-dedup.c index c46f69e7449..6297c45c84d 100644 --- a/libctf/ctf-dedup.c +++ b/libctf/ctf-dedup.c @@ -2306,6 +2306,10 @@ sort_output_mapping (const ctf_next_hkv_t *one, const ctf_next_hkv_t *two, ctf_id_t one_type; ctf_id_t two_type; + /* Inputs are always equal to themselves. */ + if (one == two) + return 0; + one_gid = ctf_dynhash_lookup (d->cd_output_first_gid, one_hval); two_gid = ctf_dynhash_lookup (d->cd_output_first_gid, two_hval); From patchwork Fri Mar 24 13:36:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nick Alcock X-Patchwork-Id: 74545 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp631180vqo; Fri, 24 Mar 2023 06:37:09 -0700 (PDT) X-Google-Smtp-Source: AKy350ZX3FBOQCUdAEwy+UncI57NFBJB9xTKQTtS/wzbAZHIbzwqMcBr8FuTomaJtFPD/Apr3XGE X-Received: by 2002:aa7:db59:0:b0:502:2265:8428 with SMTP id n25-20020aa7db59000000b0050222658428mr1811817edt.38.1679665029492; Fri, 24 Mar 2023 06:37:09 -0700 (PDT) Received: from sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id jg22-20020a170907971600b009329350848bsi24158451ejc.408.2023.03.24.06.37.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Mar 2023 06:37:09 -0700 (PDT) Received-SPF: pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=Iiy6Tc+N; arc=fail (signature failed); spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id C0A293876884 for ; Fri, 24 Mar 2023 13:36:49 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C0A293876884 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1679665009; bh=+IJhYRIjRljJDPtGMuUbmf8//MiZUwk7ZLajKbGEZEw=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=Iiy6Tc+NvDxG06elJZXZxNCAdXSzzkKm67ILCrwSkq/ADQsk3JWdrZGSIQD1j6jH8 elCQ+vmvjpNbw3pmlmMpcwj1NTbSQKEEDZz11KhMT3aJ3561BUUTNLeY+5TvQxpjFv uKAiJVDjeFtEHmPAOO1LY0VhArMCRFJZVtOuYGog= X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by sourceware.org (Postfix) with ESMTPS id 6EA8E38708AB for ; Fri, 24 Mar 2023 13:36:41 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 6EA8E38708AB Received: from pps.filterd (m0246632.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 32ODOi5C027772 for ; Fri, 24 Mar 2023 13:36:41 GMT Received: from phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta02.appoci.oracle.com [147.154.114.232]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3phcqe01dq-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Fri, 24 Mar 2023 13:36:40 +0000 Received: from pps.filterd (phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.5/8.17.1.5) with ESMTP id 32OD0Q2X038006 for ; Fri, 24 Mar 2023 13:36:40 GMT Received: from nam11-co1-obe.outbound.protection.outlook.com (mail-co1nam11lp2174.outbound.protection.outlook.com [104.47.56.174]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3pgxpy1fjj-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Fri, 24 Mar 2023 13:36:40 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OYt2yXkE2PHsVTuTElZif6rMCb1dAZjXpo7g9nou2tkauAfLTN9fOtkM53qxiK8YnFZO5XzGWrwsF3sylDgu+drZ5EdsXhKbxV1ZKfRTYbRf6ib8XNKXHH0fBKjA9ruPZfX/qEsFPNCuJ7qzykTy4dqkL6SL+bR4ITevI4GkK3lrcSWhW18LsqSYTMqccsO5QdLScXCJ9NDdjrWLO9zG2Rx4yA/FvGpqxmc3GsGs/q2+Th8k6EeviX5HTLSE2Q/39lr7M7ER+hNcs7GYH8fR1HQbuXnhefMf8j4+r+1mNPzowfH17mNrsFPmdOvj7sIvxY7E85B0Svf7UblCwJga6g== 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:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=+IJhYRIjRljJDPtGMuUbmf8//MiZUwk7ZLajKbGEZEw=; b=TrDAtDoF5+SgZ/5p1lQUK+2lFkJWZpP/d7GUiZ+W9dF4K9uD+YYXAm1et42OoV1yvYIi0mQsxDv7y751tLBm4WTZ/USxjjan2qE3XjB1BMt1jJ92jG02DSBY1B5wEYFySwbmH/GKU2I7nmyUkFGqLQqkHuUIbaLI7e/Mgl5VikHh3ZiyfY1mldTz57+ACym9Frk3OG+dhZ/7CkfBdiL1+YVx8hkVNsdW4W7gyiFfEK6EoLuiqWUza4sJwQbMaMtqqO0vI2AK2u1E/3zPWPZcmd3oWtjoqkuHTRgqvbx3UCbrLNHQyDD7LqhCYhaLWA49x1RMRssvRnEA6wRLgaMJLQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none Received: from DS0PR10MB6798.namprd10.prod.outlook.com (2603:10b6:8:13c::20) by SN7PR10MB6593.namprd10.prod.outlook.com (2603:10b6:806:2a9::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.38; Fri, 24 Mar 2023 13:36:38 +0000 Received: from DS0PR10MB6798.namprd10.prod.outlook.com ([fe80::d0f7:e4fd:bd4:b760]) by DS0PR10MB6798.namprd10.prod.outlook.com ([fe80::d0f7:e4fd:bd4:b760%3]) with mapi id 15.20.6178.038; Fri, 24 Mar 2023 13:36:38 +0000 To: binutils@sourceware.org Subject: [PATCH 2/4] libctf: work around an uninitialized variable warning Date: Fri, 24 Mar 2023 13:36:23 +0000 Message-Id: <20230324133625.450723-2-nick.alcock@oracle.com> X-Mailer: git-send-email 2.39.1.268.g9de2f9a303 In-Reply-To: <20230324133625.450723-1-nick.alcock@oracle.com> References: <20230324133625.450723-1-nick.alcock@oracle.com> X-ClientProxiedBy: LO4P265CA0271.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:37a::7) To DS0PR10MB6798.namprd10.prod.outlook.com (2603:10b6:8:13c::20) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR10MB6798:EE_|SN7PR10MB6593:EE_ X-MS-Office365-Filtering-Correlation-Id: cac73b7c-3110-4ab3-6e2b-08db2c6ccb22 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ADBVPpr+qHuFLYiMlMX+7AQNUtJO+wZRe5qkA/gYGBtbc0fscZXLjriFJHv0wjm5JPFDyvmPQoO0LXXnSEOhDm75DeKi4HhKGlqTXY5xpInDrE6UseudWauBcTNHIqclomah7Q5Boc7of29ZJwXs+/yJ0ia/v0dyBHJZVp/vzErWOQUDu82UKyextuGQGa3+Ii4sScFepIz0gk5pvpPqQCxP4EWqyIPgO6JYWF/X7Cs0lpPhxP5dry45yqp7nNj19I0v7e1bwYNze0WCQKmnb2tM7WAD+o4RzDMs1JBBUs/LP0/F58g0JThAyKyNiYDlUqrVlJCz9hIFEx1F/p6hZ0tE7GK9NpJPRkxIAtmAQHo7vHDyMeJrt+4DyURhBvUwFe1v0K3UqwIeXAWcq/90xawoRhyeBv9cQoVk5zccwG57cZXNSNGnVVwnZD7SeKcSHTx09TaBe3T7Utu40CFyyD5dI0kv5+4PxNPuSxb6o5VabAFERFbuZWeo8Q0u/NOxB2N6TUBIOPsMcQJyr0VGAyv35zYm7BXwjpaF8W5Te8AbOslHM2MhAYn36gcW3BjUNuNWa3rGLfu3IgimAbglI2O7YSiKDEpssplIpnmV+fg7tOIQvtCZXdNFhMoMIWDFpa1jcOCUcAJa8M87JG1gkQ== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DS0PR10MB6798.namprd10.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230025)(39860400002)(366004)(136003)(396003)(376002)(346002)(451199018)(6512007)(6506007)(41300700001)(36756003)(1076003)(2616005)(4744005)(44832011)(2906002)(5660300002)(38100700002)(8936002)(316002)(478600001)(186003)(83380400001)(66946007)(6486002)(8676002)(6916009)(86362001)(66476007)(66556008)(6666004); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Q+CBuHmVE3s5BxslGy/VcZfAnzwcRh+mTW7jakGJRQFcBdrE5dEbzqeUxxIjIHeoJ8dZ91MD+1RJmTE4Nvv8s4xD6y0OWNE0yncrz79G1nfTM5p1SOuaGg52i60MYvHWzHXu0JXtRMRFa/93QynszIkKI2O7AKEZTgGsU61ye4UC5+m2KlQ8n2H23EZszPzgHqdxQz+RLGkrGdlNqIVxXEtduv9OheJsD0RGrabVqsl4MIHve0gvjHesr4gpxbnYFnZEeQOSXjEe3wNBVOf3Wbq0zsy7ooF5uCcqkwdETWVoXeLIx9gBvIk39+2zGQi9RNZWB0YxBGPubOxLLZtGvs374Pl/b3duOqrIoNB7nxFjE5bTxxAEvjbDcVG1HFNe/7EmlVHH3gjZShHbYMJBA7kvE7TrqDQBCtp6VAaOVCuN3XNUC3eAOTYs/rubxO78gMthqf9U+U/O6oT45KlbKp7BM5hQ/oq+MA8pqDIxBeYq6x/YmmwzTuj1b3ydQM+IB5wk2I+HJ7GB8lhXb90GoyGbOjS+GZPd5Ty70VjhjeXrMI9bWyvaP0XaqcAMmr9AbJCMUX31xnsa9D4Z9VJbPlqpXWIcam8kM9Q/CmtnDsKpdZmqfRW+h9FDsZuBLRua1be8Qegs7YkXysw49kKGIB/N+zEVPSFpN45ldjwhcVYAxjLDgSbR5rM7lK/D1dQTBGr0etxaXIK2PYTZADAycyXRgjIDPmBXZMlawyfxWExcRjde0ZKskTvYkUhIHluJS5qD/CIIgNTjHPhmZrcOWQjuOl1ubDAQ0GRvKtA49dsFDq+bt5oUMmYIypxWbrHFEs84VwvDQqXBOOkBuxCpSmUekF1pn7B6P49+R4JyWEHGdWquXLbuxgc9vlaaqU9VI0G0LOhejtI/LYF3eKURrVaWKL1lCk3MWqJXuoT8mXJBtPnp6bpy1PKo66I27mc3pS9OMIcNo4tCKKNH4zMN4h+4toJ6S6oq5CyRmPglRMU/DI2Sh36IS1d40EL+FEu2eVEH50zYekZKgR6N2KhXHIe02L2016vVqyPPXHNPEywMVpo4qRx4+4Ea4qj2eehFUHYCVwvk1FQGtt4zSp00wBR6+4yscD79ZErTlr5p2himZP57N5JvO3mQJJSx2wyWaz/aWKCdHiEX2bipC1s5MEZH79rNiaDrqKbKn79SP47zlnPtu/c4dCrNb9rw4tHHGqrQttMwtJsQi53fLMMiWfYRSnJaWYng3QX73VL1wqdpXj8mknIdI0L1a5l/XZvrl6hlhDQ/5zUNeaFi87eIXUZnysowpfbjCRj5+vUC5m/PdfMUGtIOgmix3eVmd+CMT0fBDy1KDqcBSB4YZWCNm5Cf2zt6uLMzIYbBibJPKAMcTbqU5AsCVSdg0saUDDJeiAz8x6lKteo248X7xsgkK/WtOXFPk/EKANBhEOf0XqlU/iAVzLa8dufOjBG9YPispOZSWct6aYpyyRJcokwpkITtoFh/8xJPBAQdrDPOyxErO/4koH2AtYzCh7aIJISmZ3lopkqNL4KD11Zr7AOjZgXHZwno/f0/F0yTM8GXaiHPp2sag2/PWzjiTXC+OrQSid/hzUDJ/vGChEFm3AJ1Pg== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: T4rbBHRa9uIg/CdVHAZ48DprMN2K4SzcvA5MxwwOrG9FzzMU9CdaRiB7PI1r8YbHfiVT4wY7k1uu80F/aABiQiIl1Yncm584CXtRt1PnAGd3v6TjD+xR4JLtU58Rm7I8q+krw98JSVwYSWjF+29HBqvwhcRuShGVoVou0SSFAp+GBeQMWHvIME/Zetqq5IrVFA7VMcEAeHHmnP8uhWmaSCtNtyQy2CXC9jzxiyNrYGQ34IirrjvXkB8O+Pn5KA1hjZdrDIOAFy3WKh+UAKsBYjZ/WhFp01Rta0x/jA8GqPRtE0zGYA8Bm4hQDAgrQFCyycHarJosoRqSuKYGyalDSrdMR8+pKbpHgPlWe6R7+YnqAfhDIaEtQV0VVXJ9kJpNqyEmsTnJsrK1I/w79e2rlhJk9PuLGtUSzLscT24CGcX593fjUPMHck6YprQQLlTjhpnJIXwMkipJ3eceq+dug+aIdlLUR3Y9F7HAlTnsnt2cAjNFJR6WVx7pKigwD6cLRkiZ1hsXtNvrW3ipHq38K6cfEZX3fOUs2AthL3cP0h1GJjg3Wf9TXif1vofZzysJBYp0FuRFTOIpk1ITT6qZJ2cNfFww7Rz8hRJeSQfH1xSxk8JnYre+kw45nK3rjQOFTKvP247TByY55Y5I6/dMwHUuoCgPYI3JFLkNtX2y7RqahqE+jN+W5IbI2sNwfNFZ2LGsuIKIMswuR2r5fm0CZnqiLfMHyHPOVaQITY53gMMz4gUk4k5N4gf1eDAp5J+n X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: cac73b7c-3110-4ab3-6e2b-08db2c6ccb22 X-MS-Exchange-CrossTenant-AuthSource: DS0PR10MB6798.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Mar 2023 13:36:38.0428 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: yxfXqarIihx4Wr0R8Fgx7qwTLPVL1tD7+hN8gFND0CqS+T1HDwq+fXFLoKOIQ3TBIhEQGcV00sIeGRD79woAtg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR10MB6593 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-03-24_08,2023-03-24_01,2023-02-09_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=804 malwarescore=0 adultscore=0 spamscore=0 suspectscore=0 bulkscore=0 mlxscore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2303200000 definitions=main-2303240109 X-Proofpoint-GUID: nWMdrFAOqwr3GBHcKfaiCyHb13xte3OR X-Proofpoint-ORIG-GUID: nWMdrFAOqwr3GBHcKfaiCyHb13xte3OR X-Spam-Status: No, score=-11.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: binutils@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Nick Alcock via Binutils From: Nick Alcock Reply-To: Nick Alcock Errors-To: binutils-bounces+ouuuleilei=gmail.com@sourceware.org Sender: "Binutils" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1761256437805485383?= X-GMAIL-MSGID: =?utf-8?q?1761256437805485383?= GCC 11+ complains that sym is uninitialized in ctf_symbol_next. It isn't, but it's not quite smart enough to figure that out (it requires domain-specific knowledge of the state of the ctf_next_t iterator over multiple calls). libctf/ * ctf-lookup.c (ctf_symbol_next): Initialize sym to a suitable value for returning if never reset during the function. --- libctf/ctf-lookup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libctf/ctf-lookup.c b/libctf/ctf-lookup.c index 10ababf1489..950c0a809ac 100644 --- a/libctf/ctf-lookup.c +++ b/libctf/ctf-lookup.c @@ -651,7 +651,7 @@ ctf_id_t ctf_symbol_next (ctf_dict_t *fp, ctf_next_t **it, const char **name, int functions) { - ctf_id_t sym; + ctf_id_t sym = CTF_ERR; ctf_next_t *i = *it; int err; From patchwork Fri Mar 24 13:36:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nick Alcock X-Patchwork-Id: 74547 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp631981vqo; Fri, 24 Mar 2023 06:38:27 -0700 (PDT) X-Google-Smtp-Source: AKy350ZuuDIjppfONx/FGyURYQCMActmUowqPoYJB6VY5UHHxaw0o9my+XTr7ZGp2tOP8srOpg8Y X-Received: by 2002:a17:907:9865:b0:91f:c7e:22ba with SMTP id ko5-20020a170907986500b0091f0c7e22bamr2832881ejc.27.1679665107448; Fri, 24 Mar 2023 06:38:27 -0700 (PDT) Received: from sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id p3-20020a056402074300b004acb5b5b339si21988831edy.219.2023.03.24.06.38.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Mar 2023 06:38:27 -0700 (PDT) Received-SPF: pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b="v7/zEIyN"; arc=fail (signature failed); spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 3B99D38768A1 for ; Fri, 24 Mar 2023 13:37:25 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 3B99D38768A1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1679665045; bh=TLhZTIGsaEHFog5hPsDcIxclYjlzAZ4OE2u0lMFeDt4=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=v7/zEIyNbaPPq8rjp9gt68GucGu9U8xKi5FJsOVSlbD3Isf8XrR04h9sem+H7r0VN Lj+iRnyGlwJCNI+S1kKhcW7WN1RFSfv3PYCp8KtmezEHloGkLu5I9K4nCf9yhjvAy4 DwxB1+sgjavBtrCl0HZb6ZNXaKP37ZyxCgishULo= X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by sourceware.org (Postfix) with ESMTPS id A3F3B3881D06 for ; Fri, 24 Mar 2023 13:36:46 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org A3F3B3881D06 Received: from pps.filterd (m0246632.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 32ODOXRA027609 for ; Fri, 24 Mar 2023 13:36:46 GMT Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3phcqe01e7-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Fri, 24 Mar 2023 13:36:46 +0000 Received: from pps.filterd (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.5/8.17.1.5) with ESMTP id 32OCGWfH027822 for ; Fri, 24 Mar 2023 13:36:45 GMT Received: from nam11-co1-obe.outbound.protection.outlook.com (mail-co1nam11lp2169.outbound.protection.outlook.com [104.47.56.169]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3pgxk4a0gp-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Fri, 24 Mar 2023 13:36:45 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dkKqlCEaHRlvsB1p4bJxM7nEIGXMVObygonpfsYLVlGB0Cl2hsz8zk/+K8bc73whXKjoJzwh0b4fQ8J973SUMPYckg9YQmg3riVipYLxX+sArn6lp3fNwy36y2ra1vABBXW1ocd5hL6RQAOP8MGWqEcoRzRKO1+psQaQ+5SGwaENIGyELqh8Oua9R6pK0pnfVBlDRQwLXmgJjjex3mbc2/KMaio2TWxNqF++Iils8Tt+rI45afkfgzocPa7K7cKcHSRzZV405/92W8JOR3mKM1SgyoAWMa2DZJghEhnJa48e4Y5zC52CeyuXcb8DDWfml8lh8g62qXOWz2Dvg1jygA== 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:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=TLhZTIGsaEHFog5hPsDcIxclYjlzAZ4OE2u0lMFeDt4=; b=TJsJx/+83j17F7prn2sDUA7jfcVqB+9BzXrpkg2P2/Fn1KSPdPpDZwAZU5zha1Ef/OjGSr6Uby/v+ojV+2RJbAgtk03HrV5Fs+yZF/NsRYSjUzuuukNmmnfLItAAkmuXaK/PZ27BO4G2QQzri8gOvoJ1el4ZH4n4AUMpgBum0eJi7rV3JTN1TQQYeQ5CI/wFNPidsewP4QyV+JSpFXqTLtuY3TaDC3wc6x2BpdjCSFqHWunyH46uO+zbHg4VzeSzOdNEMFc+7ixIsh5XcTwf8w0VsM15FMalPUfSf5zz4A5EQi66tGWbGrcum+2i7oT/0x88WmGy/eUKV0ewx3GbUA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none Received: from DS0PR10MB6798.namprd10.prod.outlook.com (2603:10b6:8:13c::20) by SN7PR10MB6593.namprd10.prod.outlook.com (2603:10b6:806:2a9::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.38; Fri, 24 Mar 2023 13:36:42 +0000 Received: from DS0PR10MB6798.namprd10.prod.outlook.com ([fe80::d0f7:e4fd:bd4:b760]) by DS0PR10MB6798.namprd10.prod.outlook.com ([fe80::d0f7:e4fd:bd4:b760%3]) with mapi id 15.20.6178.038; Fri, 24 Mar 2023 13:36:42 +0000 To: binutils@sourceware.org Subject: [PATCH 3/4] libctf: fix a comment typo Date: Fri, 24 Mar 2023 13:36:24 +0000 Message-Id: <20230324133625.450723-3-nick.alcock@oracle.com> X-Mailer: git-send-email 2.39.1.268.g9de2f9a303 In-Reply-To: <20230324133625.450723-1-nick.alcock@oracle.com> References: <20230324133625.450723-1-nick.alcock@oracle.com> X-ClientProxiedBy: LO4P123CA0172.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:18a::15) To DS0PR10MB6798.namprd10.prod.outlook.com (2603:10b6:8:13c::20) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR10MB6798:EE_|SN7PR10MB6593:EE_ X-MS-Office365-Filtering-Correlation-Id: 53b7407b-fbf1-4999-10f9-08db2c6ccda9 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: O3xgnJe24ZyNFjNEb5W93YX9a4GZS7oBuU6XGcqDkhd9P8I8jLMqNjYTFCfEW1Ykw0aNQlqG6JQjuZgrOElS329WUMUXn/sRjiJfew9DNOKIk2gV9h+/axXadR2BIGRxWUQ7nSVxqUgYeeoXS0qFEMQOyCCPAQ6xYLo731yFnbANxtqJXA8CFLCgZAKYa5Xpmws2B7/a57f1iwV165Z3RxjMCqqZRwgfloLQCjeg8pDQXAiDD1m/0abrJnSWcCOig6MHqvRQVCpcssI9514OqFr6KrQZzJfe8TaJDUEmX5tr+PoUcfx8ZNFhS16Y3l9VnVOAcH0k8oopmo7sRgBkHh81IZCMTaFUlxTOqVCfczS92pHA+UCGBFZvkD2ts8z//V0+uv7bR3bUtjQ9Y2Z/pW8bigi0x2YtV0oywcKmTvfo4A1DCxRKW0cbxkzdDxm5gi9DH663n/rXSgJ4nfETOBa9DlW9QfHp8iK2IohrEmYkzFkQe2jqVeMp3L9PABxRUECcp3cQ+fy6NqqspAabVXHQtmX+/gwurb+1kW9Mmh3/lgJBQciS9sQ6CseL/OnqSl63Bsje1/DLHMFB6/+akTNhZ/aOGzFl9AXO2A8rKo1XXLkZTwarC5asdUf9oC3CftAaKQSlP86FUax0SE6v7Q== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DS0PR10MB6798.namprd10.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230025)(39860400002)(366004)(136003)(396003)(376002)(346002)(451199018)(6512007)(6506007)(41300700001)(36756003)(1076003)(2616005)(44832011)(2906002)(5660300002)(38100700002)(8936002)(316002)(478600001)(186003)(83380400001)(66946007)(6486002)(8676002)(6916009)(86362001)(66476007)(66556008)(6666004); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: /c01NSl60sfjGnBExvgjJMghYzyYEsdGoaJgXjOoSGRK8DZz9X8/IATorIiuPEjcQppBHdzCbUsGRC3TkVyOhEi4S8hBnrsYfZJk7HqUYw7KqaRaB/TdO24APpxL/Y5R6falXJvyLglpsTSLWu5p7a+il9Sw6ySIfPJCCroBIroFAVGcyphnwdWXUxnKcf4TLIgRu2T7vkXTWtAbAXbdT/Vs7GftbSM3e52wm7nrnOmEUXXyI54WGMzRJCYGLd1JxMwYrXtjXXHq2J8QS41x8l9zAf99O3id85GlkZk1c9KpYy+RRzpXULy16PdyahlsUt6o4r+kGEMJukUkaeu9C3TnrgCXvkHm3viY7TSMgNHiIuOStWr7AHSf8UbYVU8+mmGbzSKzf11XZOELZFKDYFKmNxBx7YNdJ3Oo7zBZGiVoXCF/h5QnZ6CgkAiPznQy/jJLPjjUQjn0qkmv6y8b7Evny2jpZuSEOo6ER3anmFk0E1WU/PYsgdAqHVTFANARaKDG7B+fw7GRj7q+F/7gj/LlxuCrd4KoG5/ZOyjSCKQSD/GS/MoWGC++w+LhMlsYm0SZXufzwOtPahV9M4/w803VQQ0uG/Pv2ygdHVjJ2HgouuH8TYYoUa0ah5XSJwa4RRYeljsJBIIcjzZuuuzHoslr2TM5ji84g6mGCSVOx550hEnxSfUj2tlgkim8xN6e07SkHcjzXphEoQlgcKiaY0ujwI5uWkYWJkB3phJJQ79B/y3QDuO7Sjg1ni5HsUtYKQsMlfwz4D9cJUrDTEjfCNnu/ZR98OBT7NSoC86NAusW19m32Bi8VW37+KXasF1LaMtVHkEs1t1LomovA92HLmczgHHX9rIGogkVLiY/5n9h3Z+78OHo7P11r93sdqsFyo/4umBLGHXODgp1Wgue4OxT+MK1t2F8LeEgcDLs0UrKMH384R/wkwAaV7RCloxS6gi/FWSaa5LppKyMe4bEmhRG4ZAtVEoFYuRsxIYZ7Xwv37Fv2jL+g14Wcb8mScIOVN1zx+rlESOCVZ0SpMONeuqYPfbps6xo7Yr8un0NpvNZkuFlDACIuEAur4LkIjK0AtrqrS/QmmgJ4XmkQx+flay4IUeGZUhuv7nngexkhTl+iBoqO4OQB6H+gPED3yrCsWHjej9JzWPgrKse2BItO2sK5I7Nz1TvCtCn20M+vxdaXg01fbRvSH9JDGTG6pPufK3lNJhNrhKANMkYfRkEkUlu4ngr2PHB10kLg5GVcMpdpJ+OtGhtHlP282MKeNLpEl+b7Hn3INJdplKoJ6Ox+74Xopinu0e318aesIlqML5o+ouZWb9yaZSfTpKvNBLzOPfOOvZl6uk/G23M9eC/WOgWJDBXA9GFdysks76V2742Glk6kMGqrkRmjR9tvyorWJf0HRtCAlt0luW96HnC7XSZT9X3jP8HnAhc+XgaGXQctv47uxiRIHYVH7sbWXEKtP0VNC0YxoJukZOk1CJIrsYe6n8NqodMYYuVgQQr7QvVL3JhdpiQ+vdQzL/JZCzx0hE5XnTPsQyIuor8Es73C2EYybPPBNX6RdiRrGwhX9Bse8kwTNpzOwklWVbXboC4qM2XYWOkrSd6d4WfwshLLg== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 6TSlGMBNnihghfdWGpW6O54s55hrVeDDoZlzmecfhNsImvBk6D4+AwY8GrQsz4rOsaeBsaeRUcYXsIplqdJYjrViKyNx5Vr36UWcwwFRIED0g+sjdvJpNREhIIEq2Z0kh8ULrZAO62++53OM+REaqmA4zaOeQL07uzUlBc80Lj3gpOz23ELe/h5+BVUyLW/u9fIn6APDyN2N0V8XwBKbZaBc7OpZ5DQlESyhSnLNN7pxP1wsUzz/P3/GQtrdOmUEUmrIe4krakqUuiY6Yuu8KIoeUpVsCA8kisaxsoMvzAV494XOE0UQs9YLFvvLlLUdNTn2vpLkE+51j5al41CBF5tN5++E/w8NI9VhLeBxw50Fr2f6l9JGyRFFF4GHstyVnbDVkzsAUpiDHpIa5V8jDUwJIAWQeVbNeVLUuB2/zE0eMgGGeckTy+tKLH1kimmFIPcJ3ZTU4KJ2Vqt17yfRxWk+Y4LxoJ2QNBO3MfgkGRf9/a3Tb6i57dQxjwH0UotFzXihXKikwK4vOP77PH6sst7Rac2W2JdKOCNEyuGpIi4drjqdpQTf4PPwnRDlrWVCUeh6mFtBav18uho2w8HPfyh1uOaIahsaL5dwmY8XxB/Q9NHmX5MkxBc3TMiKuDxbfxVyCY0XLW4OBORrFeCYe99gzjEA/HxNe0BqjPodA0dCaVpdx7BoDE0TEGAazsf1+TWdFT87Cdm1HTOBtSRI3SvgI87fP6jjc9P6gWpdKbRyTLLW8whx8KZ5rUB+FFSi X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 53b7407b-fbf1-4999-10f9-08db2c6ccda9 X-MS-Exchange-CrossTenant-AuthSource: DS0PR10MB6798.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Mar 2023 13:36:42.2806 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: Pij7XuGLnngpSrR1+Ewlp5R8SVqAb24JK+Tv71cAlscQfUfhvLCjw6/ArO4auMtrd6iNc2aS6TQ2I7lVlOH36A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR10MB6593 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-03-24_08,2023-03-24_01,2023-02-09_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 suspectscore=0 malwarescore=0 spamscore=0 mlxlogscore=999 adultscore=0 mlxscore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2303200000 definitions=main-2303240109 X-Proofpoint-GUID: 0SFqilDJinFuiMEI7hwe_NiOraIqpa5t X-Proofpoint-ORIG-GUID: 0SFqilDJinFuiMEI7hwe_NiOraIqpa5t X-Spam-Status: No, score=-11.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: binutils@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Nick Alcock via Binutils From: Nick Alcock Reply-To: Nick Alcock Errors-To: binutils-bounces+ouuuleilei=gmail.com@sourceware.org Sender: "Binutils" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1761256519407626705?= X-GMAIL-MSGID: =?utf-8?q?1761256519407626705?= ctf_dedup's intern() function does not return a dynamically allocated string, so I just spent ten minutes auditing for obvious memory leaks that couldn't actually happen. Update the comment to note what it actually returns (a pointer into an atoms table: i.e. possibly not a new string, and not so easily leakable). libctf/ * ctf-dedup.c (intern): Update comment. --- libctf/ctf-dedup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libctf/ctf-dedup.c b/libctf/ctf-dedup.c index 6297c45c84d..5fdddfd0b54 100644 --- a/libctf/ctf-dedup.c +++ b/libctf/ctf-dedup.c @@ -412,7 +412,7 @@ intern (ctf_dict_t *fp, char *atom) /* Add an indication of the namespace to a type name in a way that is not valid for C identifiers. Used to maintain hashes of type names to other things while allowing for the four C namespaces (normal, struct, union, enum). - Return a new dynamically-allocated string. */ + Return a pointer into the cd_decorated_names atoms table. */ static const char * ctf_decorate_type_name (ctf_dict_t *fp, const char *name, int kind) { From patchwork Fri Mar 24 13:36:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nick Alcock X-Patchwork-Id: 74546 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp631424vqo; Fri, 24 Mar 2023 06:37:32 -0700 (PDT) X-Google-Smtp-Source: AKy350bZXWtZlFtREL+1MsCHJMBftmQ5TLyRDxCgOuY/ufFoMKkZ4U4ZKU/ka9mQhTXVdSNBSOZu X-Received: by 2002:a17:906:71d7:b0:8a6:5720:9101 with SMTP id i23-20020a17090671d700b008a657209101mr2972109ejk.4.1679665052426; Fri, 24 Mar 2023 06:37:32 -0700 (PDT) Received: from sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id a17-20020a1709063a5100b008dbcb6cde3esi21790877ejf.526.2023.03.24.06.37.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Mar 2023 06:37:32 -0700 (PDT) Received-SPF: pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=QmH48Jo6; arc=fail (signature failed); spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id AC00B38768A7 for ; Fri, 24 Mar 2023 13:37:02 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org AC00B38768A7 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1679665022; bh=52OENeRagIwegWdBl+//sso+hNvHUzyTe0l6E6j/i9g=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=QmH48Jo6xWtx9iXq2+gJyzv55xP2PvRmoMJrYVCNiZevjHzql8YIwyxRg3ktWwz9o dtBeE9MQHEhTfJeU3sE31fkr/7Ge3iiT6xord7Fhxzg8Csi44aKZE+n2naDt5kUT+p 2BAvAPfs8z6YEBc0DZ4IxzbmFjdALkhxQZnro2dA= X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by sourceware.org (Postfix) with ESMTPS id CBC2C38768A7 for ; Fri, 24 Mar 2023 13:36:50 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org CBC2C38768A7 Received: from pps.filterd (m0246631.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 32ODJmxP004612 for ; Fri, 24 Mar 2023 13:36:50 GMT Received: from iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta01.appoci.oracle.com [130.35.100.223]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3phcn181wt-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Fri, 24 Mar 2023 13:36:50 +0000 Received: from pps.filterd (iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.5/8.17.1.5) with ESMTP id 32OD77LH011988 for ; Fri, 24 Mar 2023 13:36:49 GMT Received: from nam12-bn8-obe.outbound.protection.outlook.com (mail-bn8nam12lp2177.outbound.protection.outlook.com [104.47.55.177]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3pgxyys6nd-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Fri, 24 Mar 2023 13:36:49 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Mm41OQJOx2m1IKrkyUIMLdZ6f8gucBiYxB8EYLnDsPN0xH5MgCoUnorIJXib+wyTqdL5jIvDCVXTyupA16OM4QI2xOEzgTKpXyN0+RredxG+BUuy9YaqmK4yyQYHgMoIb4k+uyyN9uOp5BCrUA8OFUqxGTbVdtwrxtyqUPQZwsL/+IrjVdkk0ItH6GCcsbCM5K1CGq9p8fehQIjGTMgSYq3IqzQVHC/F/KKJOgWJ8ykorXFKlh1y7dZQk+mJgAb9gIpLgmzeNmJIaB0UTCoCDD5Z6hEvmrfPgvxEw17GrwROyL0szYydZytepVSRcTzvj3GpcQlayKS5sAbYLfwvXA== 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:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=52OENeRagIwegWdBl+//sso+hNvHUzyTe0l6E6j/i9g=; b=noxESRC7Y2WO2+gVToWguLxftZrXrryC0GkfdgL7kPt2hmv4IjY6hcKpA8VAKW/JucHcy9Y3jwC7PctvjMCS/XgOiKV4yut/3FVipKy6g/CV//Qdu9Uos1m39M6Jy2V3cknsdSgfdKiNIBwCxPbEH2cZQLIoLcYgzzCap3tmnidHSma/JhfzdwZaZFPkhm9GlAuYekkb7KuolaJ7/5kYfYT/8P7VQVQ0mWBQf5eyi+hNp9vaDa7jIjS3f3TOyTONpr55maM2gm8cF4SvZ0X7FBqLOQTfR/EQKWAOn5igCuLaL9pSmfzqvT0GbCWIvR93OYGjZAgtmaSnpem6Ps3yxg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none Received: from DS0PR10MB6798.namprd10.prod.outlook.com (2603:10b6:8:13c::20) by CY5PR10MB5916.namprd10.prod.outlook.com (2603:10b6:930:2c::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.39; Fri, 24 Mar 2023 13:36:47 +0000 Received: from DS0PR10MB6798.namprd10.prod.outlook.com ([fe80::d0f7:e4fd:bd4:b760]) by DS0PR10MB6798.namprd10.prod.outlook.com ([fe80::d0f7:e4fd:bd4:b760%3]) with mapi id 15.20.6178.038; Fri, 24 Mar 2023 13:36:47 +0000 To: binutils@sourceware.org Subject: [PATCH 4/4] libctf: get the offsets of fields of unnamed structs/unions right Date: Fri, 24 Mar 2023 13:36:25 +0000 Message-Id: <20230324133625.450723-4-nick.alcock@oracle.com> X-Mailer: git-send-email 2.39.1.268.g9de2f9a303 In-Reply-To: <20230324133625.450723-1-nick.alcock@oracle.com> References: <20230324133625.450723-1-nick.alcock@oracle.com> X-ClientProxiedBy: LO2P265CA0498.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:13a::23) To DS0PR10MB6798.namprd10.prod.outlook.com (2603:10b6:8:13c::20) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR10MB6798:EE_|CY5PR10MB5916:EE_ X-MS-Office365-Filtering-Correlation-Id: 730e1435-44be-424c-2426-08db2c6cd093 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: mlgqx8I00RRYn4hqBCfeCe9io2SriHaarobW5Aw7t/7+D9M4FJnpslm0XWY87SboppYO3UVNTs3uz4JS2dZJcWse08Qb1akXH9Lg08jPn4ujYZXiRTGVWLOoAbY/v+xhXgtS8bQmcEI1p3gksX99o/nHUT/AN5UAWdVPsjss2dNJCxSNxaCE9jVd93T+ZxT10XP8JjXXZYu3QOLQUyMhMLdQq1c/DYWaMtTvJbIAmXmNYIbdoj4BYg9mv6KDNI5XKdu6GQRMSaYQfjP9d3Qq2aZFPd3uMtfy2faOtrJMxUOlwzaMy+A9w2JRCU/Wwl1UkMGnG6zu1IgcV+vZnBUi89lB/saEdaebeKA+ZA/K+E3eannS153elsV3IhnLbaoVgW5IejwsNa7OrDDTvNwt3iJYKhEvmcMJmcQuD9uLR6STr1t/QQYu/2GF3YaoLaw5Dg7sS/YRzGRKVKW3dTAFcTHRbupMs8kGkPuIEqK5bYsiENrbw3dgF7Ljj8E0+JmkZL0zsBEB3CdsD9OAUAwsvqYj2/pq7smyyVUOKBqWKgVrNmKF2/RKfKda4aIVCvTCYPn4WyLmUEhJR7lNAqYymDiR51w/ytx4VWADi+ZsBTM7DeyKXnMCUecmmSqqU4rVWRGSsm1S8RqbOYn8RbKJgA++5oqrHpuahmcqVcKCzw5PeK8dn6sRMSR1mFFx3+K1 X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DS0PR10MB6798.namprd10.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230025)(346002)(39860400002)(136003)(376002)(396003)(366004)(451199018)(36756003)(41300700001)(6916009)(66946007)(66556008)(8676002)(66476007)(8936002)(478600001)(316002)(6486002)(2906002)(44832011)(5660300002)(86362001)(38100700002)(6512007)(6506007)(83380400001)(186003)(1076003)(6666004)(2616005)(15583001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: JSzcSGOBnkQrdTV3Vll+n9A8moG/YGSDZylOMWCKVTT+OOwwRcy5PW9CJx/2xefmirbGClsFd8lOoVLGhmYlkqNL0MsEbDy4PViW+nKI8pagyYhE0+yqsS169UcK7HPJc81/N189O//HciAZa8INaUKXVttKHKYoUnrXzj7g4PbJfwYNon90MgaOulo7ZA5hhIFcjrHPzbKxgL3B2Vp6eC7PCHsDQEzGODeZiIdQf9n8cc71cB+390sXcOjlFBL97LaPsVx0kZTB9OYKsJmlWazDnS0zbLwMfKDRe8f1bH33eVjg9RIsB1ZX7X5MKHR7B0jIl7IzKltyg2eDKg4yyoDIvXsIWuwu5YkhnJT3E1TrakXtFlOwKsJVjCuYLrBHaIZLPDre5tdZg9BQ9CLH3bLmmjKlMUwjGfflc7abG0kLwiHdUlefTVBTBshroV3WWUk3wVXUIaQX+6Lv2wV1LvTfOB84O55pHNtb5FlS4zr0zYgrLPCVYexEr3h8/upFNSOnwHAjcXh2keluUPGfEfGNm3uQdbrfSfjWyyCmYHjzAkB+MSLBOfwhE33Sd8+xTJqSDHe2W4jeSI/ZoxCM+evUPopH++a3P4wMB+E1B4RFqAwjfkD6M3pkMb17mAEDxXxCXkYgKNYh7OhXTX9/FUdmrNiO1yC0nV0XIIbs/J84ze2WPKjp6P4GGdES7yRo3ww7lrER8iMlNBuixwWPSgmRqwH1ftBQgR1hmgeJdPQRG8vVrGE43Z1PHqCzWUXKGDqDUwfE4HIRSaQYoKlI0gJovJdpi5Y0BbcX+t44IY0AbbVFzw2xQKgrreeAUx0NzffSqgvMtz68/yquuxQk/UtU4nOI0XyC8Up8Z7u7FT9V4eIE3Yx8S5JUaUf4/Qe54YV3zDFL0zf4x3a6iat5SqRI4OeUwIqNusztz4LX1kZYCuLVkiwebBFKhRxjPI40v6Pwa/CHW0ydB9XnNkiJUGuP1NJrjlo8mpbLiK7eYNXtq415Kz/EvRIK8poHiPdhx1idBwT2HAid14zzA1PCQmrMjUClvT8+a2vqclD5SoVG1qJ2bDZC4dwvSab38Q9uWU4xyOAEE8rSSwaKSp+5yDdU+2xj+EDaQyIOcQyTacdG2CuAoB1twDM8PVd014e1z9AI/D0vJNYXv/ZOMjs6eWdReH2tFpEN5D2MCsCXhPPdKGdDwy0KLNF8VNHNZOL7qBNlE2zs25iEkAdxdLJZigZf7R503b2nNF0vranPkCsynZUG9HBt4YYwkLZFdKwDZJWwivtSXUtyNhEt/rmDPmoFj8pW6CxDgRfsGImqy6G8+nzAoZ3MwtgdHXIDFw4/kM1+o7XAbp+i+2A7z/bD0QHVy7xSOtl35SuU8r0orL61XoMrEWdgtkH7AGYrkmtwBD5nEnjYo/pEDJBqo1CRVOAAnTbGmUSEQZPjPtW0aimkPUsWoGJWyMWawU0Gl1pbjtRb5MHdPLOV7CSzlSOf0lrhA761s3Z7rzFBOIp7SR18+1459RAA3kaKO8AJwgaRd7WTGo9nkdHf4ZPMd9fmwUX9yqqadMzhY7NqhGUk+mpsWqdx+RCsLZax1/V1W3J73+L/GK9CbMF7CozMY3GLaA== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: zIE52DoXJkVWrfM5kcZzTJ4t+op+r+VvAp1DVYUJ9lrQDub0Mb+CDFfye+RuUpSCDnmSjCxL29Xg0xM63RTg4TQJbtSnwfQ7GrieBpwO+FIeszwyJ4SK0RQFfwttwVzmbOGl6FLBtl22wngpWmXbpN/FAqlyrclIqbUstAvCNKF+cV1NSrzZ9kquSklRWPzCciOii25b9tFXQpomg5PWdnpkLlCQ4vp6rzIpRrTLovZl9W436dD0mXQEn18JnnVUT5VqtY3yzIcm7+WhI/B5vdU/l+9gDpaYq4Phhm/tskAk65AcUOSET5eK/n5uKKUXFXMJkGFAjouK2lPJ8xXTPzySaRoeq4iHBqeDVNQcZJIvM8ggZ9eS+nBAapd3zYljkF1KOMPnjH0Ed6NtC1sfVEBJNGcdTfQQFwymXl03BNjE5WbC2AVowM0UeJlkCIUWXBZY8pVBMYY1ro2wjketB5yeYaCVbc3Jc1knLMZuEOI1XKGu9kLgBdqw7ErblLt6rKhLUBZ0PHC+MX/7tHk2mahiNFb0HPdyqJDTkX1JEKAHZfsiPHmdGMLC+ZdaAQePA/hgOPyMI+dOE4PYFa5PutaQRpeaAf9fAXt4ePwoMTy0aomv+ABd7qhz7iv9jitRwyZjw5C2+Z9DDpYa3LNRCc4Brb/GFYNgS/I5KDFOGp6X+A9Q3LbIBK+0o2hTrhZZ8MTdIefn31MJJntFoDRSOP2pk+rq1oDN2lVMXvBGtoyxd6XhdJTHE7W/cwn6015B X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 730e1435-44be-424c-2426-08db2c6cd093 X-MS-Exchange-CrossTenant-AuthSource: DS0PR10MB6798.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Mar 2023 13:36:47.1701 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: utH96si6NOAR/VBOIVxNgQCsUVr5aacEeuzmwTIG4Br0ePKq1kgKwe9WEMwUWjhww1shSxd2S9n5rH4bW2govw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY5PR10MB5916 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-03-24_08,2023-03-24_01,2023-02-09_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 suspectscore=0 spamscore=0 adultscore=0 mlxscore=0 bulkscore=0 malwarescore=0 mlxlogscore=797 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2303200000 definitions=main-2303240109 X-Proofpoint-ORIG-GUID: dspkqw8BXAZYgfVwn-Svt8kpXkbrLkcj X-Proofpoint-GUID: dspkqw8BXAZYgfVwn-Svt8kpXkbrLkcj X-Spam-Status: No, score=-11.9 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: binutils@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Nick Alcock via Binutils From: Nick Alcock Reply-To: Nick Alcock Errors-To: binutils-bounces+ouuuleilei=gmail.com@sourceware.org Sender: "Binutils" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1761256462104207158?= X-GMAIL-MSGID: =?utf-8?q?1761256462104207158?= We were failing to add the offsets of the containing struct/union in this case, leading to all offsets being relative to the unnamed struct/union itself. libctf/ PR libctf/30264 * ctf-types.c (ctf_member_info): Add the offset of the unnamed member of the current struct as necessary. * testsuite/libctf-lookup/unnamed-field-info*: New test. --- libctf/ctf-types.c | 5 +- .../libctf-lookup/unnamed-field-info-ctf.c | 36 +++++++++ .../libctf-lookup/unnamed-field-info.c | 79 +++++++++++++++++++ .../libctf-lookup/unnamed-field-info.lk | 2 + 4 files changed, 121 insertions(+), 1 deletion(-) create mode 100644 libctf/testsuite/libctf-lookup/unnamed-field-info-ctf.c create mode 100644 libctf/testsuite/libctf-lookup/unnamed-field-info.c create mode 100644 libctf/testsuite/libctf-lookup/unnamed-field-info.lk diff --git a/libctf/ctf-types.c b/libctf/ctf-types.c index d21f6d5ff99..dd82053e1d7 100644 --- a/libctf/ctf-types.c +++ b/libctf/ctf-types.c @@ -1417,7 +1417,10 @@ ctf_member_info (ctf_dict_t *fp, ctf_id_t type, const char *name, && (ctf_type_kind (fp, memb.ctlm_type) == CTF_K_STRUCT || ctf_type_kind (fp, memb.ctlm_type) == CTF_K_UNION) && (ctf_member_info (fp, memb.ctlm_type, name, mip) == 0)) - return 0; + { + mip->ctm_offset += (unsigned long) CTF_LMEM_OFFSET (&memb); + return 0; + } if (strcmp (membname, name) == 0) { diff --git a/libctf/testsuite/libctf-lookup/unnamed-field-info-ctf.c b/libctf/testsuite/libctf-lookup/unnamed-field-info-ctf.c new file mode 100644 index 00000000000..54d60f5b195 --- /dev/null +++ b/libctf/testsuite/libctf-lookup/unnamed-field-info-ctf.c @@ -0,0 +1,36 @@ +struct A +{ + int a; + char *b; + struct + { + struct + { + char *one; + int two; + }; + union + { + char *three; + }; + }; + struct + { + int four; + }; + union + { + struct + { + double x; + long y; + }; + struct + { + struct { char *foo; } z; + float aleph; + }; + }; +}; + +struct A used; diff --git a/libctf/testsuite/libctf-lookup/unnamed-field-info.c b/libctf/testsuite/libctf-lookup/unnamed-field-info.c new file mode 100644 index 00000000000..9abe8b026bb --- /dev/null +++ b/libctf/testsuite/libctf-lookup/unnamed-field-info.c @@ -0,0 +1,79 @@ +/* Make sure unnamed field offsets are relative to the containing struct. */ + +#include +#include +#include +#include + +#include "unnamed-field-info-ctf.c" + +static void +verify_offsetof_matching (ctf_dict_t *fp, ctf_id_t type, const char *name, size_t offset) +{ + ctf_membinfo_t mi; + + if (ctf_member_info (fp, type, name, &mi) < 0) + goto err; + + if (mi.ctm_offset != offset * 8) + fprintf (stderr, "field %s inconsistency: offsetof() says %zi bits, CTF says %zi\n", + name, offset * 8, mi.ctm_offset); + + return; + + err: + fprintf (stderr, "Cannot look up field %s: %s\n", name, + ctf_errmsg (ctf_errno (fp))); + return; +} + +int +main (int argc, char *argv[]) +{ + ctf_dict_t *fp; + ctf_archive_t *ctf; + ctf_id_t type; + int err; + + if (argc != 2) + { + fprintf (stderr, "Syntax: %s PROGRAM\n", argv[0]); + exit(1); + } + + if ((ctf = ctf_open (argv[1], NULL, &err)) == NULL) + goto open_err; + if ((fp = ctf_dict_open (ctf, NULL, &err)) == NULL) + goto open_err; + + /* Dig out some structure members by name. */ + + if ((type = ctf_lookup_by_name (fp, "struct A") ) == CTF_ERR) + goto err; + + verify_offsetof_matching (fp, type, "a", offsetof (struct A, a)); + verify_offsetof_matching (fp, type, "b", offsetof (struct A, b)); + verify_offsetof_matching (fp, type, "one", offsetof (struct A, one)); + verify_offsetof_matching (fp, type, "two", offsetof (struct A, two)); + verify_offsetof_matching (fp, type, "three", offsetof (struct A, three)); + verify_offsetof_matching (fp, type, "four", offsetof (struct A, four)); + verify_offsetof_matching (fp, type, "x", offsetof (struct A, x)); + verify_offsetof_matching (fp, type, "y", offsetof (struct A, y)); + verify_offsetof_matching (fp, type, "z", offsetof (struct A, z)); + verify_offsetof_matching (fp, type, "aleph", offsetof (struct A, aleph)); + + ctf_dict_close (fp); + ctf_arc_close (ctf); + + printf ("Offset validation complete.\n"); + + return 0; + + open_err: + fprintf (stderr, "%s: cannot open: %s\n", argv[0], ctf_errmsg (err)); + return 1; + + err: + fprintf (stderr, "Cannot look up type: %s\n", ctf_errmsg (ctf_errno (fp))); + return 1; +} diff --git a/libctf/testsuite/libctf-lookup/unnamed-field-info.lk b/libctf/testsuite/libctf-lookup/unnamed-field-info.lk new file mode 100644 index 00000000000..eae6a517d50 --- /dev/null +++ b/libctf/testsuite/libctf-lookup/unnamed-field-info.lk @@ -0,0 +1,2 @@ +# source: unnamed-field-info-ctf.c +Offset validation complete.