From patchwork Thu Mar 18 22:44:15 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: 1455493 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; helo=sourceware.org; envelope-from=gcc-patches-bounces@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=FW8k/d7x; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4F1hsp1BhXz9sVS for ; Fri, 19 Mar 2021 09:44:29 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 75B74384388B; Thu, 18 Mar 2021 22:44:25 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 75B74384388B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1616107465; bh=pL/FiORnsyoTXQ5bf5FFhqwgm8WeqevAnctGSDXhc9w=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=FW8k/d7xsj2+MSIqvc/BF4ME4Zn91Tl2m7K/GGNn2+EfniXXFM5hPGb4XgTYsUd7c ddZ/kx1xEy+i8eVPmuJJGoKEJaeayPgADi2sfe4rHLW/XcBpWbRcBEyS+86ZYPQPt4 cJOC9+6tM/wuIShT8DMKDp323VlxyZZOJJM4NdBw= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-pg1-x52e.google.com (mail-pg1-x52e.google.com [IPv6:2607:f8b0:4864:20::52e]) by sourceware.org (Postfix) with ESMTPS id 8E5B838618E2 for ; Thu, 18 Mar 2021 22:44:22 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 8E5B838618E2 Received: by mail-pg1-x52e.google.com with SMTP id k24so2386219pgl.6 for ; Thu, 18 Mar 2021 15:44:22 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=pL/FiORnsyoTXQ5bf5FFhqwgm8WeqevAnctGSDXhc9w=; b=lvGULbdhBinotGuswUvKPmrUq/rTmyWDJ6Bkx3mt2rwrBHe+ZL4hWdwZ0fC891x1vz zuwnrfYlIUUdpnPgmek4yze48m6cwQBw2b3BIsW3dfL5va5vuYYkLGZlwC2Ue5jARk+l T9YZ3rAWdrJzccFk3GHvOB0gsG8Dq98gIymiP0Qx3AzAJKfYBeH/6dMNYUnX0UgN28hU hctlNYEbx9h07j8cixqD5FLmhyS9qdtOUu1Sv6RBEtXry2H95GNFIJFjqJ6T4ntgtS07 JvZiteRw9vb+6a5t5RjPjP9pUoAWLzkKVAPyRIZy8GGbaFA+05RtQ7yTNIZKpG7wZvA0 02wQ== X-Gm-Message-State: AOAM532T+YfV3hMgIeXAx6b8LnpmYbL5HMvcLGDsegfDeyJgi3IW5AI1 X4bEeSeV/ZWIqtBQif343yQxHxUaPTM= X-Google-Smtp-Source: ABdhPJxy9rA2hgmlyiVCyipOfTnRQeM+6cWO9gHWt/WFKDf6707PutZWKbdJOdqdd/kwdAGjFLqDTA== X-Received: by 2002:a63:fa05:: with SMTP id y5mr8757547pgh.154.1616107461109; Thu, 18 Mar 2021 15:44:21 -0700 (PDT) Received: from gnu-cfl-2.localdomain ([172.56.38.37]) by smtp.gmail.com with ESMTPSA id s15sm23163pgs.28.2021.03.18.15.44.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Mar 2021 15:44:20 -0700 (PDT) Received: from gnu-cfl-2.?040none?041 (localhost [IPv6:::1]) by gnu-cfl-2.localdomain (Postfix) with ESMTP id C24401A03FD; Thu, 18 Mar 2021 15:44:15 -0700 (PDT) To: gcc-patches@gcc.gnu.org Subject: [PATCH] x86: Issue error for return/argument only with function body Date: Thu, 18 Mar 2021 15:44:15 -0700 Message-Id: <20210318224415.1512772-1-hjl.tools@gmail.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-Spam-Status: No, score=-3036.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) 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@gcc.gnu.org Sender: "Gcc-patches" If we never generate function body, we shouldn't issue errors for return nor argument. Add init_cumulative_args_called to i386 machine_function to avoid issuing errors for return and argument without function body. gcc/ PR target/99652 * config/i386/i386.c (init_cumulative_args): Set init_cumulative_args_called to true. (construct_container): Issue error for return and argument only if init_cumulative_args_called is true. * config/i386/i386.h (machine_function): Add init_cumulative_args_called. gcc/testsuite/ PR target/99652 * gcc.dg/torture/pr99652-1.c: New test. * gcc.dg/torture/pr99652-2.c: Likewise. * gcc.target/i386/pr57655.c: Adjusted. * gcc.target/i386/pr59794-6.c: Likewise. * gcc.target/i386/pr70738-1.c: Likewise. * gcc.target/i386/pr96744-1.c: Likewise. --- gcc/config/i386/i386.c | 26 ++++++++++++++--------- gcc/config/i386/i386.h | 3 +++ gcc/testsuite/gcc.dg/torture/pr99652-1.c | 8 +++++++ gcc/testsuite/gcc.dg/torture/pr99652-2.c | 8 +++++++ gcc/testsuite/gcc.target/i386/pr57655.c | 4 ++-- gcc/testsuite/gcc.target/i386/pr59794-6.c | 4 ++-- gcc/testsuite/gcc.target/i386/pr70738-1.c | 4 ++-- gcc/testsuite/gcc.target/i386/pr96744-1.c | 4 ++-- 8 files changed, 43 insertions(+), 18 deletions(-) create mode 100644 gcc/testsuite/gcc.dg/torture/pr99652-1.c create mode 100644 gcc/testsuite/gcc.dg/torture/pr99652-2.c diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c index 540d4f44517..4a0b8c73bef 100644 --- a/gcc/config/i386/i386.c +++ b/gcc/config/i386/i386.c @@ -1705,6 +1705,8 @@ init_cumulative_args (CUMULATIVE_ARGS *cum, /* Argument info to initialize */ struct cgraph_node *local_info_node = NULL; struct cgraph_node *target = NULL; + cfun->machine->init_cumulative_args_called = true; + memset (cum, 0, sizeof (*cum)); if (fndecl) @@ -2534,18 +2536,21 @@ construct_container (machine_mode mode, machine_mode orig_mode, some less clueful developer tries to use floating-point anyway. */ if (needed_sseregs && !TARGET_SSE) { - if (in_return) + if (cfun->machine->init_cumulative_args_called) { - if (!issued_sse_ret_error) + if (in_return) { - error ("SSE register return with SSE disabled"); - issued_sse_ret_error = true; + if (!issued_sse_ret_error) + { + error ("SSE register return with SSE disabled"); + issued_sse_ret_error = true; + } + } + else if (!issued_sse_arg_error) + { + error ("SSE register argument with SSE disabled"); + issued_sse_arg_error = true; } - } - else if (!issued_sse_arg_error) - { - error ("SSE register argument with SSE disabled"); - issued_sse_arg_error = true; } return NULL; } @@ -2558,7 +2563,8 @@ construct_container (machine_mode mode, machine_mode orig_mode, || regclass[i] == X86_64_X87UP_CLASS || regclass[i] == X86_64_COMPLEX_X87_CLASS) { - if (!issued_x87_ret_error) + if (cfun->machine->init_cumulative_args_called + && !issued_x87_ret_error) { error ("x87 register return with x87 disabled"); issued_x87_ret_error = true; diff --git a/gcc/config/i386/i386.h b/gcc/config/i386/i386.h index 48749104b24..ad908c010b3 100644 --- a/gcc/config/i386/i386.h +++ b/gcc/config/i386/i386.h @@ -2945,6 +2945,9 @@ struct GTY(()) machine_function { function. */ BOOL_BITFIELD has_explicit_vzeroupper : 1; + /* If true if init_cumulative_args has been called. */ + BOOL_BITFIELD init_cumulative_args_called: 1; + /* The largest alignment, in bytes, of stack slot actually used. */ unsigned int max_used_stack_alignment; diff --git a/gcc/testsuite/gcc.dg/torture/pr99652-1.c b/gcc/testsuite/gcc.dg/torture/pr99652-1.c new file mode 100644 index 00000000000..c2395ff4ed8 --- /dev/null +++ b/gcc/testsuite/gcc.dg/torture/pr99652-1.c @@ -0,0 +1,8 @@ +/* { dg-do compile { target i?86-*-* x86_64-*-* } } */ +/* { dg-options "-mgeneral-regs-only" } */ + +inline double +foo (void) +{ + return 1.0; +} diff --git a/gcc/testsuite/gcc.dg/torture/pr99652-2.c b/gcc/testsuite/gcc.dg/torture/pr99652-2.c new file mode 100644 index 00000000000..beefad8bfee --- /dev/null +++ b/gcc/testsuite/gcc.dg/torture/pr99652-2.c @@ -0,0 +1,8 @@ +/* { dg-do compile { target i?86-*-* x86_64-*-* } } */ +/* { dg-options "-mno-80387" } */ + +inline double +foo (void) +{ + return 1.0; +} diff --git a/gcc/testsuite/gcc.target/i386/pr57655.c b/gcc/testsuite/gcc.target/i386/pr57655.c index 33a59d3a263..649cdef832d 100644 --- a/gcc/testsuite/gcc.target/i386/pr57655.c +++ b/gcc/testsuite/gcc.target/i386/pr57655.c @@ -2,7 +2,7 @@ /* { dg-options "-mavx -mvzeroupper -mno-fp-ret-in-387" } */ long double -foo (long double x) -{ /* { dg-error "x87 register return with x87 disabled" "" { target { ! ia32 } } } */ +foo (long double x) /* { dg-error "x87 register return with x87 disabled" "" { target { ! ia32 } } } */ +{ return __builtin_ilogbl (x); } diff --git a/gcc/testsuite/gcc.target/i386/pr59794-6.c b/gcc/testsuite/gcc.target/i386/pr59794-6.c index c809f957927..babcf76eaf8 100644 --- a/gcc/testsuite/gcc.target/i386/pr59794-6.c +++ b/gcc/testsuite/gcc.target/i386/pr59794-6.c @@ -8,7 +8,7 @@ typedef int __v4si __attribute__ ((__vector_size__ (16))); extern __v4si x; __v4si -foo (void) -{ /* { dg-error "SSE register return with SSE disabled" } */ +foo (void) /* { dg-error "SSE register return with SSE disabled" } */ +{ return x; } diff --git a/gcc/testsuite/gcc.target/i386/pr70738-1.c b/gcc/testsuite/gcc.target/i386/pr70738-1.c index 19381c26932..62d609c9f66 100644 --- a/gcc/testsuite/gcc.target/i386/pr70738-1.c +++ b/gcc/testsuite/gcc.target/i386/pr70738-1.c @@ -3,7 +3,7 @@ typedef int int32x2_t __attribute__ ((__vector_size__ ((8)))); -int32x2_t test (int32x2_t a, int32x2_t b) -{ /* { dg-error "SSE register return with SSE disabled" } */ +int32x2_t test (int32x2_t a, int32x2_t b) /* { dg-error "SSE register return with SSE disabled" } */ +{ return a + b; } diff --git a/gcc/testsuite/gcc.target/i386/pr96744-1.c b/gcc/testsuite/gcc.target/i386/pr96744-1.c index 46f3ce6ddd4..da5557d89b7 100644 --- a/gcc/testsuite/gcc.target/i386/pr96744-1.c +++ b/gcc/testsuite/gcc.target/i386/pr96744-1.c @@ -4,7 +4,7 @@ typedef int int32x2_t __attribute__ ((__vector_size__ ((8)))); __attribute__((__target__("general-regs-only"))) -int32x2_t test (int32x2_t a, int32x2_t b) -{ /* { dg-error "SSE register return with SSE disabled" } */ +int32x2_t test (int32x2_t a, int32x2_t b) /* { dg-error "SSE register return with SSE disabled" } */ +{ return a + b; }