From patchwork Tue Dec 7 13:15:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 48586 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 BFA41385801F for ; Tue, 7 Dec 2021 13:16:12 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org BFA41385801F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1638882972; bh=atT6aADd9iJxZIos9zLQUNpHLR8F52B8Ox1zfp1Q3IY=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=GGxZam3AelgKdsyr6KUcoxIBFtOI02Dxp1cT3BAfOYRPt3+nXqDOAdfSvX4D+DsRF pzQMMoppyH/IrdI2r5LWVCbUCnVunJTm8HrmwNUhP9RFLhuKlCi3FLFnaShnpHBg/R uoR1Tdeag/P/19tdDNYyGSNt8VVPk17I//2fth4w= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-pj1-x1033.google.com (mail-pj1-x1033.google.com [IPv6:2607:f8b0:4864:20::1033]) by sourceware.org (Postfix) with ESMTPS id 0286C3858C60 for ; Tue, 7 Dec 2021 13:15:44 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 0286C3858C60 Received: by mail-pj1-x1033.google.com with SMTP id nh10-20020a17090b364a00b001a69adad5ebso2668494pjb.2 for ; Tue, 07 Dec 2021 05:15:43 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=atT6aADd9iJxZIos9zLQUNpHLR8F52B8Ox1zfp1Q3IY=; b=cAnQUqsqFsrFCtO8JRFLpXfRdSKeciPh2HNBRuVeFflWkuIsIVOVaRcnc1mwbjpkVy rTpdcIcHcWyeN31u1y3PH5izGhlCNK1YG/4C6ME+YROVkzO1XjlfTIhN2GUnTXQx0k5s Nyv6QKaP8Jf/99FtDaI8aTNKqZyQggO0eiW37ZRQw1rO7TQ0HjgC4u7xafSorYn13KAA 3OeCZIC4frccjpjdaYXSGt87TgiMff61AzHuCvzxj7TWfAlFQyPZ4/CK0YitATbjoGfV fjUuK+3U/mCOzoFgDuLN5oCvxLclveRZ8oDHAHhjmcmNBmFZVNuBg1UR4aUa1N5ts9ou V/lQ== X-Gm-Message-State: AOAM531rNK/zqeUg4g76748vY1a7mpUy5KcQaWi1A3+t1H3wG1NR2QOd /fSwWuZQuUXaA7vpaqp95iJdm89OJ0A= X-Google-Smtp-Source: ABdhPJyKs7GEORwvBo3oYN482xZw2kNjnDCeinqsE7bv46dL0l1HoM0f6TgoW6k5js/KzqFkbZqF8Q== X-Received: by 2002:a17:903:22cc:b0:142:d31:bd9 with SMTP id y12-20020a17090322cc00b001420d310bd9mr51301847plg.64.1638882941926; Tue, 07 Dec 2021 05:15:41 -0800 (PST) Received: from gnu-cfl-2.localdomain ([172.58.35.133]) by smtp.gmail.com with ESMTPSA id on6sm3651577pjb.47.2021.12.07.05.15.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Dec 2021 05:15:41 -0800 (PST) Received: from gnu-tgl-3.localdomain (gnu-tgl-3 [192.168.1.44]) by gnu-cfl-2.localdomain (Postfix) with ESMTPS id 8A16A1A0163; Tue, 7 Dec 2021 05:15:40 -0800 (PST) Received: from gnu-tgl-3.. (localhost [IPv6:::1]) by gnu-tgl-3.localdomain (Postfix) with ESMTP id A23A4C068A; Tue, 7 Dec 2021 05:15:36 -0800 (PST) To: gcc-patches@gcc.gnu.org Subject: [PATCH] x86: Check FUNCTION_DECL before calling cgraph_node::get Date: Tue, 7 Dec 2021 05:15:36 -0800 Message-Id: <20211207131536.288038-1-hjl.tools@gmail.com> X-Mailer: git-send-email 2.33.1 MIME-Version: 1.0 X-Spam-Status: No, score=-3028.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, KAM_STOCKGEN, RCVD_IN_BARRACUDACENTRAL, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, 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: "H.J. Lu via Gcc-patches" From: "H.J. Lu" Reply-To: "H.J. Lu" Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" gcc/ PR target/103594 * config/i386/i386.c (ix86_call_use_plt_p): Check FUNCTION_DECL before calling cgraph_node::get. gcc/testsuite/ PR target/103594 * gcc.dg/pr103594.c: New test. --- gcc/config/i386/i386.c | 3 ++- gcc/testsuite/gcc.dg/pr103594.c | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gcc.dg/pr103594.c diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c index 52547b0f057..f1e41fd55f9 100644 --- a/gcc/config/i386/i386.c +++ b/gcc/config/i386/i386.c @@ -15987,7 +15987,8 @@ ix86_call_use_plt_p (rtx call_op) { if (SYMBOL_REF_LOCAL_P (call_op)) { - if (SYMBOL_REF_DECL (call_op)) + if (SYMBOL_REF_DECL (call_op) + && TREE_CODE (SYMBOL_REF_DECL (call_op)) == FUNCTION_DECL) { /* NB: All ifunc functions must be called via PLT. */ cgraph_node *node diff --git a/gcc/testsuite/gcc.dg/pr103594.c b/gcc/testsuite/gcc.dg/pr103594.c new file mode 100644 index 00000000000..0eae239eea0 --- /dev/null +++ b/gcc/testsuite/gcc.dg/pr103594.c @@ -0,0 +1,14 @@ +/* { dg-do compile { target fpic } } */ +/* { dg-options "-O1 -fpic" } */ + +int regex_subst(void) +{ + const void *subst = ""; + return (*(int (*)(int))subst) (0); +} + +int foobar (void) +{ + int x; + return (*(int (*)(void))&x) (); +}