From patchwork Thu Sep 23 01:08:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Feng Xue OS X-Patchwork-Id: 45322 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id DBADB3857C44 for ; Thu, 23 Sep 2021 01:08:54 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org DBADB3857C44 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1632359334; bh=rPDadORKRhfaTT3MVyCn4HTgGjYkHWIZhXEA94uXrew=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=syiG9acw/fjCVl9erBGGfzodl5T+Jwo8cunEz0JKMYmdKhc4SshRlP0GMUf/ovguG FghyZ5Vlr6gI6KL8GJGmjNQrYtnN1lfENaGTUotubMgFnkmHlJlSO0eydY5BTgNjHX yZf1Crva+MCmji/p/o5zYiB/4mNOho2wDQqx6vVY= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2091.outbound.protection.outlook.com [40.107.244.91]) by sourceware.org (Postfix) with ESMTPS id 658BB3858C3B for ; Thu, 23 Sep 2021 01:08:23 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 658BB3858C3B ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ODs/wGmI2jq6ToKnbBeITg3SHOgVF6qcK+TFDikYNa7JOm8mfSA/dAX6v/jihKLurufqYIKOo6dUxbs+xticgSyR/MkMF6xwnYngHRFxnIhmj2fC/eC4hthPXxcxgeztCFT6npWFvDITiQnuhY1wU6YRjTbjDdhMIO3ngXbejdKJ7FAW4so2A7TMx7zVlr1TjWIt71vROAIl8CVUU8gqqbEcQ70WE+gUEkJe2zkFp2NLFr99mQWIb0VjPfZ/XZB47lNiq2P5pJKKFF9eq47geppI1pRE/N/5uddanRo/HF3j6t2eNUJvgrs/aCPqMhrnqsa5zLPwr9IS0ewteRh8uw== 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=rPDadORKRhfaTT3MVyCn4HTgGjYkHWIZhXEA94uXrew=; b=S7xeqVM2UOHSEgBXBVUkejTyVveQv/FvFCpr/nqVifmb4Wp48+kGYp2MEwRCvHO78MLDVHxztf72BzLBa4IYpBj0Drxr7DFqMonhzMT/w+MJSEctinRsdDP7GA91Cv0Qi/G2ZQ3eidZVx1Kj/TqmFJQQtGEdysh0m7+w74P725SEZ2HDnVD68GR7OAt4/gq9cpVN1hbtXWB2Dy9aadQDdAQke7Mzz00thRC3c6Q9PNjF/xAg0YGREtcpwH6wYEI4pFTSNtnWcXZZT/vRMGEQeKO5UDePVo6CZe+1GikreOfd5ucS2gYXVA6KITZp2OqHX6IN9dpl2/jE/fzEYd6sWw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=os.amperecomputing.com; dmarc=pass action=none header.from=os.amperecomputing.com; dkim=pass header.d=os.amperecomputing.com; arc=none Received: from SN6PR01MB4958.prod.exchangelabs.com (2603:10b6:805:c1::15) by SA0PR01MB6395.prod.exchangelabs.com (2603:10b6:806:db::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.13; Thu, 23 Sep 2021 01:08:19 +0000 Received: from SN6PR01MB4958.prod.exchangelabs.com ([fe80::3ce8:b43d:e19b:e1af]) by SN6PR01MB4958.prod.exchangelabs.com ([fe80::3ce8:b43d:e19b:e1af%3]) with mapi id 15.20.4544.015; Thu, 23 Sep 2021 01:08:19 +0000 To: "gcc-patches@gcc.gnu.org" Subject: [PATCH] Fix null-pointer dereference in delete_dead_or_redundant_call [PR102451] Thread-Topic: [PATCH] Fix null-pointer dereference in delete_dead_or_redundant_call [PR102451] Thread-Index: AQHXsBau1CviPLA80ka1yJoYIUSitQ== Date: Thu, 23 Sep 2021 01:08:18 +0000 Message-ID: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: suggested_attachment_session_id: c6c7ca3a-a935-3560-4aa1-375289a8cc35 x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: a377f375-f1a7-4d86-eaa6-08d97e2ea15e x-ms-traffictypediagnostic: SA0PR01MB6395: x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:3173; x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: bHTIl6RnCrHHrJMxFPrw8xs3rdsahSpMcM1vwwGXUEzJ/anoL6OOa3H1k7wCKHHu/QG++GhHbpfGRBPnFKLKkmMmV/q1UZMS0GFUVyionGV88emosBKGbVm9g6WlCtutzT/ffZKBLa2N6FOnQHvWpK7dAJooXSaqSULQ0Bd/IuCusFFn8Df/L0ycLM6LFH97KPpMK66jMHYJUIcwkg55Adb8PxhfuJsewa9kfamhRu6ujZIdvVqOoG2q1v+f/GOaGfAnmGfiETKhZMiRlOXILkl9CMI6EpBG54Ck74crbkmTzbTnb/YB6EIXvWu0tg9AFDFv5UhGf9y0eba6V+KdwG/xFFCHgnE2IOMqzqJIoEMQ8ZgxXSWkOBM5aOo4wemYhkkVqMFovCS7yfDO9kOirDlzbjgYVV2i8RFrqCVfe/le95ZHukoUm3P10WIhPbMyziAOWirbvKpnTYB+TwYXWnZOr+0GZfXGcOVSu3MsnvUCvPVCElFw8Im8NanrXerRxQE99yzb76OT5S9lc8g4xpOXJ4pn0V3w1SsLzadeSeZlGRcsVUf5AmoOiyeJA553I2tGc+8kLz8z3H8Zqdhjo6PRlMntdj1ekPGN1Mtm1tRTnJ5+R7wCGjJsIsX2mk1cyNLUCyNGoRmYrHe8Cwpm0XTzC0QGf+4J1aAuKlJYEqJ+FJedpdx5hZBWQLqWbnc8yCFzAvVyILosrFHHT6A6QA== x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SN6PR01MB4958.prod.exchangelabs.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(8936002)(71200400001)(186003)(86362001)(33656002)(6916009)(508600001)(83380400001)(66476007)(9686003)(64756008)(2906002)(55016002)(38100700002)(6506007)(66946007)(7696005)(76116006)(26005)(66446008)(91956017)(66556008)(316002)(38070700005)(122000001)(8676002)(5660300002)(52536014); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?q?WNOe+aOhQza/GZZg3AXhRqB?= =?iso-8859-1?q?QRbKYbnSQzxLS2xz2fdtFkSGhfWtOrspsML+ga1vbbF12c6CaLQGsDu+0JSh?= =?iso-8859-1?q?yEkOgTtpftDbg7r0kBz7SB8mofzxKqelGjfEAj6oUZyc53Gv3eypB2pL9Ri1?= =?iso-8859-1?q?c2sQMR3sQp6R0KmujmTl9FVD/J3u9/usvzxvlAZjsDAGVIcM/4rWyih7xwK9?= =?iso-8859-1?q?c/ARmvQFoV8VFQiOhNmuyl65+D/oyLIyvos9c2wkKovUwtk1BiMMXCpQ6KaS?= =?iso-8859-1?q?7dLZjgs3K9y69astXN/E/+2gg6L0+4wWxfRkFZtoutgU/n8NKbI0h46uyRrl?= =?iso-8859-1?q?IPmzhNOZPQcs0M/f7P+NlO6NcieuU4yNO69USEo3Q83wMKpObA/AnbXPma65?= =?iso-8859-1?q?25KQiWJEhg8xoJtxJcBfhuVp9YgNeXcldyh2/hCFotWZTLR1M8wx4jFRizy8?= =?iso-8859-1?q?DcXNXrP+DQnjVbh3Dgl4PjrnnNMhjTJ0pBVyv7ECNdd4cNIqLrPudwT9i9fl?= =?iso-8859-1?q?osFbjAoUr/l7iZtRnw+BINmDXj+NrekaB/JhRXW71k90U7p2O6HI0Zsi3c7h?= =?iso-8859-1?q?Py9eLjydvrHOja1udmk4jCuVH3wl4lFlf5Fx5y5LN8A/uvw9DCmE4oar8Aez?= =?iso-8859-1?q?8ancXhYX/7O8p0JigL3oW8ecbBaKjBSXwgkG9Ptc6T9ILK6AHYCFx+g0MM6s?= =?iso-8859-1?q?lR+oy3yooAyzEaipvWM2rXzf6DGHYZ60DdonfoleLwY0kYqWL82Nt1VBiFTE?= =?iso-8859-1?q?a/leVOFX44wesfyoSOO+0V/VajYc0mCD4c51yyz2/6xoMHb5aLLAGE17Ci0w?= =?iso-8859-1?q?LnEZPRpP1eLBDF9KDgUtdS51L3AFfOpCklfzdjJiD/FvKOYzAq3wJvtIN0g3?= =?iso-8859-1?q?pLz15H6tSnkFPeH6ABYeBtF/rIfI7CYHHH/tl/JZYrrs3o35P5joZrpWyw8o?= =?iso-8859-1?q?MOerKuXiZyZx6uhj9GlL4BjVO/a5XT4gcGQHq0YJASvv45Y0185bG/qA+0NB?= =?iso-8859-1?q?DwgXJfU1NcJUvHm84wVwT4q8Bb8Uxc8e17cP/XUrby9kO7qo9XFYCXj+u6mE?= =?iso-8859-1?q?uxtopCay0w4O14D17bblDtuL2i839P3KzkdAU96rg9dU7kVmneoKazWxjQzS?= =?iso-8859-1?q?77aVmNcR4zwsBCDzUO8gR93LG2Vp7nN2SyFME6EuzSze5HdrcRTEk42FfpN2?= =?iso-8859-1?q?XF1dSkzVmMGMwFOuLNm8zgdEkZ4cY3n2KDr/Fo12orKhXCgGE8wSYdoNM0Cz?= =?iso-8859-1?q?L7uZ4fdsMjQqGulG2RAb3juJ8Yxne060M5zKgdwogVhySYBS/KHvGz761o7o?= =?iso-8859-1?q?7N2YgBwumSZweH9bfFxR9LZE5JPQNThPX8ANHCw8=3D?= x-ms-exchange-transport-forked: True MIME-Version: 1.0 X-OriginatorOrg: os.amperecomputing.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: SN6PR01MB4958.prod.exchangelabs.com X-MS-Exchange-CrossTenant-Network-Message-Id: a377f375-f1a7-4d86-eaa6-08d97e2ea15e X-MS-Exchange-CrossTenant-originalarrivaltime: 23 Sep 2021 01:08:18.8774 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 3bc2b170-fd94-476d-b0ce-4229bdc904a7 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: cN274hBSeuc6HqhmahAz0XdJ/17/Wo/EnSrm7SyJvg0wKmC83D0/mc95+RDiLAMRuGiPfoxdht0WY5n8AOObE9GVyfdku+x/GdAKBsAd3lQ= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA0PR01MB6395 X-Spam-Status: No, score=-10.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, GIT_PATCH_0, 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: 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: Feng Xue OS via Gcc-patches From: Feng Xue OS Reply-To: Feng Xue OS Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" Bootstrapped/regtested on x86_64-linux and aarch64-linux. Thanks, Feng --- 2021-09-23 Feng Xue gcc/ChangeLog: PR tree-optimization/102451 * tree-ssa-dse.c (delete_dead_or_redundant_call): Record bb of stmt before removal. --- gcc/tree-ssa-dse.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gcc/tree-ssa-dse.c b/gcc/tree-ssa-dse.c index 98daa8ab24c..27287fe88ee 100644 --- a/gcc/tree-ssa-dse.c +++ b/gcc/tree-ssa-dse.c @@ -978,6 +978,7 @@ delete_dead_or_redundant_call (gimple_stmt_iterator *gsi, const char *type) fprintf (dump_file, "\n"); } + basic_block bb = gimple_bb (stmt); tree lhs = gimple_call_lhs (stmt); if (lhs) { @@ -985,7 +986,7 @@ delete_dead_or_redundant_call (gimple_stmt_iterator *gsi, const char *type) gimple *new_stmt = gimple_build_assign (lhs, ptr); unlink_stmt_vdef (stmt); if (gsi_replace (gsi, new_stmt, true)) - bitmap_set_bit (need_eh_cleanup, gimple_bb (stmt)->index); + bitmap_set_bit (need_eh_cleanup, bb->index); } else { @@ -994,7 +995,7 @@ delete_dead_or_redundant_call (gimple_stmt_iterator *gsi, const char *type) /* Remove the dead store. */ if (gsi_remove (gsi, true)) - bitmap_set_bit (need_eh_cleanup, gimple_bb (stmt)->index); + bitmap_set_bit (need_eh_cleanup, bb->index); release_defs (stmt); } }