From patchwork Tue Mar 8 17:49:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 1603111 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.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=WaEBqDOn; dkim-atps=neutral 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+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Received: from sourceware.org (ip-8-43-85-97.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 bilbo.ozlabs.org (Postfix) with ESMTPS id 4KCjXd1m4jz9sGF for ; Wed, 9 Mar 2022 04:50:23 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 2E1003858435 for ; Tue, 8 Mar 2022 17:50:21 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 2E1003858435 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1646761821; bh=IEor2kFYxd3UYZAWrMEPh2+tFmn52e76bIN5cRig4xk=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=WaEBqDOn5WyeREf92Pxb5ucGcO0VJHI0ox+SJ4Uz+WuDK+XG7+/dBEpKbfj0P4ypj GU+GtjrkYk3qCbiUBUvwF1bRjZ0rYreRuv/iNcd8OHY0HlCibYs9g70EXnAHgaAo6S rJ5h6rBD8bnxYeXA1tJBSp379tDIRQ9eT1i2cI6o= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-pj1-x102c.google.com (mail-pj1-x102c.google.com [IPv6:2607:f8b0:4864:20::102c]) by sourceware.org (Postfix) with ESMTPS id 52F6D3858D35 for ; Tue, 8 Mar 2022 17:49:40 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 52F6D3858D35 Received: by mail-pj1-x102c.google.com with SMTP id v4so24814pjh.2 for ; Tue, 08 Mar 2022 09:49:40 -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=IEor2kFYxd3UYZAWrMEPh2+tFmn52e76bIN5cRig4xk=; b=qTEsAtsbd8liRf/zPSCeiyN6R/zCRTJgXaGTAHn5FBOIssPcXDuFKwaZ9YUi7FH/a5 kxTJTIKRXEwzg2vY30o5U78qNFDKsm49uynnQLM/Wiflkj+FcY6tIuYqyYd7NgA6cBKl 5CVcQBa9D6KYEpGImrc8YDlcImo1S6G6RSZnPZLDGIs+cYHF5nAUNJHPQiIf0UAy4YIM W2RnjATssw6oprjX3t2BpFpDWjjytHSyYyDkBbep592MrTYyKLv/yX4+HTMI+NaHY0X1 ATk2ezV+cR6QOQcOYSuVrY5ecvfq083zKVIxrURG01Eeu8avlR3IFjViuIC1+wwb29Iw +QLg== X-Gm-Message-State: AOAM532l9zbBFPnGSPrEa11+vDiihhJ8CBKGeGYBDvU012EBEVyIRvks fhsnmUJHX+JVPOu97xDG+lw= X-Google-Smtp-Source: ABdhPJwKxXQJw9TM268YRYfFNAwmpI3nU1GB8f2Uusi7o5Lom/4zlrsSEya9WeeYixBL/GDdxkogkg== X-Received: by 2002:a17:902:a703:b0:151:efbf:247e with SMTP id w3-20020a170902a70300b00151efbf247emr9515809plq.166.1646761778918; Tue, 08 Mar 2022 09:49:38 -0800 (PST) Received: from gnu-tgl-3.localdomain ([172.58.35.24]) by smtp.gmail.com with ESMTPSA id z21-20020a17090a8b9500b001bf74f8bb3asm3507640pjn.24.2022.03.08.09.49.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Mar 2022 09:49:38 -0800 (PST) Received: from gnu-tgl-3.. (localhost [IPv6:::1]) by gnu-tgl-3.localdomain (Postfix) with ESMTP id F3094C03D3; Tue, 8 Mar 2022 09:49:36 -0800 (PST) To: gcc-patches@gcc.gnu.org Subject: [PATCH v4] x86: Disallow unsupported EH return Date: Tue, 8 Mar 2022 09:49:36 -0800 Message-Id: <20220308174936.136446-1-hjl.tools@gmail.com> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 X-Spam-Status: No, score=-3029.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE 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" Cc: Jakub Jelinek , Eric Botcazou Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" Disallow stack realignment and regparm nested function with EH return since they don't work together. gcc/ PR target/104781 * config/i386/i386.cc (ix86_expand_epilogue): Sorry if there is stack realignment or regparm nested function with EH return. gcc/testsuite/ PR target/104781 * gcc.target/i386/eh_return-1.c: Add -mincoming-stack-boundary=4. * gcc.target/i386/eh_return-2.c: Likewise. --- gcc/config/i386/i386.cc | 11 +++++++---- gcc/testsuite/gcc.target/i386/eh_return-1.c | 2 +- gcc/testsuite/gcc.target/i386/eh_return-2.c | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/gcc/config/i386/i386.cc b/gcc/config/i386/i386.cc index efa947f9795..4121f986221 100644 --- a/gcc/config/i386/i386.cc +++ b/gcc/config/i386/i386.cc @@ -9444,12 +9444,15 @@ ix86_expand_epilogue (int style) rtx sa = EH_RETURN_STACKADJ_RTX; rtx_insn *insn; - /* %ecx can't be used for both DRAP register and eh_return. */ - if (crtl->drap_reg) - gcc_assert (REGNO (crtl->drap_reg) != CX_REG); + /* Stack realignment doesn't work with eh_return. */ + if (crtl->stack_realign_needed) + sorry ("Stack realignment not supported with " + "%<__builtin_eh_return%>"); /* regparm nested functions don't work with eh_return. */ - gcc_assert (!ix86_static_chain_on_stack); + if (ix86_static_chain_on_stack) + sorry ("regparm nested function not supported with " + "%<__builtin_eh_return%>"); if (frame_pointer_needed) { diff --git a/gcc/testsuite/gcc.target/i386/eh_return-1.c b/gcc/testsuite/gcc.target/i386/eh_return-1.c index b21fd75fc93..43f94f01a97 100644 --- a/gcc/testsuite/gcc.target/i386/eh_return-1.c +++ b/gcc/testsuite/gcc.target/i386/eh_return-1.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O2 -march=haswell -mno-avx512f -mtune-ctrl=avx256_move_by_pieces" } */ +/* { dg-options "-O2 -mincoming-stack-boundary=4 -march=haswell -mno-avx512f -mtune-ctrl=avx256_move_by_pieces" } */ struct _Unwind_Context { diff --git a/gcc/testsuite/gcc.target/i386/eh_return-2.c b/gcc/testsuite/gcc.target/i386/eh_return-2.c index f23f4492dac..cb762f92cc2 100644 --- a/gcc/testsuite/gcc.target/i386/eh_return-2.c +++ b/gcc/testsuite/gcc.target/i386/eh_return-2.c @@ -1,6 +1,6 @@ /* PR target/101772 */ /* { dg-do compile } */ -/* { dg-additional-options "-O0 -march=x86-64 -mstackrealign" } */ +/* { dg-additional-options "-O0 -mincoming-stack-boundary=4 -march=x86-64 -mstackrealign" } */ struct _Unwind_Context _Unwind_Resume_or_Rethrow_this_context;