From patchwork Thu Jul 13 16:47:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mikael Pettersson X-Patchwork-Id: 1807381 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=server2.sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: legolas.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=psZK1NU2; dkim-atps=neutral Received: from server2.sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4R20y11tcQz20c6 for ; Fri, 14 Jul 2023 02:51:53 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 4FE7B3858C33 for ; Thu, 13 Jul 2023 16:51:50 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4FE7B3858C33 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1689267110; bh=bUQzWbCFpYrj9g5b8H4RAs/hT8H9wssHbpiADKP8BmE=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=psZK1NU28QkiLf9vKrcQW5AZtRUna9fLpd69SI3kHzZsFXHIxCTIYXOLqx7RHK0Ce 4YN44mqD19F//9YduOVZEHSjgdUOfnaSLnUdAIOC5t9KRqO4TEgEE4LFJpy90PtkxL TECKkhH9rGbj7GBKGGT+NUQmJxJkk/5mEo3d+EDE= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-lf1-x133.google.com (mail-lf1-x133.google.com [IPv6:2a00:1450:4864:20::133]) by sourceware.org (Postfix) with ESMTPS id E3A583858D1E for ; Thu, 13 Jul 2023 16:51:28 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org E3A583858D1E Received: by mail-lf1-x133.google.com with SMTP id 2adb3069b0e04-4f9fdb0ef35so1738594e87.0 for ; Thu, 13 Jul 2023 09:51:28 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689267086; x=1691859086; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=bUQzWbCFpYrj9g5b8H4RAs/hT8H9wssHbpiADKP8BmE=; b=K69DdNVV9zgbK78EXVotqj8zPyu6heca9zkxdFzqbtiOiUJIlj/w9ocDcPtAiBLMVI FiGjRYn4XkU2p9AqEK7y413sUpUcmoLkzTnJD9mQRsP6czt3j889sXjI2bUPPrgO2n52 A4pd9jmGwNB4E5aNeElwRZ9NwET8HLvM9qOtjpVLL7Pmi+pT1R7q6csf76iwluM12gjU dtliZGh1Xc4+BBKxd8JBCSq7gsSxp5djSf5qFaCXTsaTeYVz/m7Nb9xFDA7r0FmyLkC0 VXb1KL2yNxSZgV+rAhaM7DIu7IKmesXM3D8O4UKyj+YdwJ3Awyr1NA/OIkwtFDMLc4Uk haNQ== X-Gm-Message-State: ABy/qLaMaLsvKzVCv+XSQgrLdbU5nbzAuyxLF337sKhlTAg3lV/0Q7KP BvB2i0eWbK3i9jEZld+Wz5GMAIonMXeMew== X-Google-Smtp-Source: APBJJlEtxZAYn8Wj5B9JkB0rqVd3k1Z5F5/ELRRmR027CzPGxinXhqJQH15fgx1by5pGs0tZGBVddA== X-Received: by 2002:ac2:57ca:0:b0:4fb:97e8:bc25 with SMTP id k10-20020ac257ca000000b004fb97e8bc25mr1615792lfo.34.1689267085866; Thu, 13 Jul 2023 09:51:25 -0700 (PDT) Received: from hallertau.. (ip006.net-192-176-117.koping.net. [192.176.117.6]) by smtp.gmail.com with ESMTPSA id h12-20020ac2596c000000b004fbb011c9c7sm1174829lfp.162.2023.07.13.09.51.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Jul 2023 09:51:25 -0700 (PDT) To: gcc-patches@gcc.gnu.org Cc: Paul Koning , Mikael Pettersson Subject: [PATCH] fix pdp11_expand_epilogue (PR target/107841) Date: Thu, 13 Jul 2023 18:47:57 +0200 Message-ID: <20230713164756.3558785-2-mikpelinux@gmail.com> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-Spam-Status: No, score=-11.0 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.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) 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: Mikael Pettersson via Gcc-patches From: Mikael Pettersson Reply-To: Mikael Pettersson Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" If the stack frame only contains an alloca area, then pdp11_expand_epilogue fails to deallocate it, resulting in callee-saved registers and the return address being restored from the wrong stack slots. Fixed by adding || cfun->calls_alloca to the condition for deallocating the frame. Tested with a cross to pdp11-unknown-aout. Ok for master? (Note: I don't have commit rights.) gcc/ PR target/107841 * config/pdp11/pdp11.c (pdp11_expand_epilogue): Also deallocate alloca-only frame. gcc/testsuite/ PR target/107841 * gcc.target/pdp11/pr107841.c: New test. --- gcc/config/pdp11/pdp11.cc | 2 +- gcc/testsuite/gcc.target/pdp11/pr107841.c | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gcc.target/pdp11/pr107841.c diff --git a/gcc/config/pdp11/pdp11.cc b/gcc/config/pdp11/pdp11.cc index f6dd841f184..311a1d225e0 100644 --- a/gcc/config/pdp11/pdp11.cc +++ b/gcc/config/pdp11/pdp11.cc @@ -393,7 +393,7 @@ pdp11_expand_epilogue (void) rtx x, reg, via_ac = NULL; /* Deallocate the local variables. */ - if (fsize) + if (fsize || cfun->calls_alloca) { if (frame_pointer_needed) { diff --git a/gcc/testsuite/gcc.target/pdp11/pr107841.c b/gcc/testsuite/gcc.target/pdp11/pr107841.c new file mode 100644 index 00000000000..a363c468b0b --- /dev/null +++ b/gcc/testsuite/gcc.target/pdp11/pr107841.c @@ -0,0 +1,12 @@ +/* { dg-do compile } */ +/* { dg-options "-O2" } */ + +/* Verify that the stack frame is deallocated using the frame pointer. */ + +void qq (int a) +{ + char *s = __builtin_alloca (128); + __builtin_sprintf (s, "qq %d", 3); +} + +/* { dg-final { scan-assembler "mov\tr5,sp" } } */