From patchwork Sun Dec 8 13:04:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Koenig X-Patchwork-Id: 1205654 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-515446-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=quarantine dis=none) header.from=netcologne.de Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="c9mXvvMj"; dkim=pass (2048-bit key; unprotected) header.d=netcologne.de header.i=@netcologne.de header.b="oPf2Ovtw"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47W63r2lMHz9sP3 for ; Mon, 9 Dec 2019 00:04:37 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:to :from:subject:message-id:date:mime-version:content-type; q=dns; s=default; b=H3p+C15LFvBtWAKlWSjUK7rMh7gBRxV7RdRVV5/j6d38XnB951 h6TYwoXQRZh6xEk439KRNJ7hNzGdHgp5Ue3Cmo6SpHGcOeXmgv/UyByEvCmIbDwy d1+BGaud20N5bVBhWSklbatqF0VVNFUjEH0wY/YfH0AR0AuWjT0qrKqf4= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:to :from:subject:message-id:date:mime-version:content-type; s= default; bh=fgdziAwXcNlKek8HpermLqQAO+g=; b=c9mXvvMjmNTSHW8IHdeQ 5VT8j3Vb+l0FbCiUzGT1rSZ6VilzHwn1seyDBslTweNtCNr4vA1Qsx2x4uVUEPvm eHfeISVVFnm2OlxcmDiF95miS/QRQqHIH1QeyGkEOLTyGIaelQGYeUI/NpnKIF/v rN6Ivh1wtdH+D0zwt+15UyQ= Received: (qmail 94320 invoked by alias); 8 Dec 2019 13:04:27 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 94305 invoked by uid 89); 8 Dec 2019 13:04:27 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-12.6 required=5.0 tests=BAYES_00, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.1 spammy= X-HELO: cc-smtpout3.netcologne.de Received: from cc-smtpout3.netcologne.de (HELO cc-smtpout3.netcologne.de) (89.1.8.213) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sun, 08 Dec 2019 13:04:25 +0000 Received: from cc-smtpin1.netcologne.de (cc-smtpin1.netcologne.de [89.1.8.201]) by cc-smtpout3.netcologne.de (Postfix) with ESMTP id 4D33512636; Sun, 8 Dec 2019 14:04:23 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=netcologne.de; s=nc1116a; t=1575810263; bh=1wLD0FAFHKztrcLjJcqwWlYg63OhsMhfBQ+9IPhQK+o=; h=To:From:Subject:Message-ID:Date:From; b=oPf2OvtwHR1jGQBFvdArmJwZB8ydw/uiK3PZT6uOa3oJx4zCCwaC5mP9h7BfvmaYG LUE5xaeiyCbwQ+JkwHFALPIf2LtCLfCmNqV+LyxBJr/RIeZtNq0gufOPLMgEO7smI/ psCOC19EYrOi/3fnGAYgceXVHCE4ogMiGX1oI+JzjWQlnsxldbpbpKFZ+1G4viiha6 UbaA47QzFc9aZ0KGuUplFzJdsbfVLiKbMvanDf7c4gMqoTwG77MgIhInZlewZm6Kkh DmShnsB/I2YI7NEc7EJ3+10pqIhrMiVuTqYcssdM42AGg2e++hJKyzrUEpqWBRznXR ev0YOFC8LL/eA== Received: from localhost (localhost [127.0.0.1]) by cc-smtpin1.netcologne.de (Postfix) with ESMTP id 490ED11D7A; Sun, 8 Dec 2019 14:04:23 +0100 (CET) Received: from [2001:4dd7:c4e0:0:7285:c2ff:fe6c:992d] (helo=cc-smtpin1.netcologne.de) by localhost with ESMTP (eXpurgate 4.11.6) (envelope-from ) id 5decf4d7-45d8-7f0000012729-7f000001e48c-1 for ; Sun, 08 Dec 2019 14:04:23 +0100 Received: from [IPv6:2001:4dd7:c4e0:0:7285:c2ff:fe6c:992d] (2001-4dd7-c4e0-0-7285-c2ff-fe6c-992d.ipv6dyn.netcologne.de [IPv6:2001:4dd7:c4e0:0:7285:c2ff:fe6c:992d]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by cc-smtpin1.netcologne.de (Postfix) with ESMTPSA; Sun, 8 Dec 2019 14:04:21 +0100 (CET) To: "fortran@gcc.gnu.org" , gcc-patches From: Thomas Koenig Subject: [patch, fortran] Add NULL check before checking interfaces Message-ID: Date: Sun, 8 Dec 2019 14:04:21 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.7.2 MIME-Version: 1.0 Hello world, the attached patch fixes an ICE where a NULL check was missing. Committed as obvious and simple after regression-testing as r279087. Since this is an ICE after an error has already been emitted, I don't see any particular need to backport. Regards Thomas 2018-12-08 Thomas Koenig PR fortran/92764 * interface.c (gfc_procedure_use): Check for existence of derived component before using (twice). 2018-12-08 Thomas Koenig PR fortran/92764 * gfortran.dg/interface_44.f90: New test. Index: interface.c =================================================================== --- interface.c (Revision 279064) +++ interface.c (Arbeitskopie) @@ -3888,6 +3888,7 @@ gfc_procedure_use (gfc_symbol *sym, gfc_actual_arg /* F2008, C1303 and C1304. */ if (a->expr && (a->expr->ts.type == BT_DERIVED || a->expr->ts.type == BT_CLASS) + && a->expr->ts.u.derived && ((a->expr->ts.u.derived->from_intmod == INTMOD_ISO_FORTRAN_ENV && a->expr->ts.u.derived->intmod_sym_id == ISOFORTRAN_LOCK_TYPE) || gfc_expr_attr (a->expr).lock_comp)) @@ -3901,6 +3902,7 @@ gfc_procedure_use (gfc_symbol *sym, gfc_actual_arg if (a->expr && (a->expr->ts.type == BT_DERIVED || a->expr->ts.type == BT_CLASS) + && a->expr->ts.u.derived && ((a->expr->ts.u.derived->from_intmod == INTMOD_ISO_FORTRAN_ENV && a->expr->ts.u.derived->intmod_sym_id == ISOFORTRAN_EVENT_TYPE)