From patchwork Wed Jun 16 15:31:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Jos=C3=A9_Rui_Faustino_de_Sousa?= X-Patchwork-Id: 1492964 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=8.43.85.97; helo=sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@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=G6/SL57e; dkim-atps=neutral Received: from sourceware.org (ip-8-43-85-97.sourceware.org [8.43.85.97]) (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 4G4q1p2V7sz9shn for ; Thu, 17 Jun 2021 01:32:29 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 20E6B397EC19 for ; Wed, 16 Jun 2021 15:32:27 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 20E6B397EC19 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1623857547; bh=hCLh68aVrqsT5GnEKRPzAPFx550N45Hr11D6RPCy+fw=; h=Subject:References:To:Date:In-Reply-To:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=G6/SL57eKc/RgOH/V9Z5a2eAS2tJ/Tkfd7MaiV6GVH6lmyckAUXqQWePLb0QX8LQo n0pIp38ZqVRsZivadHdRm7Gp6zWc8KUffFqu6DKfZPOPcWDjo9efGPG/ZtOlF8bgkZ xvW1LaLfaztk8sK5We3TZU8eQgCZ0lFlkHLK2gJc= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org 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 2D7AF3894419; Wed, 16 Jun 2021 15:31:25 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 2D7AF3894419 Received: by mail-wr1-x436.google.com with SMTP id o3so3179446wri.8; Wed, 16 Jun 2021 08:31:25 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:references:to:from:message-id:date :user-agent:mime-version:in-reply-to:content-language; bh=hCLh68aVrqsT5GnEKRPzAPFx550N45Hr11D6RPCy+fw=; b=DiZLHhZbqiowk+cs8XqnKhMnfJ88NZRN7qPt5P4DhfvPp7WOOatGUionmDOiNm4dmk VXCRuWZB9zWgYYUyN5Prx4U7XWypi/CP9t3MUee7L8nSNyKVULUHu1KYvQlOdXqRKBpQ LhQ6Zi2o0xXwfQV5wiquDrF6GspV1VUaAGJjhTK4aSXiRgzQgc26HRKOomyapvgwNH2y MBLrTZTVwAgY9qT8G2gMdD0n029RHbA5mhAWkJLzDliRtrNT4e0htivhZnQBc6CXTA0G iYlzCa88AbyNtIMPizQFNICzeXX4m4R934XGEIQ9pFV4wMwt7UdN2SK+pcW+l2H7YyBA glyQ== X-Gm-Message-State: AOAM532m6MbVf5FP2U84asE4d8JzdPNa7eUrHP5ll2gYU52K94mg4sGg vzUqj2j7S7P/dcYlC0yYficrL7zuFV4= X-Google-Smtp-Source: ABdhPJwY4NXpmMRyBneJMUQJ1Duel1xkm2UFetS2IQTBal0VDQyPxtKxG50qJk8O+5px35FLPT5fJQ== X-Received: by 2002:adf:a34e:: with SMTP id d14mr6244791wrb.325.1623857483882; Wed, 16 Jun 2021 08:31:23 -0700 (PDT) Received: from ?IPv6:2001:8a0:7d79:6000:733c:e830:9b46:fc86? ([2001:8a0:7d79:6000:733c:e830:9b46:fc86]) by smtp.googlemail.com with ESMTPSA id x1sm1829166wmc.31.2021.06.16.08.31.22 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 16 Jun 2021 08:31:23 -0700 (PDT) Subject: PING: [Patch, fortran] PR fortran/96870 - Class name on error message References: <7433359f-fa07-c881-009a-8722c2c5924d@gmail.com> To: fortran@gcc.gnu.org, gcc-patches@gcc.gnu.org X-Forwarded-Message-Id: <7433359f-fa07-c881-009a-8722c2c5924d@gmail.com> Message-ID: Date: Wed, 16 Jun 2021 15:31:22 +0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.8.1 MIME-Version: 1.0 In-Reply-To: <7433359f-fa07-c881-009a-8722c2c5924d@gmail.com> Content-Language: en-US X-Spam-Status: No, score=-12.2 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-Patchwork-Original-From: =?utf-8?q?Jos=C3=A9_Rui_Faustino_de_Sousa_via_Gcc-patches?= From: =?utf-8?q?Jos=C3=A9_Rui_Faustino_de_Sousa?= Reply-To: =?utf-8?q?Jos=C3=A9_Rui_Faustino_de_Sousa?= Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" *PING* -------- Forwarded Message -------- Subject: [Patch, fortran] PR fortran/96870 - Class name on error message Date: Mon, 31 Aug 2020 16:09:32 +0000 From: José Rui Faustino de Sousa To: fortran@gcc.gnu.org, gcc-patches@gcc.gnu.org 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. 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 +