From patchwork Thu Feb 3 21:37:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Uros Bizjak X-Patchwork-Id: 50760 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 8B376385840D for ; Thu, 3 Feb 2022 21:38:09 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 8B376385840D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1643924289; bh=Kv/jRN2/pdOLmNni9BPnDxd3VySSlxJwpOfbF0GHX2s=; h=Date:Subject:To:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=F5T+QXNQ+VH9ZwLjCKp04HXYyj95wZZNVNmAhfJqs31qT4jt1kSVjfBgq0zw7EP6e /pNRH+WLQtpbr8aPV1inR8wgtuO+M9R/qQly5vKwXKhXBswo9fv8qfEX5FbZY2dXMc D8c6W6IFBJSe4P/tAs6XPVORICFzyiMupBgOoryw= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-qt1-x82d.google.com (mail-qt1-x82d.google.com [IPv6:2607:f8b0:4864:20::82d]) by sourceware.org (Postfix) with ESMTPS id EE96E3858D37 for ; Thu, 3 Feb 2022 21:37:38 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org EE96E3858D37 Received: by mail-qt1-x82d.google.com with SMTP id b5so4048251qtq.11 for ; Thu, 03 Feb 2022 13:37:38 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=Kv/jRN2/pdOLmNni9BPnDxd3VySSlxJwpOfbF0GHX2s=; b=cPzAYDLyqv0b7OKxjo/gL4vdaIuQjc9SQcze8psIXnc3PCbsLvv0hDQsPnGBOxXo/J dEuOi6d8sHRWFRMkW4DfJnKB+IBMexilKInD+GioQUOb/t9ckN4LfzLn4cbwN/ILbpGA co8YOgNgHdL4fHQGE5AgpGNy81TriYD5YsZEV1PxXNG/ga2Emr0bZg3lghB48U+NH//7 rDCSoB3TKXONBIXghSpG+eMPEymifE8I5L6yTTvhqc+n6MD17UHrpRrSVNFWiv5slu2X 7/u3p+VBDFlq1oCFk1ABQe+N7R9S9lGKzbQxew2TOjCUcGl1H/GGfuujHgAZr3EGHBKi DdiQ== X-Gm-Message-State: AOAM533J5cYzDLgUA5na5CMdHO+dzlCdHE4hTMtfPI5oVyvORRtQxcI6 HQg3xRkW+BEpRgIYGh6cKmVAobC9g+yijnqHx7pT6kjz5Axnjg== X-Google-Smtp-Source: ABdhPJzk1OJyNMkFRveL0SNwFeAdwdzKno8epBeBvVwxeHjDjR/ydcccNISbD40zBiREVDQ+4rgwSlFn6xhT5IvK1go= X-Received: by 2002:a05:622a:448:: with SMTP id o8mr84324qtx.5.1643924258330; Thu, 03 Feb 2022 13:37:38 -0800 (PST) MIME-Version: 1.0 Date: Thu, 3 Feb 2022 22:37:27 +0100 Message-ID: Subject: [PATCH] i386: Do not use %ecx DRAP for functions that use __builtin_eh_return [PR104362] To: "gcc-patches@gcc.gnu.org" X-Spam-Status: No, score=-8.4 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: Uros Bizjak via Gcc-patches From: Uros Bizjak Reply-To: Uros Bizjak Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" %ecx can't be used for both DRAP register and eh_return. Adjust find_drap_reg to choose %edi for functions that uses __builtin_eh_return to avoid the assert in ix86_expand_epilogue that enforces this rule. 2022-02-03 Uroš Bizjak gcc/ChangeLog: PR target/104362 * config/i386/i386.cc (find_drap_reg): For 32bit targets return DI_REG if function uses __builtin_eh_return. gcc/testsuite/ChangeLog: PR target/104362 * gcc.target/i386/pr104362.c: New test. Bootstrapped and regression tested on x86_64-linux-gnu {,-m32}. Pushed to master, will be backported to gcc-11. Uros. diff --git a/gcc/config/i386/i386.cc b/gcc/config/i386/i386.cc index ad5a5caa413..dd5584fb8ed 100644 --- a/gcc/config/i386/i386.cc +++ b/gcc/config/i386/i386.cc @@ -7400,7 +7400,8 @@ find_drap_reg (void) register in such case. */ if (DECL_STATIC_CHAIN (decl) || cfun->machine->no_caller_saved_registers - || crtl->tail_call_emit) + || crtl->tail_call_emit + || crtl->calls_eh_return) return DI_REG; /* Reuse static chain register if it isn't used for parameter diff --git a/gcc/testsuite/gcc.target/i386/pr104362.c b/gcc/testsuite/gcc.target/i386/pr104362.c new file mode 100644 index 00000000000..5e5422e2679 --- /dev/null +++ b/gcc/testsuite/gcc.target/i386/pr104362.c @@ -0,0 +1,24 @@ +/* PR target/104362 */ +/* { dg-do compile } */ +/* { dg-options "-mavx512f" } */ + +struct _Unwind_Context +{ + void *ra; + char array[48]; +}; + +extern long uw_install_context_1 (struct _Unwind_Context *); + +void +_Unwind_RaiseException (void) +{ + struct _Unwind_Context this_context, cur_context; + __builtin_memset(&this_context, 55, sizeof(this_context)); + long offset = uw_install_context_1 (&this_context); + __builtin_memcpy (&this_context, &cur_context, + sizeof (struct _Unwind_Context)); + void *handler = __builtin_frob_return_addr ((&cur_context)->ra); + uw_install_context_1 (&cur_context); + __builtin_eh_return (offset, handler); +}