From patchwork Fri Jan 22 17:17:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Richard Thomas X-Patchwork-Id: 1430449 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=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=gcc-patches-bounces@gcc.gnu.org; receiver=) Authentication-Results: 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=dMiFShBR; dkim-atps=neutral Received: from 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 RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DMmDm1nkXz9rx6 for ; Sat, 23 Jan 2021 04:18:16 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id D3FDC3AA7C86; Fri, 22 Jan 2021 17:18:11 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D3FDC3AA7C86 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1611335891; bh=kvLFvV7xOMCiossfre6nuudRbKSpWdPgP7706nrTqRU=; h=Date:Subject:To:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=dMiFShBRjH+hrxhsJCAxrw7QPOrQn1gfwTmzfQlcp8DG0+KQniESPbEmgxfNPHVKo CRrzWZYQjHAmgjCeIffGMFma0GAebO7817ALUkbwnZiYzgjXJqjgYpPG7j+6u7qq+H PGm4gC5IFUm2rc71bYMG6+vm3PxIq5UexY3w9eoc= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-lj1-x229.google.com (mail-lj1-x229.google.com [IPv6:2a00:1450:4864:20::229]) by sourceware.org (Postfix) with ESMTPS id 5A461398E418; Fri, 22 Jan 2021 17:18:08 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 5A461398E418 Received: by mail-lj1-x229.google.com with SMTP id u11so7313984ljo.13; Fri, 22 Jan 2021 09:18:08 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=ocY3oemKmglQqlbHWYKHlcLTIgxU1zexuoCqn73KziM=; b=O9XOyH0HzU1BmOtuRFtlnjHJxsCdta2gZKWm6IIxuRYiKtqK4SR5NbdsQPTbCfMqh7 PV6eQL5T/NjAKyK5dT+XwJNurDXAJXueY4KRXkgfZFUKFFHI3LNFn+cqcXpifsiCpbbd JumPfbcp/5CqmMOjsYGotShAenK1UkYzUwtMEUTLLLfPLKGpoo9GeqJRJyQ8oEHiPEdh FWVm6MqHkPYFSmwzzKngt5EJyDBao/2ikpR6O4TK1F/T/sMcnZOK8/+KUxZMMcI5N2aZ xE1rNoUxDZ021qxGkx6hTb6Vw+TWJRMm+cnV5u2mGT3GwW27dsmaddTilsHjcPfwhMwP M9nA== X-Gm-Message-State: AOAM5300nrJvOxj8AznTCXbZzQ5dKD/2XBEzqMXN0j2vWyzO/c1R7+5f 33ps5vuCEHTqLNxTRgMN/U3zNHGynVH03PAjfN2CTIXcvMEN0w== X-Google-Smtp-Source: ABdhPJxtAUWVSpeQ3ry0LpNbmlpFo4zXlCNnTkg+H2jxKJXjqPhWUdek/s9j/1ZwlORlrcFda5yBWhzkZxORGW3PX6A= X-Received: by 2002:a2e:2417:: with SMTP id k23mr174119ljk.373.1611335886185; Fri, 22 Jan 2021 09:18:06 -0800 (PST) MIME-Version: 1.0 Date: Fri, 22 Jan 2021 17:17:54 +0000 Message-ID: Subject: [Patch, fortran] PR98565 - internal compiler error: in conv_function_val, at fortran/trans-expr.c:3950 To: "fortran@gcc.gnu.org" , gcc-patches X-Spam-Status: No, score=-9.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, HTML_MESSAGE, KAM_NUMSUBJECT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-Content-Filtered-By: Mailman/MimeDel 2.1.29 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: Paul Richard Thomas via Gcc-patches From: Paul Richard Thomas Reply-To: Paul Richard Thomas Errors-To: gcc-patches-bounces@gcc.gnu.org Sender: "Gcc-patches" Fixed as 'obviously correct' as r11-6863-gbf8ee9e4eed6ba1a6d77b4cf168df480e1f954da The _data component was preventing the detection of the procedure pointer component and the conversion of the function. Once diagnosed, the fix is obvious. Regtested on FC33/x86_64 - OK in a few weeks for 9- and 10-branches? Paul Fortran: Fix for class functions as associated target [PR98565]. 2021-01-22 Paul Thomas gcc/fortran PR fortran/98565 * trans-intrinsic.c (gfc_conv_associated): Do not add a _data component for scalar class function targets. Instead, fix the function result and access the _data from that. gcc/testsuite/ PR fortran/98565 * gfortran.dg/associated_target_7.f90 : New test. diff --git a/gcc/fortran/trans-intrinsic.c b/gcc/fortran/trans-intrinsic.c index 0e7c60a906b..5c9258c65c3 100644 --- a/gcc/fortran/trans-intrinsic.c +++ b/gcc/fortran/trans-intrinsic.c @@ -9002,7 +9002,8 @@ gfc_conv_associated (gfc_se *se, gfc_expr *expr) else { /* An optional target. */ - if (arg2->expr->ts.type == BT_CLASS) + if (arg2->expr->ts.type == BT_CLASS + && arg2->expr->expr_type != EXPR_FUNCTION) gfc_add_data_component (arg2->expr); if (scalar) @@ -9023,6 +9024,11 @@ gfc_conv_associated (gfc_se *se, gfc_expr *expr) && arg2->expr->symtree->n.sym->attr.dummy) arg2se.expr = build_fold_indirect_ref_loc (input_location, arg2se.expr); + if (arg2->expr->ts.type == BT_CLASS) + { + arg2se.expr = gfc_evaluate_now (arg2se.expr, &arg2se.pre); + arg2se.expr = gfc_class_data_get (arg2se.expr); + } gfc_add_block_to_block (&se->pre, &arg1se.pre); gfc_add_block_to_block (&se->post, &arg1se.post); gfc_add_block_to_block (&se->pre, &arg2se.pre);