From patchwork Sun Apr 11 00:34:07 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: 1464727 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@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=lcvgMxVk; dkim-atps=neutral Received: from sourceware.org (server2.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 4FHtCw3M7mz9sWK for ; Sun, 11 Apr 2021 10:34:18 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id A904B388F033; Sun, 11 Apr 2021 00:34:12 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A904B388F033 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1618101252; bh=kISwhFR27qLyPSc2uCzBL5BOr9D/Ozpx6JBv63Jv4Sc=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=lcvgMxVkjf4kzR69Z9LP5ExBDx5EsKywmRFdKqa9Z57xzhxtMkoCsCEdsVLdEjL3k D43OR/EdkTd4WnbQ7dYxz5WP/tRIIr9M9Xh82u51gV7a4sdcjuphRmt/Uog2tDgFdD Q1nfDIzQ84OvFPeH3Pp1Y16dI99apGz7Qr/PsjvY= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wr1-x42d.google.com (mail-wr1-x42d.google.com [IPv6:2a00:1450:4864:20::42d]) by sourceware.org (Postfix) with ESMTPS id 67233388F030; Sun, 11 Apr 2021 00:34:09 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 67233388F030 Received: by mail-wr1-x42d.google.com with SMTP id s7so9113085wru.6; Sat, 10 Apr 2021 17:34:09 -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=kISwhFR27qLyPSc2uCzBL5BOr9D/Ozpx6JBv63Jv4Sc=; b=je4B3htlIUfLfzvm64RaOqDUZIOvXS892wCxwCFb771DhuoE+oZhMEwmZBb8o6/9gO OWn0RGyJ8hWShYyyXo7ioX8k/N4E28yyhlBcrMb3KxwxTnXs+GBwDZ5ONl4uIQOAClsA /rK3DEI+oPYGbMLz8h5g7ob9ks7x2/iOSZJM9mtie1e9TVsr3ESct/fk6W4cRsWvgGmM FihS3OOb1VfB7WvvDfo/DIy9HOFLljRiFYDQs2s/z5h8df47ncb0oCldRpXdxQxw9C4N LcrZh65ejGlchknH9Z5vO3S5/uqDxXDsXLXlWwZMpQfrXn3gd9sYbDdLYA9R0xN2hiMA fSpw== X-Gm-Message-State: AOAM53306ZMJe/mAd4JpfuNb2FuI5uuOJWApRtar+ZGBFWCsnnTxQ+Jf gKsqI/Gu7uiiiWeBDFPk+osvO5lxSAI= X-Google-Smtp-Source: ABdhPJyrGEB56SKwWRuFVKeZQBSX0N+1QsfOX9BOMz34vFGJfFOoR8JIHd/xEqA4BcQGlTmS1V61sw== X-Received: by 2002:adf:e48f:: with SMTP id i15mr24453979wrm.197.1618101248365; Sat, 10 Apr 2021 17:34:08 -0700 (PDT) Received: from ?IPv6:2001:8a0:7d5c:3000:9cb3:394b:9323:981? ([2001:8a0:7d5c:3000:9cb3:394b:9323:981]) by smtp.googlemail.com with ESMTPSA id f8sm9120324wmc.8.2021.04.10.17.34.07 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 10 Apr 2021 17:34:07 -0700 (PDT) To: fortran@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [Patch, fortran] PR fortran/84006, PR fortran/100027 - ICE on storage_size with polymorphic argument Message-ID: <94a7d760-138c-48e6-b6c8-0a4b91987b28@gmail.com> Date: Sun, 11 Apr 2021 00:34:07 +0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 Content-Language: en-US X-Spam-Status: No, score=-11.9 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@gcc.gnu.org Sender: "Gcc-patches" Hi All! Proposed patch to: PR84006 - [8/9/10/11 Regression] ICE in storage_size() with CLASS entity PR100027 - ICE on storage_size with polymorphic argument Patch tested only on x86_64-pc-linux-gnu. Add branch to if clause to handle polymorphic objects, not sure if I got all possible variations... Thank you very much. Best regards, José Rui Fortran: Fix ICE using storage_size intrinsic [PR84006, PR100027] gcc/fortran/ChangeLog: PR fortran/84006 PR fortran/100027 * trans-intrinsic.c (gfc_conv_intrinsic_storage_size): add if clause branch to handle polymorphic objects. gcc/testsuite/ChangeLog: PR fortran/84006 * gfortran.dg/PR84006.f90: New test. PR fortran/100027 * gfortran.dg/PR100027.f90: New test. diff --git a/gcc/fortran/trans-intrinsic.c b/gcc/fortran/trans-intrinsic.c index 5e53d1162fa..6536c121f2b 100644 --- a/gcc/fortran/trans-intrinsic.c +++ b/gcc/fortran/trans-intrinsic.c @@ -8353,10 +8353,16 @@ gfc_conv_intrinsic_storage_size (gfc_se *se, gfc_expr *expr) if (arg->ts.type == BT_CLASS) { if (arg->rank > 0) - tmp = gfc_class_vtab_size_get ( - GFC_DECL_SAVED_DESCRIPTOR (arg->symtree->n.sym->backend_decl)); + { + if (TREE_CODE (argse.expr) == COMPONENT_REF) + tmp = TREE_OPERAND (argse.expr, 0); + else + tmp = GFC_DECL_SAVED_DESCRIPTOR ( + arg->symtree->n.sym->backend_decl); + } else - tmp = gfc_class_vtab_size_get (TREE_OPERAND (argse.expr, 0)); + tmp = TREE_OPERAND (argse.expr, 0); + tmp = gfc_class_vtab_size_get (tmp); tmp = fold_convert (result_type, tmp); goto done; } diff --git a/gcc/testsuite/gfortran.dg/PR100027.f90 b/gcc/testsuite/gfortran.dg/PR100027.f90 new file mode 100644 index 00000000000..dc565872cac --- /dev/null +++ b/gcc/testsuite/gfortran.dg/PR100027.f90 @@ -0,0 +1,31 @@ +! { dg-do run } +! + +program foo_p + + implicit none + + integer, parameter :: n = 11 + + type :: foo_t + end type foo_t + + type, extends(foo_t) :: bar_t + end type bar_t + + class(*), pointer :: apu(:) + class(foo_t), pointer :: apf(:) + class(bar_t), pointer :: apb(:) + type(bar_t), target :: atb(n) + + integer :: m + + apu => atb + m = storage_size(apu) + apf => atb + m = storage_size(apf) + apb => atb + m = storage_size(apb) + +end program foo_p + diff --git a/gcc/testsuite/gfortran.dg/PR84006.f90 b/gcc/testsuite/gfortran.dg/PR84006.f90 new file mode 100644 index 00000000000..41e2161b6e5 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/PR84006.f90 @@ -0,0 +1,12 @@ +! { dg-do run } +! + +program p + type t + integer i + end type + integer rslt + class(t), allocatable :: t_alloc(:) + allocate (t_alloc(10), source=t(1)) + rslt = storage_size(t_alloc) +end program p