From patchwork Sun Mar 31 13:01:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Richard Thomas X-Patchwork-Id: 87867 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 17FB8385841C for ; Sun, 31 Mar 2024 13:02:24 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-pg1-x533.google.com (mail-pg1-x533.google.com [IPv6:2607:f8b0:4864:20::533]) by sourceware.org (Postfix) with ESMTPS id 446713858D1E; Sun, 31 Mar 2024 13:01:54 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 446713858D1E Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 446713858D1E Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::533 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1711890116; cv=none; b=FSrvpa+dA/J1wwOfPW+xoGWDkm895OboOcOJfz3szNapvCamiJmbsZgJLFOGxMiQElXpGaVHvKcTc2nkqeWx5vv3VQPoG4Z1Qcs9CfWuNS+D5Y7MS9D0Vh9aY5PVOipX9wioZoB5oz31tIXN9TkTjB/in23RwfNZD9nlLi404ho= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1711890116; c=relaxed/simple; bh=U+F6Ch4fEEfrKCs55L2M9ONeqiwmBlUTPqVIV1QlaAA=; h=DKIM-Signature:MIME-Version:From:Date:Message-ID:Subject:To; b=mdDJTYP3o6y5RG1szpb5RP4mqBLDSy327sB55FoM2hb3R9bQ4le+DMMBlSs4rgDfFDBtCjHCXGxDf2gYBM38+6G1mGKWla6AbEh1q83stUE5H8fzO1eiP5JPjoqZ3X8I5Dh6wSqNZ0GSHD9Kx3Vu4iCV3rBonKr65sqk9JN1TXA= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-pg1-x533.google.com with SMTP id 41be03b00d2f7-517ab9a4a13so2469834a12.1; Sun, 31 Mar 2024 06:01:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1711890113; x=1712494913; darn=gcc.gnu.org; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=84WDITWSfNVz4M0qSEUEIOW7dxz1AZ5PTHGGwpd8U/8=; b=dAAUGKxDRRNwyPIaKio24MpT384buzB4TUvTeoyOXfDoXWkdTz7jlhkklBVK3U9Q4k LEVGx3NPrJ3VLXdN95QStLwPM7lcyjRnKT4C4NEmQkOh6U1vA7hYHAy5mqJoiR9zRML7 RT/kUdHNQE49BTJOlLLndSTsACftRVu8wU1e3ZYVNVPwb482ZG51JK1AE1xFK1pg2t1a hRwl2cQg3xYjE1Eo0lvkSwyT45Im17lVytsBs24TBN35Zgf1pw4lGeDFbPpM4YqWPltM CRME50G0lOnnDFGyZ2vwFUM1KxyiN3NoUjLhP8m0gYYRffpvFIBwZNnJKigm/DuMh9Wt qBlw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711890113; x=1712494913; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=84WDITWSfNVz4M0qSEUEIOW7dxz1AZ5PTHGGwpd8U/8=; b=HrZsnNZfEKnkYcEQqudRw0rNRpMbVrUqTgiEy5fEghVGeWBqt30geE3YzZMO0fOdlo /MJaAn2jWfAgh3f4uG8MhqyUreDmorY+ahE2P6olkNyk/DcxYdnVNyaqlIAy949tGT8c zaNvWFVNOXG49uuF+UcQYC/rOinhuh330BwPNthjOlJ3CJe7S4bzrQwG6eKjD2bJRNfq wqmNId5xP9IIIjkVWSgPIozuMlR3XKeGUdWleK5k9fJrxoFuQwYyQO6OkJinoXtkYioK G5ubCxpSmr7UA8MIb6keU2MuoHXxVUDYBSDsC7pcYHfhTBVhl9pRmFAD3eM20+iEgpQc kAIA== X-Forwarded-Encrypted: i=1; AJvYcCX2bV02+R+gucSSpGv9UXdO9IcdiPCNvp/g+DIswlfg55XqZhwORj35BSsF0nPBVspndD7UKj5arj5ZZHl/pptkTQRp3fQ5lQ== X-Gm-Message-State: AOJu0Yw/Qb7rSA9GSvdqOEwliWQYPky/uOoYzd75zw3JzudiEdF1fjCH 0TqDeERone0KP6f80Ntcs4N6bFjrg876lgrLXdXQjVzC5/0zPJmM7NMjzZMqf7HZhqcsL7/rykM ZAfiUHTzTmb+39fMLSDTrXgdDGvFrzf8Ehuk= X-Google-Smtp-Source: AGHT+IHacgwD0NyF7OXJbyykoJ9geuBt13wO1AeRvUMoVOjt9wod3UAH0egHP+7K/6oMqU62geSw7UfzVuSQiE6DpFw= X-Received: by 2002:a17:902:a70b:b0:1dd:a518:d692 with SMTP id w11-20020a170902a70b00b001dda518d692mr6820806plq.15.1711890112896; Sun, 31 Mar 2024 06:01:52 -0700 (PDT) MIME-Version: 1.0 From: Paul Richard Thomas Date: Sun, 31 Mar 2024 13:01:41 +0000 Message-ID: Subject: [Patch, fortran] PR106999 [11/12/13/14 Regression] ICE tree check: expected record_type or union_type or qual_union_type, have function_type in gfc_class_data_get, at fortran/trans-expr.cc:233 To: "fortran@gcc.gnu.org" , gcc-patches X-Spam-Status: No, score=-7.3 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, WEIRD_PORT 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.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org This regression has a relatively simple fix. The passing of a subroutine procedure pointer component to a dummy variable was being missed completely. The error has been added. Conversely, an error was generated for a procedure pointer variable but no use was being made of the interface, if one was available. This has been corrected. OK for mainline and backporting in a couple of weeks? Paul Fortran: Add error for subroutine passed to a variable dummy [PR106999] 2024-03-31 Paul Thomas gcc/fortran PR fortran/106999 *interface.cc (gfc_compare_interfaces): Add error for a subroutine proc pointer passed to a variable formal. (compare_parameter): If a procedure pointer is being passed to a non-procedure formal arg, and there is an an interface, use gfc_compare_interfaces to check and provide a more useful error message. gcc/testsuite/ PR fortran/106999 * gfortran.dg/pr106999.f90: New test. diff --git a/gcc/fortran/interface.cc b/gcc/fortran/interface.cc index 7b86a338bc1..bf151dae743 100644 --- a/gcc/fortran/interface.cc +++ b/gcc/fortran/interface.cc @@ -1789,6 +1789,14 @@ gfc_compare_interfaces (gfc_symbol *s1, gfc_symbol *s2, const char *name2, return false; } + if (s2->attr.subroutine && s1->attr.flavor == FL_VARIABLE) + { + if (errmsg != NULL) + snprintf (errmsg, err_len, "subroutine proc pointer '%s' passed " + "to dummy variable '%s'", name2, s1->name); + return false; + } + /* Do strict checks on all characteristics (for dummy procedures and procedure pointer assignments). */ if (!generic_flag && strict_flag) @@ -2425,12 +2433,22 @@ compare_parameter (gfc_symbol *formal, gfc_expr *actual, { gfc_symbol *act_sym = actual->symtree->n.sym; - if (formal->attr.flavor != FL_PROCEDURE) + if (formal->attr.flavor != FL_PROCEDURE && !act_sym->ts.interface) { if (where) gfc_error ("Invalid procedure argument at %L", &actual->where); return false; } + else if (act_sym->ts.interface + && !gfc_compare_interfaces (formal, act_sym->ts.interface, + act_sym->name, 0, 1, err, + sizeof(err),NULL, NULL)) + { + if (where) + gfc_error_opt (0, "Interface mismatch in dummy procedure %qs at %L:" + " %s", formal->name, &actual->where, err); + return false; + } if (!gfc_compare_interfaces (formal, act_sym, act_sym->name, 0, 1, err, sizeof(err), NULL, NULL)) diff --git a/gcc/testsuite/gfortran.dg/pr106999.f90 b/gcc/testsuite/gfortran.dg/pr106999.f90 new file mode 100644 index 00000000000..b3f1d7741f3 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/pr106999.f90 @@ -0,0 +1,33 @@ +! { dg-do compile } +! Test the fix for PR106999 +! Contributed by Gerhard Steinmetz +program p + type t + integer :: i + procedure(g), pointer :: f + end type + class(t), allocatable :: y, z + procedure(g), pointer :: ff + allocate (z) + z%i = 42 + z%f => g + ff => g + call r(z%f) + call s(z%f) ! { dg-error "Interface mismatch in dummy procedure" } + call s(ff) ! { dg-error "Interface mismatch in dummy procedure" } +contains + subroutine g(x) + class(t) :: x + x%i = 84 + end + subroutine r(x) + procedure(g) :: x + print *, "in r" + allocate (y) + call x(y) + print *, y%i + end + subroutine s(x) + class(*) :: x + end subroutine +end