From patchwork Thu Sep 15 20:23:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Harald Anlauf X-Patchwork-Id: 1678414 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=8.43.85.97; helo=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=EHM5iK6q; dkim-atps=neutral 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 ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4MT7vb4BYXz1yp3 for ; Fri, 16 Sep 2022 06:23:51 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 22A96381FE71 for ; Thu, 15 Sep 2022 20:23:48 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 22A96381FE71 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1663273428; bh=xiL5rUq28/W1dujJB+uqtTc1SdZKTdsYzfQP+TVo/sE=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=EHM5iK6qL5Vi0h0p0vxivPe+VUI1EYHmuMZumi5cqiq4PAKqEDZuugz2OtAbQq5jL c3DNfxRPo0L9G9ZJreMRMphJMQV32mLxt/uXMyj46H2O2a6nYT2ehe20doB/gCOVGh 3kQuYCVgbblmOfGuZT+UzaOPXfHMkdwZfc6jm4ps= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mout.gmx.net (mout.gmx.net [212.227.17.20]) by sourceware.org (Postfix) with ESMTPS id 27AFE3839DCE; Thu, 15 Sep 2022 20:23:28 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 27AFE3839DCE X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from [93.207.80.54] ([93.207.80.54]) by web-mail.gmx.net (3c-app-gmx-bs69.server.lan [172.19.170.214]) (via HTTP); Thu, 15 Sep 2022 22:23:26 +0200 MIME-Version: 1.0 Message-ID: To: fortran , gcc-patches Subject: [PATCH, committed] Fortran: error recovery for bad deferred character length assignment [PR104314] Date: Thu, 15 Sep 2022 22:23:26 +0200 Importance: normal Sensitivity: Normal X-Priority: 3 X-Provags-ID: V03:K1:F347IAs75jRfiFpyQihgAThBmx6ondvj7LFo1a9fJsM6mie3ML47k79yNyLGJZZHBpFxa ed0iB0I5ftz3pnc5uRRo5C+1zHd79iQ8huduLOK7skBfLxtk1jR00sUvSQg/K/jCBRXJYtHImUIf YsLgx3b02ro20qmKMeiKpA2Ne6BvS1JZ/RRM3CdnNfQB8g5JfPYPDlB14+sEYh6AWTPECFH/VmRk 5zjlJbO960iMawlO/3gy1F1d/ClPhp9N9CZl5m1dFzv8v9ikYF7sB6vLJPFO2zotXI0OyBkpZPPF UI= X-UI-Out-Filterresults: notjunk:1;V03:K0:AYc2suD2bhA=:BPvjUyfXakT+HxlGzBqULF R7GNXdwemKTI/QKrXJSSKUGzgYdofxJ/vp2FLNzSj06UMOCozddGVQyJUv9OgdOt0OxnkRfT9 xbiCnTdVqaNOdQ/QT96Od7YmBw5g5POS4vxUCxpPirl0VON38cQwBBzzDQeRJBUMh1+/E5J6c PAkGWcd0Pqxa3MKhdT4z+22GT0u0HarSc6Wjuqaj9kyz3C8TchUMzomeKl0fokRdfLonGCbKO qH85EO9OOKvqKBdnNaW6uALcnpNqxGNZbnMKTqV7CmkwFR1jl1hKpYHmNi8FkShYvGhf75Ymc HOy/0xrDfmeTSKAsS+rw3v5nndTcslblJwhZECV62z9ovOsh6J0d2hFGt3rIgnVnMdSQp+1/y 83cmLfPSFDoMbyjFjNWek2vteGkootFGeUKky2QeqFWMmxfve83os/QTQQMq1jVu16sJ8Lb43 BchFam3ThhRkll9w+mESuoBIIELkyzAlI434CFHOCFDIwmkv3/j4Ds/mB8nOXn9G+4GKoadSd mGIDGy0Ot8QbjHYBCUkf1Qj93kdHWlE5IK5Lmd9PT/BPfcffXTfBmrhTmvwcJkSSFzXS2J1SU b9WFLkYvy5dhczVQYHUgh5PX/7pzbWc3TtmbKEyVIgyGpHnnJDj4qT6m8QyCQlQ1zZ4VMtiGS 7depbwgKapGrdEBVzk9aLUjzTvuAcbwUItl7bnpy2JiNJ0qeit4nkWbZI8i7RIfv99Gi79tSt DVYIfZ7WDC0OZf4ebhnDAna49zJdbRoazCZvby6nvFGgBj3kRGdmOrytAE9zzlv7kpVEu/kI+ Otue6I/ X-Spam-Status: No, score=-12.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS, TXREP 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: Harald Anlauf via Gcc-patches From: Harald Anlauf Reply-To: Harald Anlauf Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" Dear all, the attached obvious patch fixes an ICE on a NULL pointer dereference. We didn't properly check that the types of expressions are character before referencing the length. The issue was originally investigated by Steve, so I made him co-author. Regtested on x86_64-pc-linux-gnu and pushed to mainline as commit r13-2690-g7bd4deb2a7c1394550610ab27507d1ed2af817c2 Thanks, Harald From 7bd4deb2a7c1394550610ab27507d1ed2af817c2 Mon Sep 17 00:00:00 2001 From: Harald Anlauf Date: Thu, 15 Sep 2022 22:06:53 +0200 Subject: [PATCH] Fortran: error recovery for bad deferred character length assignment [PR104314] gcc/fortran/ChangeLog: PR fortran/104314 * resolve.cc (deferred_op_assign): Do not try to generate temporary for deferred character length assignment if types do not agree. gcc/testsuite/ChangeLog: PR fortran/104314 * gfortran.dg/pr104314.f90: New test. Co-authored-by: Steven G. Kargl --- gcc/fortran/resolve.cc | 1 + gcc/testsuite/gfortran.dg/pr104314.f90 | 9 +++++++++ 2 files changed, 10 insertions(+) create mode 100644 gcc/testsuite/gfortran.dg/pr104314.f90 diff --git a/gcc/fortran/resolve.cc b/gcc/fortran/resolve.cc index ca114750f65..ae7ebb624e4 100644 --- a/gcc/fortran/resolve.cc +++ b/gcc/fortran/resolve.cc @@ -11803,6 +11803,7 @@ deferred_op_assign (gfc_code **code, gfc_namespace *ns) if (!((*code)->expr1->ts.type == BT_CHARACTER && (*code)->expr1->ts.deferred && (*code)->expr1->rank + && (*code)->expr2->ts.type == BT_CHARACTER && (*code)->expr2->expr_type == EXPR_OP)) return false; diff --git a/gcc/testsuite/gfortran.dg/pr104314.f90 b/gcc/testsuite/gfortran.dg/pr104314.f90 new file mode 100644 index 00000000000..510ded0b164 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/pr104314.f90 @@ -0,0 +1,9 @@ +! { dg-do compile } +! PR fortran/104314 - ICE in deferred_op_assign +! Contributed by G.Steinmetz + +program p + character(:), allocatable :: c(:) + c = ['123'] + c = c == c ! { dg-error "Cannot convert" } +end -- 2.35.3