From patchwork Tue Jun 28 20:36:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Harald Anlauf X-Patchwork-Id: 55511 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 9C1F43856260 for ; Tue, 28 Jun 2022 20:36:54 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 9C1F43856260 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1656448614; bh=IWOASHueAzcnx4yfMVmxl2UUgJ/Chvuq719tneX6ORo=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=JzTjPslLlinOm2ng5ReUlvuA8SvqARVKaqLaAPhydlwQoa5Vzliyn0W16LywjVXGg CoSCa7nnhLwHg3+jf/nYZLsJGgCLty2TpC0+iKfy48CqjuM6OfvXEBjPbUYqtM0Tm3 ds5HLZn4PTE6E8QLJfaoKr3OFDTiedKUUdMglbsg= 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.15.19]) by sourceware.org (Postfix) with ESMTPS id 15D3A3857367; Tue, 28 Jun 2022 20:36:23 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 15D3A3857367 X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from [79.251.11.55] ([79.251.11.55]) by web-mail.gmx.net (3c-app-gmx-bs57.server.lan [172.19.170.141]) (via HTTP); Tue, 28 Jun 2022 22:36:22 +0200 MIME-Version: 1.0 Message-ID: To: fortran , gcc-patches Subject: [PATCH] Fortran: improve error recovery for EXTENDS_TYPE_OF() [PR106121] Date: Tue, 28 Jun 2022 22:36:22 +0200 Importance: normal Sensitivity: Normal X-Priority: 3 X-Provags-ID: V03:K1:ayzLi1kVSa3TnutbTmBu2RY7sjA7oJTOkRGO7EG6zseuG+Afqr4gwLUC84F4Twi66teQo ebkNlgaMgdTgGhf0E020h7bvyaFBCvPWg+Eyt4nT7wvq50SmxQzBCCFgrbs/O6RSeHqJNhWXOMA9 I3V5No9jU4Es8Luhg+Hc81jhAdNza4PyqbRYLaEUBSJIfAo21L7/86pzGyBCpXjHL1hEIpzbHQ+T Ah2rZWJ4MX2G7KC67CayxU8ktheT2ihRSPKDgXAJq50FRNgSDDHMxrLNufu52lqfMyj450nbEP3b 3I= X-UI-Out-Filterresults: notjunk:1;V03:K0:Hf7obodJcyA=:43diIUD1aOxrFfagTqlI5j WiVcgGWuizcVWOV7lTEX5ndKJWtI8bB/+MshCqep357B0LWmV8jcxPd6IH34NbMmDNxRigvzP fZjY8SpOHomoaPE1smUYINigBohxaA3wmALAS6ycOUTkMeUdqHFrak7qxKZrvWDA0AI9UYiXe sJ9LUIs1d9/RnZe6PE3Ofaa+ndljf+5RlHFQNEyZpaJf0+DmjZ5EmtBpLDWsinIBUqhoQwDrZ CPWJLa0uTMEs2vpXgoXshj8nb78G3EXoph4rgsmkpjvQwc72XvywXd5+BRzh0dQSoLF3AkTpS zfpCRYOy3MjmhPhd1fL9DqhbsKKDjRoxh7F0RrRD2AQvmiB56bLtncnZkaGAjdYrhuN37xaGm 833Df3x4AD1lVSi0r+zHL7xzujpP6TbPd/Ypbq95I4mEKZyFaS/PRcoMnw40ZoDgVMLvsQQWF YYAe8x3puJCzpWpUoX61oEZu6+EjmY3V9aeAT1l52ceYgP6wQLkt8tDauADkcmW0XPMmJbWvV ZupDO4F1HyPcxgmLIXITRO/hbVe6G7T0RC5wDQ8AjpLsa+9DMDZ8Cvy7Wx2Sz6uaLMFZ0L54M 7nwfm5EAfLt+3EtAlnDu49SnaB5fluD4y8PYY7ei8q4M+Tur9OiSVxwjmftysKCYmhl7fX/8m 3HPKcxZqfR2KPe2zLDEDrn5GvkUqMDNjpu/l5fy1rM1urxeYjIAi/gUFcERkeuvPog7DKS2vK EDs5cR8gwPvS8EjDsZcrnYmvGUipU1QFKrvhw058tJWq0qnuEbBqEjtdVEE= X-Spam-Status: No, score=-10.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_BARRACUDACENTRAL, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, 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: Harald Anlauf via Gcc-patches From: Harald Anlauf Reply-To: Harald Anlauf Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" Dear all, the simplification of EXTENDS_TYPE_OF() did not handle the situation that one of its arguments were a CLASS variable that was improperly declared. NULL pointer dereference. The fix is obvious. Steve found a similar solution, which is why I added him as co-author. Regtested on x86_64-pc-linux-gnu. Will commit to mainline as obvious within 24 hours unless there are loud objections. Thanks, Harald From 55aacfd22d73edfb38871e211f85b2ae69fd0072 Mon Sep 17 00:00:00 2001 From: Harald Anlauf Date: Tue, 28 Jun 2022 22:29:28 +0200 Subject: [PATCH] Fortran: improve error recovery for EXTENDS_TYPE_OF() [PR106121] gcc/fortran/ChangeLog: PR fortran/106121 * simplify.cc (gfc_simplify_extends_type_of): Do not attempt to simplify when one of the arguments is a CLASS variable that was not properly declared. gcc/testsuite/ChangeLog: PR fortran/106121 * gfortran.dg/extends_type_of_4.f90: New test. Co-authored-by: Steven G. Kargl --- gcc/fortran/simplify.cc | 4 ++++ .../gfortran.dg/extends_type_of_4.f90 | 20 +++++++++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 gcc/testsuite/gfortran.dg/extends_type_of_4.f90 diff --git a/gcc/fortran/simplify.cc b/gcc/fortran/simplify.cc index e8e3ec63669..ab59fbca622 100644 --- a/gcc/fortran/simplify.cc +++ b/gcc/fortran/simplify.cc @@ -3096,6 +3096,10 @@ gfc_simplify_extends_type_of (gfc_expr *a, gfc_expr *mold) if (UNLIMITED_POLY (a) || UNLIMITED_POLY (mold)) return NULL; + if ((a->ts.type == BT_CLASS && !gfc_expr_attr (a).class_ok) + || (mold->ts.type == BT_CLASS && !gfc_expr_attr (mold).class_ok)) + return NULL; + /* Return .false. if the dynamic type can never be an extension. */ if ((a->ts.type == BT_CLASS && mold->ts.type == BT_CLASS && !gfc_type_is_extension_of diff --git a/gcc/testsuite/gfortran.dg/extends_type_of_4.f90 b/gcc/testsuite/gfortran.dg/extends_type_of_4.f90 new file mode 100644 index 00000000000..64373322387 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/extends_type_of_4.f90 @@ -0,0 +1,20 @@ +! { dg-do compile } +! PR fortran/106121 - ICE in gfc_simplify_extends_type_of +! Contributed by G.Steinmetz + +program p + type t + end type + type(t) :: x + class(t) :: y ! { dg-error "dummy, allocatable or pointer" } + print *, extends_type_of (x, y) +end + +subroutine s + type t + integer :: i + end type + type(t) :: x + class(t) :: y ! { dg-error "dummy, allocatable or pointer" } + stop extends_type_of (x, y) ! { dg-error "STOP code" } +end -- 2.35.3