From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr1-x436.google.com (mail-wr1-x436.google.com [IPv6:2a00:1450:4864:20::436]) by sourceware.org (Postfix) with ESMTPS id 7C39A384C005; Mon, 31 Aug 2020 16:09:40 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 7C39A384C005 Received: by mail-wr1-x436.google.com with SMTP id w13so6514596wrk.5; Mon, 31 Aug 2020 09:09:40 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:from:subject:message-id:date:user-agent :mime-version:content-language; bh=oI9RMmFkiJtb7/QRi3kxQmqLAU35h0k9fV+3hJACu90=; b=Oui97Es1VOmX6Eqe6uMBzLpIMTTu8KRBYZgcEAZvRLjxCG0YTwBPHSajML54wliaZo CtvWUqWz1IsATuPfj3iDtiwVT39/QHtQzUmlMFSylrQT3qjqM1iP9uRXmyeAfpyuOiyA E5AZQQ+OJEU0QQEkGJRhgVrElVZy/DB/Y9b05mlq9OXggPSlMv+mwBCuBWc/9JZA/Ehv TQM6s4I4lDu4IIIgttxJyToouOcrhMQfTwL3gObVTR5lgpDKM1RST5HgdNrRSAa0IGfg 3pjNt4PKwrFCKNxD7QL33gZABfMP6KCEPKOkOPCXu0d3IIB49N/GIYkdUv//o8oihrtc GCSA== X-Gm-Message-State: AOAM531SRmYiZ2qCCF2p9xU1z6TdFaaZ5IV0dIKziY9YkTMO3Qpswvos /g8sPYeso7PXLWLfBIZCIOn6OVYbF40= X-Google-Smtp-Source: ABdhPJz8HSxGfKPBdOGaYf0Vmpx4YcRhvPWYNbI3VPb/kZaXxtgHtD0t1hP40ojLVZFaXwwNCUrmYw== X-Received: by 2002:adf:ec86:: with SMTP id z6mr2287649wrn.109.1598890179049; Mon, 31 Aug 2020 09:09:39 -0700 (PDT) Received: from ?IPv6:2001:8a0:7d62:e100:4cef:4d87:afd4:5cc9? ([2001:8a0:7d62:e100:4cef:4d87:afd4:5cc9]) by smtp.googlemail.com with ESMTPSA id v24sm14784317wrd.6.2020.08.31.09.09.37 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 31 Aug 2020 09:09:38 -0700 (PDT) To: fortran@gcc.gnu.org, gcc-patches@gcc.gnu.org From: =?UTF-8?Q?Jos=c3=a9_Rui_Faustino_de_Sousa?= Subject: [Patch, fortran] PR fortran/96870 - Class name on error message Message-ID: <7433359f-fa07-c881-009a-8722c2c5924d@gmail.com> Date: Mon, 31 Aug 2020 16:09:32 +0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="------------BAA00592E97C5919F82CF0CD" Content-Language: en-US X-Spam-Status: No, score=-11.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, 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-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-List-Received-Date: Mon, 31 Aug 2020 16:09:41 -0000 This is a multi-part message in MIME format. --------------BAA00592E97C5919F82CF0CD Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Hi all! Proposed patch to PR96870 - Class name on error message. Patch tested only on x86_64-pc-linux-gnu. Make the error message more intelligible for the average user. Thank you very much. Best regards, José Rui 2020-8-21 José Rui Faustino de Sousa gcc/fortran/ChangeLog: PR fortran/96870 * misc.c (gfc_typename): use class name instead of internal name on error message. gcc/testsuite/ChangeLog: PR fortran/96870 * gfortran.dg/PR96870.f90: New test. --------------BAA00592E97C5919F82CF0CD Content-Type: text/x-patch; charset=UTF-8; name="PR96870.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="PR96870.patch" diff --git a/gcc/fortran/misc.c b/gcc/fortran/misc.c index 65bcfa6..43edfd8 100644 --- a/gcc/fortran/misc.c +++ b/gcc/fortran/misc.c @@ -184,8 +184,11 @@ gfc_typename (gfc_typespec *ts, bool for_hash) break; } ts1 = ts->u.derived->components ? &ts->u.derived->components->ts : NULL; - if (ts1 && ts1->u.derived && ts1->u.derived->attr.unlimited_polymorphic) - sprintf (buffer, "CLASS(*)"); + if (ts1 && ts1->u.derived) + if (ts1->u.derived->attr.unlimited_polymorphic) + sprintf (buffer, "CLASS(*)"); + else + sprintf (buffer, "CLASS(%s)", ts1->u.derived->name); else sprintf (buffer, "CLASS(%s)", ts->u.derived->name); break; diff --git a/gcc/testsuite/gfortran.dg/PR96870.f90 b/gcc/testsuite/gfortran.dg/PR96870.f90 new file mode 100644 index 0000000..c1b321e --- /dev/null +++ b/gcc/testsuite/gfortran.dg/PR96870.f90 @@ -0,0 +1,41 @@ +! { dg-do compile } +! +! Test fix for PR96870 +! + +Program main_p + + implicit none + + Type :: t0 + End Type t0 + + Type, extends(t0) :: t1 + End Type t1 + + type(t0), target :: x + class(t0), pointer :: p + + p => x + Call sub_1(x) ! { dg-error "Type mismatch in argument .p. at .1.; passed TYPE\\(t0\\) to CLASS\\(t1\\)" } + Call sub_1(p) ! { dg-error "Type mismatch in argument .p. at .1.; passed CLASS\\(t0\\) to CLASS\\(t1\\)" } + Call sub_2(x) ! { dg-error "Type mismatch in argument .p. at .1.; passed TYPE\\(t0\\) to TYPE\\(t1\\)" } + Call sub_2(p) ! { dg-error "Type mismatch in argument .p. at .1.; passed CLASS\\(t0\\) to TYPE\\(t1\\)" } + stop + +Contains + + Subroutine sub_1(p) + class(t1), Intent(In) :: p + + return + End Subroutine sub_1 + + Subroutine sub_2(p) + type(t1), Intent(In) :: p + + return + End Subroutine sub_2 + +End Program main_p + --------------BAA00592E97C5919F82CF0CD--