From patchwork Tue Feb 21 14:46:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Qing Zhao X-Patchwork-Id: 60117 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp47446wrd; Tue, 21 Feb 2023 06:46:59 -0800 (PST) X-Google-Smtp-Source: AK7set9SXM856d1maSppp8tY6U53iqmrg2xuUQD+G09FC0E9s7rN/z7cEjga6EzXdgq6bQKrcmLw X-Received: by 2002:a17:907:6b8b:b0:8af:45d5:426f with SMTP id rg11-20020a1709076b8b00b008af45d5426fmr8202229ejc.33.1676990819629; Tue, 21 Feb 2023 06:46:59 -0800 (PST) Received: from sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id p7-20020a170907910700b008b17ed945c4si13428163ejq.499.2023.02.21.06.46.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Feb 2023 06:46:59 -0800 (PST) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.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=@gcc.gnu.org header.s=default header.b=LPAYu+t8; arc=fail (signature failed); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 52735385841C for ; Tue, 21 Feb 2023 14:46:58 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 52735385841C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1676990818; bh=U3Z6/HdU2pa4zyGYDzkEYCBvOIkWHq/2L4AHT6SDZts=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=LPAYu+t8Owl10QT+dpCHOS+y4GU/xGJbxChSyFvkEbcdLvqMgWYLFxgY9csoeUGLV SjYe8YIGKiw1FLN58hLYPoR9RU4l9WHZLWgNzI7gMgwmf8pV1mw+XNeaGsFlPaqJY4 M52WwojqjvOrW4H34+0d798I0rEjEexQbK26EDbg= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by sourceware.org (Postfix) with ESMTPS id 31EBC3858D32 for ; Tue, 21 Feb 2023 14:46:13 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 31EBC3858D32 Received: from pps.filterd (m0333521.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 31LE1sF1011882; Tue, 21 Feb 2023 14:46:12 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 3ntnkbnabx-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 21 Feb 2023 14:46:11 +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 31LEUCp2006714; Tue, 21 Feb 2023 14:46:10 GMT Received: from nam04-mw2-obe.outbound.protection.outlook.com (mail-mw2nam04lp2175.outbound.protection.outlook.com [104.47.73.175]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3ntn4bqw2w-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 21 Feb 2023 14:46:10 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XwRYvc8tlhu2+gyUCw+PIJYBefHnqw8RjY9jA9H80RrkXHvgpLurSrgUUrjCY5rCpO/Ugzycd8jG9b9odgYs2qeK6FfGILQqtvnkFPmuZJHZjOxG+H6MzQcatLDflCiHWcRjBstg7TXg8Dcnrlptgnn4UDIrexwEd+smPPKaHsTD3EYwLqEtTOKJ4+lNxZF++GOHNZafKU1f39I2t95rOhrOcWsApAkwbTjIk7CWiEPkXS21xkVWrqP3OpMUPhE2Hj3g6nSdTce6awtCbSJvwqbxOcH0JS3EhmyZMjnpEm2sVnkaneLRCpVZ5mFsL6eEI+2dVJLBK0Pii0LJT13IsA== 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=U3Z6/HdU2pa4zyGYDzkEYCBvOIkWHq/2L4AHT6SDZts=; b=PKmyHRxe5XAE22mSqXRSAiq3X9eEX3ZMSrxIwiKTJoAOwIpjej5wnvabF0K867uxp7G+9E0PnACT4k1kggaKHhkyyPoIF1yXuBPTKa2dqj6i1J0KwJ1H4spI85FtlwVIyhaaJ4bEZ4rELR4P3Hf1TE68kGEbGlk8gx5sRa4Sp0kUSLa87CYSdIvHia1bRfg+feVzC7Cybx57r3mJjSCJ8N/rWJEoGQ0vGmJfrJnGoSWDOF4Fi41nfWA83qoT6SqmThvOLkWTd6PcaKxo57ng/SLQ+HFo/iDg17YtfR4mYTHpkVsrHrLFjuomYwpvHjDgFH6TV2J96bcBh+v86z3qrg== 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 CH2PR10MB4344.namprd10.prod.outlook.com (2603:10b6:610:af::19) by MN2PR10MB4221.namprd10.prod.outlook.com (2603:10b6:208:1d7::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6134.17; Tue, 21 Feb 2023 14:46:07 +0000 Received: from CH2PR10MB4344.namprd10.prod.outlook.com ([fe80::7030:ed2e:20d0:cd5b]) by CH2PR10MB4344.namprd10.prod.outlook.com ([fe80::7030:ed2e:20d0:cd5b%5]) with mapi id 15.20.6134.017; Tue, 21 Feb 2023 14:46:07 +0000 To: jakub@redhat.com, rguenther@suse.de Cc: gcc-patches@gcc.gnu.org, Qing Zhao Subject: [V2][PATCH] Fixing PR107411 Date: Tue, 21 Feb 2023 14:46:04 +0000 Message-Id: <20230221144604.2128750-1-qing.zhao@oracle.com> X-Mailer: git-send-email 2.31.1 X-ClientProxiedBy: MN2PR13CA0013.namprd13.prod.outlook.com (2603:10b6:208:160::26) To CH2PR10MB4344.namprd10.prod.outlook.com (2603:10b6:610:af::19) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH2PR10MB4344:EE_|MN2PR10MB4221:EE_ X-MS-Office365-Filtering-Correlation-Id: 66da4eb8-8b11-49d7-0049-08db141a5d91 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Ib2KZ0QSj5HBGxuLE1qMwgyTQhhLAkW3Y2AXni32UzXmHk4uHj7zHzmgFfN1V6rhX938tt8OVFSVqGXAujfa8po3xFQjdrtyImTDPXgHTSGswf6hbIyx3hSyQE+MQCjbTVC+RQAa7GOJ32ifCZtQ8aMY+EweP+/mX3mdje+wXv06JlOnTwVE6rwLMQRl8KZ5P2OaG2xMibgNSCynUwGa8mOMRM+PuJis+5vIqC4WCn3osaywqF7deVPYdGpEEZWqz1aO9DiGgDP/gFx+ZVisuJOcJLitv2sCchsRprwW+P+kgwLCKwY5CXTXdT+300oiMSUTVluvG2MmBY6nounCdahJNH2BvqI7lI3fKBxLiXEpsxmUJOdP5jXyGKrgc2GAD0O/P/qwq626YllYdcovdR+Yg7wqK+Tt0fMzMe70SyOWLhbrN0fe1HeDZXo7BUA6clwnYzDgekV9EDvPqi6jUHbO6p/PT0tdnv8h04Gf2lxfXX5lF/J8G4AKlpKwbnepvcI8QX7ktgWF0OZTIjGR1FDVGIC4eK+J9hfbwGAJxdMEwOuBw9Ol6B4+sRziB374zm2qQsEHHTue/p80cH7HI/0D2YzL+uc7vj0+sV+4+buX2M+4jqHM/hMlWmjHv9AEhz2+gzV9++41FUv0pypYYQ== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:CH2PR10MB4344.namprd10.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230025)(39860400002)(396003)(346002)(376002)(366004)(136003)(451199018)(8936002)(2906002)(44832011)(41300700001)(5660300002)(36756003)(38100700002)(83380400001)(8676002)(4326008)(86362001)(66556008)(66946007)(66476007)(478600001)(316002)(2616005)(6666004)(6506007)(6486002)(6512007)(107886003)(1076003)(26005)(186003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?gyHmZF3xjHTtwxi6zeffNgBQ/0cT?= =?utf-8?q?CDJGsJls4pisnubGhzIoENJQ5X3VFtksA3WfONS+Kkg7BhR6tR8rW3l400oaflsPC?= =?utf-8?q?W7HBo21JHGIswnSTD/NDXZ5PwgYyrKJbL1l2g8lHfHH0qPpKCrHxstP/JAfI0ZR+T?= =?utf-8?q?b051QQFxXgOycauC5GgZki15EGGGSu18iw1W0B5jzFm8qA/oW2w3aQrSID3VjW2jD?= =?utf-8?q?YGigYfTucBsuDXGrZ3pebqHj8c+ptnFyB01Jts+nBxeOFZR7aHFBALrcYrnuHkzWL?= =?utf-8?q?c9wLVBS0eyVPrBziHSYO8AHrLmte2sok0+QWArbGTTuMTDJw+aWJo8UkC4QBPl5VU?= =?utf-8?q?266k4UKB6yxd4JpVoRG/Fjb832vhZDmu4P2rjxxIS88SV0ipo0Dib5L4qJs0NJE7D?= =?utf-8?q?LLnPSbUFYDawy6/s8xiIosUk33N92uAJ+GLsGhA/rm2kUSN4g9TCZxKGQFIEx8yzO?= =?utf-8?q?XO9UF2eFUgQCWwIWsu7JpO/y9lpr7f2EnRsvaP7xyYFefCojbvMZym4xfAVJ2US/u?= =?utf-8?q?CDzQXnDYz3RWOYmUTYp4Yc9gv518AjJZ/e8Rz43dAoC1M+gDt8i8qWaZE5p7XuEGW?= =?utf-8?q?DTCrGR/Fypq6bT9gPtIAOiwBDJGMx+9kuUuLtJG9ffRKNS6r0y0NAjkSIbHVteyAb?= =?utf-8?q?C9ubo5H1Q0MUdUo+XVqyheyFmQW1mgg212f7pIG8f4uMDoDb/9zuGvJlmUESqo9sV?= =?utf-8?q?0/DUvXm0S8K4cWVoAo8VFSr0rVGkBuTFVsGX+y2reoN9U3IxcBN4XwqyRMlgTgiNI?= =?utf-8?q?KeUtt1kGzVPWvouuQbCL9zv77w3wcWYR6QY4fCTXDCApdDhlxcOX4vW/KbviaFY/m?= =?utf-8?q?OexP6WKHDHvcJMNLqwOcWxrJa7oCtYeJ/JxsBUhxcEXnx2pKiIhC6iOUbAU6g9blR?= =?utf-8?q?+c2IqwMtLhgwAABvu3YAH8P1rrLoZHan0gf9XYYUHE2C4S8DwromvTVEIMjLhzldF?= =?utf-8?q?R8atixSCaEteE4ZwjX0GkaLjFhj8uM2318lAEp47EVpWTkWQhAomBeYhHE/Dw6eSP?= =?utf-8?q?QC/CuyNHAnFBSZziI+pUByqOKsIJKX7p59KdLB+vNs6ZGvqgFh1CmuCpr1ESgce4b?= =?utf-8?q?6Fpc+Z9HoM4EGiDwdbtnBpkaol9GNdv9dWI348PhMmk0hoMygFUuiDMQczPoxgJzJ?= =?utf-8?q?S1fe9JhX8Zga3CM3zqCafVCQxJRZEAzMY0L8am9y6SVg9b/zk0ygcRirPxwFIRN0+?= =?utf-8?q?MWk1DJYNC/OmdRFRJhmrpPeVTceoF1D2YTvrb769BLuOmd4ESip/n1kPBjbHPeQOD?= =?utf-8?q?iyeYM5KJOfPhStNueyJWm7oN32WrSnIz5HpYOGOukFIYuew0uzaYnPM74z4voqRYh?= =?utf-8?q?iBpK/W/WZlF24p0q+FrSmAwF3hT+KzsMBxC+7sBU1A6QviE4S0vM4fBwiPNEphiYG?= =?utf-8?q?eGuf3mw4PM4wJqdYWuOcaXXL5GNakJLeoI9sQ1bMZ0Loqu7TrLg1xC2whSDfTzlGE?= =?utf-8?q?Hl0O6Z8L7T5xn4E5CnYDAo9mlwQLTJWxi+WbOKooD9bLlI/qpgz+5oUpf9BUwdfHC?= =?utf-8?q?aix/UZLWigau?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: TePephrpps/o38fqd3y1Nmn+OEKnTQ8AnIj7qMgm6mL31LwUzKLdkr7kRvQPZWVPw0LW+CxmVxZOUPiVNMnSg+/7QnjvO4i9wjAsHaYnflr6YKY7nQ5egz/CUx1L7+n5bpSV7gNn8c7dhNrq1O8wAGZ6dSNXK1rE4AyyERUns9cIEJEFUR/KtTmgPrT9AUCRI0ja4Ten8YyZ55boEJTscj3hAFLC1r7DfeCe8Ng8nv9jwv2U1Qqxg6SvSMxpwVXKHufwT+umxonCxiEeFKFUJRBQkRbVFUg7i9abPkNh7zQ0E2A8PP6YS5oNuHWTSQgYnj6deUmq5MHSYeD8Py2xdMl46r8EfOdIXkmClkPjcSsdvs8NLOhIgdphEebvK+x1AnsO4Z8lXQL/lMWfjww+LcygGOLwkw3cJSysiE+VsAdiDn/6nVjp3wxQ00koH9IreoApkaq2X9xSeln/A+0u0kDS/i/oDHzhxxihCNPyoTJXnyt9NqVYD5Ch1Fei6jSTMG6s+N+eU9/DZyZi1/M8ZAwpIG8DEAUbu8gmVvUG4Nc480zmEUj5e9Cq5mRqApSBg6mF+Ct2xLXjFEC+qkqxiLzq4oOP1A1lCMiiXbyghKS2GPOS3dtdxtF9taowq7z1+z1CkR5uJh2uWQeX0sN2koT3+pcfDW4ZdwZc9U/b8Yb3PN82bM9twN9yf3z5S2yv1T75Q5e+wk4pWapU72jvskxCiPeuBGwjPEKnqri8ZtfDCwaZwqRm+zYwPE2sUiKD4N8cuLdZtVhljBg6qXeHT3uObhBfkCw+f2NfVRVuDgA= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 66da4eb8-8b11-49d7-0049-08db141a5d91 X-MS-Exchange-CrossTenant-AuthSource: CH2PR10MB4344.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Feb 2023 14:46:07.5952 (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: QKy+YJmpkJYsKhTKbvrX9aVm5VEnWvDp+9dVy2pzANoQbeepYcpS86m+rqpMnrJs9k0Fm1c28Ik30S/AOaPUtA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR10MB4221 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.930,Hydra:6.0.562,FMLib:17.11.170.22 definitions=2023-02-21_08,2023-02-20_02,2023-02-09_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 phishscore=0 suspectscore=0 mlxlogscore=999 adultscore=0 mlxscore=0 bulkscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000 definitions=main-2302210123 X-Proofpoint-GUID: Tz15UoTgvMLitgCCBaqtmpy8Mm-D1na5 X-Proofpoint-ORIG-GUID: Tz15UoTgvMLitgCCBaqtmpy8Mm-D1na5 X-Spam-Status: No, score=-11.2 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_NUMSUBJECT, 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: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Qing Zhao via Gcc-patches From: Qing Zhao Reply-To: Qing Zhao Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1758452325442385716?= X-GMAIL-MSGID: =?utf-8?q?1758452325442385716?= This is the 2nd version of the patch. compared to the first version, the major change is: use sprintf to replace xasprintf per Jacub's suggestion. bootstrapped and regression tested on both x86 and aarch64. Okay for committing? thanks. Qing ======================= This is a bug in tree-ssa-uninit.cc. When doing the following: /* Ignore the call to .DEFERRED_INIT that define the original var itself as the following case: temp = .DEFERRED_INIT (4, 2, “alt_reloc"); alt_reloc = temp; In order to avoid generating warning for the fake usage at alt_reloc = temp. */ We need to compare the var name inside the .DEFERRED_INIT call (the 3rd argument) and the name for the LHS variable. if they are the same, we will NOT report the warning. There is one issue when we get the name for the LHS variable. when the variable doesn't have a DECL_NAME (it's not a user declared variable, which is the case for this bug): _1 = .DEFERRED_INIT (4, 2, &"D.2389"[0]); D.2389 = _1; The current checking just ignores this case, and still report the warning. The fix is very simple, when getting the name for the LHS variable, we should consider this case and come up with the name the same way as we construct the 3rd argument for the call to .DEFERRED_INIT (please refer to the routine "gimple_add_init_for_auto_var") PR middle-end/107411 gcc/ChangeLog: PR middle-end/107411 * gimplify.cc (gimple_add_init_for_auto_var): Use sprintf to replace xasprintf. * tree-ssa-uninit.cc (warn_uninit): Handle the case when the LHS varaible of a .DEFERRED_INIT call doesn't have a DECL_NAME. gcc/testsuite/ChangeLog: PR middle-end/107411 * g++.dg/pr107411.C: New test. --- gcc/gimplify.cc | 4 ++-- gcc/testsuite/g++.dg/pr107411.C | 10 ++++++++++ gcc/tree-ssa-uninit.cc | 23 ++++++++++++++++------- 3 files changed, 28 insertions(+), 9 deletions(-) create mode 100644 gcc/testsuite/g++.dg/pr107411.C diff --git a/gcc/gimplify.cc b/gcc/gimplify.cc index 96845154a92..35d1ea22623 100644 --- a/gcc/gimplify.cc +++ b/gcc/gimplify.cc @@ -1775,9 +1775,9 @@ gimple_add_init_for_auto_var (tree decl, else { - char *decl_name_anonymous = xasprintf ("D.%u", DECL_UID (decl)); + char decl_name_anonymous[3 + (HOST_BITS_PER_INT + 2) / 3]; + sprintf (decl_name_anonymous, "D.%u", DECL_UID (decl)); decl_name = build_string_literal (decl_name_anonymous); - free (decl_name_anonymous); } tree call = build_call_expr_internal_loc (loc, IFN_DEFERRED_INIT, diff --git a/gcc/testsuite/g++.dg/pr107411.C b/gcc/testsuite/g++.dg/pr107411.C new file mode 100644 index 00000000000..7eefecae4f3 --- /dev/null +++ b/gcc/testsuite/g++.dg/pr107411.C @@ -0,0 +1,10 @@ +/* { dg-do compile } */ +/* { dg-options "-Werror=uninitialized -ftrivial-auto-var-init=zero" } */ +int t(); +void f(int); + +void j() +{ + const int& e = t(); + f(e); +} diff --git a/gcc/tree-ssa-uninit.cc b/gcc/tree-ssa-uninit.cc index c555cf5cd50..9f720ae1f4f 100644 --- a/gcc/tree-ssa-uninit.cc +++ b/gcc/tree-ssa-uninit.cc @@ -224,8 +224,6 @@ warn_uninit (opt_code opt, tree t, tree var, gimple *context, at alt_reloc = temp. */ tree lhs_var = NULL_TREE; - tree lhs_var_name = NULL_TREE; - const char *lhs_var_name_str = NULL; /* Get the variable name from the 3rd argument of call. */ tree var_name = gimple_call_arg (var_def_stmt, 2); @@ -239,11 +237,22 @@ warn_uninit (opt_code opt, tree t, tree var, gimple *context, else if (TREE_CODE (gimple_assign_lhs (context)) == SSA_NAME) lhs_var = SSA_NAME_VAR (gimple_assign_lhs (context)); } - if (lhs_var - && (lhs_var_name = DECL_NAME (lhs_var)) - && (lhs_var_name_str = IDENTIFIER_POINTER (lhs_var_name)) - && (strcmp (lhs_var_name_str, var_name_str) == 0)) - return; + if (lhs_var) + { + /* Get the name string for the LHS_VAR. + Refer to routine gimple_add_init_for_auto_var. */ + if (DECL_NAME (lhs_var) + && (strcmp (IDENTIFIER_POINTER (DECL_NAME (lhs_var)), + var_name_str) == 0)) + return; + else if (!DECL_NAME (lhs_var)) + { + char lhs_var_name_str_buf[3 + (HOST_BITS_PER_INT + 2) / 3]; + sprintf (lhs_var_name_str_buf, "D.%u", DECL_UID (lhs_var)); + if (strcmp (lhs_var_name_str_buf, var_name_str) == 0) + return; + } + } gcc_assert (var_name_str && var_def_stmt); } }