From patchwork Tue Nov 15 16:26:58 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Vehreschild X-Patchwork-Id: 82366 Delivered-To: patch@linaro.org Received: by 10.140.97.165 with SMTP id m34csp1614258qge; Tue, 15 Nov 2016 08:27:53 -0800 (PST) X-Received: by 10.99.65.65 with SMTP id o62mr55400995pga.73.1479227273830; Tue, 15 Nov 2016 08:27:53 -0800 (PST) Return-Path: Received: from sourceware.org (server1.sourceware.org. [209.132.180.131]) by mx.google.com with ESMTPS id f8si1786605pgc.288.2016.11.15.08.27.53 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 15 Nov 2016 08:27:53 -0800 (PST) Received-SPF: pass (google.com: domain of gcc-patches-return-441494-patch=linaro.org@gcc.gnu.org designates 209.132.180.131 as permitted sender) client-ip=209.132.180.131; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org; spf=pass (google.com: domain of gcc-patches-return-441494-patch=linaro.org@gcc.gnu.org designates 209.132.180.131 as permitted sender) smtp.mailfrom=gcc-patches-return-441494-patch=linaro.org@gcc.gnu.org DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :from:to:subject:message-id:mime-version:content-type; q=dns; s= default; b=EAcwwEhQMbG/sRdaPtEfByGhpC0VPte/0dQBr+Vnn0Kwn/NRIM5Nb URwiqgyY7eRpZgTlanUWsnA5rLCkzsrSzo9w+o7r21UPue+F+H0gk3dOzXPT6tRk FfxcPa4V7dGN0YARGe1SmKi5ZyyFv/lbC+ULsdiKp7CWyhHAfLiZMc= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :from:to:subject:message-id:mime-version:content-type; s= default; bh=rse2jsHkfQJULwFBVBsrTozwBFo=; b=gxXujm0xCGVgfuRf5dgE 6phAIbRAG6XzI8FBSoL9gtp6VgdrXTjUW+JmMDekfDpqKz78wA6eTrfzHeyEpjlu gK3YME6NXj8uvzkQaijmeT7yB+SyWVo5az7/5ODf4lvnuIfMI5Gs/62TbB7z+K2r t5wlFHMIU3+eLufawwQZDbQ= Received: (qmail 89529 invoked by alias); 15 Nov 2016 16:27:32 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 89507 invoked by uid 89); 15 Nov 2016 16:27:31 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.3 required=5.0 tests=AWL, BAYES_05, FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.2 spammy=formerly, UD:allocatable, attr.dimension, UD:attr.dimension X-Spam-User: qpsmtpd, 2 recipients X-HELO: mout.gmx.net Received: from mout.gmx.net (HELO mout.gmx.net) (212.227.17.22) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 15 Nov 2016 16:27:21 +0000 Received: from vepi2 ([92.76.205.227]) by mail.gmx.com (mrgmx103 [212.227.17.168]) with ESMTPSA (Nemesis) id 0McEDD-1cOcXC3ztP-00Jc3i; Tue, 15 Nov 2016 17:27:18 +0100 Date: Tue, 15 Nov 2016 17:26:58 +0100 From: Andre Vehreschild To: GCC-Patches-ML , GCC-Fortran-ML Subject: [PATCH, Fortran, pr78356, v1] [7 Regression] [OOP] segfault allocating polymorphic variable with polymorphic component with allocatable component Message-ID: <20161115172658.5608e616@vepi2> MIME-Version: 1.0 X-UI-Out-Filterresults: notjunk:1; V01:K0:aD6PFupxg64=:FyrFiftlyO9p+2Zn+rzmpN JCD5kCgg7+828CkzPMDOFf3woO4bjffJskQ6saERbJUXqGJzGmYV2i8ljsBnwaxlDJyRehDeE NOzP6fh3nqIcjKMxeZvRdKoMEvvnpsHUu1oPQNgr11iqQLXQoFbGxqAk1c8s0skDmGaqdxLjv T9bloXWy/DDYP543qo7+KWh+JsxRAHo+8tX6S7LJT5m62wLqAekyLNK+MFU0jfOcOOFGgWD4m gZGjZOog38ciQs3WzBKrjkEVHY/pBucBzm9bBoe0XlTTmVztBeWgGVGQTZCrAiBw+yYVPeR5f EnF0Kdvk+vbgoux5iPYmbIKgMiiJZB/SwfeJs+l/0DaOkiyQ0ucnbGlRy7npzLip4clMfldmm 4Yk830RzFrHZsF6j6QIRi0V4ipldCNKyO2GkSKON5G0EdffCLNCdYAilt1xKqSgEUWiAyg93C 5sdARf1SUoVsY6b3qjP5s2Pd1VfaFujRIQ31mH/qqSqd8JbEwGARvj90JNT1CoVTbNCT8Q7ZD Dzw5IpFqUYgRg8gYVJLb1ONypt19M3GtILSNb/fH+F7YBjjNF/ho0asLCDZJmb3CF0jlNEe0A OZ64t/lMLxgWckr0iXS929M7HrX5XuTuQkDi1WpXKlzud5TUb7xr/2o0FgtXAAmQD3l8DGK8w tXxZON+/T8M1r1qQ6WSiXAKdhiU+9Deic4Vqms5BJWZDAb2sN63pizHtOTFcSIRKS7ODO+Uns sgJd+pSaUhrc0d8x5Wo8bFiULtRRxNd1s6Jw0WqDJ45HP1ui/wrPDf6UUrM= Hi all, attached patch fixes the issue raised. The issue here was, that a copy of the base class was generated and its address passed to the _vptr->copy()-method, which then accessed memory, that was not present in the copy being an object of the base class. The patch fixes this by making sure the temporary handle is a pointer to the data to copy. Sorry, when that is not clear. I am not feeling so well today. So here in terms of pseudo code. This code was formerly generated: struct ac {}; struct a : struct ac { integer *i; }; a src, dst; ac temp; temp = src; // temp is now only a copy of ac _vptr.copy(&temp, &dst); // temp does not denote memory having a pointer to i After the patch, this code is generated: // types as above a src, dst; ac *temp; // !!! Now a pointer temp = &src; _vptr.copy(temp, &dst); // temp now points to memory that has a pointer to i // and is valid for copying. Bootstraps and regtests ok on x86_64-linux/F23. Ok for trunk? Regards, Andre -- Andre Vehreschild * Email: vehre ad gmx dot de gcc/fortran/ChangeLog: 2016-11-15 Andre Vehreschild PR fortran/78356 * class.c (gfc_is_class_scalar_expr): Prevent taking an array ref for a component ref. * trans-expr.c (gfc_trans_assignment_1): Ensure a reference to the object to copy is generated, when assigning class objects. gcc/testsuite/ChangeLog: 2016-11-15 Andre Vehreschild PR fortran/78356 * gfortran.dg/class_allocate_23.f08: New test. diff --git a/gcc/fortran/class.c b/gcc/fortran/class.c index b42ec40..9db86b4 100644 --- a/gcc/fortran/class.c +++ b/gcc/fortran/class.c @@ -378,7 +378,8 @@ gfc_is_class_scalar_expr (gfc_expr *e) && CLASS_DATA (e->symtree->n.sym) && !CLASS_DATA (e->symtree->n.sym)->attr.dimension && (e->ref == NULL - || (strcmp (e->ref->u.c.component->name, "_data") == 0 + || (e->ref->type == REF_COMPONENT + && strcmp (e->ref->u.c.component->name, "_data") == 0 && e->ref->next == NULL))) return true; @@ -390,7 +391,8 @@ gfc_is_class_scalar_expr (gfc_expr *e) && CLASS_DATA (ref->u.c.component) && !CLASS_DATA (ref->u.c.component)->attr.dimension && (ref->next == NULL - || (strcmp (ref->next->u.c.component->name, "_data") == 0 + || (ref->next->type == REF_COMPONENT + && strcmp (ref->next->u.c.component->name, "_data") == 0 && ref->next->next == NULL))) return true; } diff --git a/gcc/fortran/trans-expr.c b/gcc/fortran/trans-expr.c index 48296b8..1331b07 100644 --- a/gcc/fortran/trans-expr.c +++ b/gcc/fortran/trans-expr.c @@ -9628,6 +9628,7 @@ gfc_trans_assignment_1 (gfc_expr * expr1, gfc_expr * expr2, bool init_flag, int n; bool maybe_workshare = false; symbol_attribute lhs_caf_attr, rhs_caf_attr, lhs_attr; + bool is_poly_assign; /* Assignment of the form lhs = rhs. */ gfc_start_block (&block); @@ -9648,6 +9649,19 @@ gfc_trans_assignment_1 (gfc_expr * expr1, gfc_expr * expr2, bool init_flag, || gfc_is_alloc_class_scalar_function (expr2))) expr2->must_finalize = 1; + /* Checking whether a class assignment is desired is quite complicated and + needed at two locations, so do it once only before the information is + needed. */ + lhs_attr = gfc_expr_attr (expr1); + is_poly_assign = (use_vptr_copy || lhs_attr.pointer + || (lhs_attr.allocatable && !lhs_attr.dimension)) + && (expr1->ts.type == BT_CLASS + || gfc_is_class_array_ref (expr1, NULL) + || gfc_is_class_scalar_expr (expr1) + || gfc_is_class_array_ref (expr2, NULL) + || gfc_is_class_scalar_expr (expr2)); + + /* Only analyze the expressions for coarray properties, when in coarray-lib mode. */ if (flag_coarray == GFC_FCOARRAY_LIB) @@ -9676,6 +9690,10 @@ gfc_trans_assignment_1 (gfc_expr * expr1, gfc_expr * expr2, bool init_flag, if (rss == gfc_ss_terminator) /* The rhs is scalar. Add a ss for the expression. */ rss = gfc_get_scalar_ss (gfc_ss_terminator, expr2); + /* When doing a class assign, then the handle to the rhs needs to be a + pointer to allow for polymorphism. */ + if (is_poly_assign && expr2->rank == 0 && !UNLIMITED_POLY (expr2)) + rss->info->type = GFC_SS_REFERENCE; /* Associate the SS with the loop. */ gfc_add_ss_to_loop (&loop, lss); @@ -9835,14 +9853,7 @@ gfc_trans_assignment_1 (gfc_expr * expr1, gfc_expr * expr2, bool init_flag, gfc_add_block_to_block (&loop.post, &rse.post); } - lhs_attr = gfc_expr_attr (expr1); - if ((use_vptr_copy || lhs_attr.pointer - || (lhs_attr.allocatable && !lhs_attr.dimension)) - && (expr1->ts.type == BT_CLASS - || (gfc_is_class_array_ref (expr1, NULL) - || gfc_is_class_scalar_expr (expr1)) - || (gfc_is_class_array_ref (expr2, NULL) - || gfc_is_class_scalar_expr (expr2)))) + if (is_poly_assign) { tmp = trans_class_assignment (&body, expr1, expr2, &lse, &rse, use_vptr_copy || (lhs_attr.allocatable diff --git a/gcc/testsuite/gfortran.dg/class_allocate_23.f08 b/gcc/testsuite/gfortran.dg/class_allocate_23.f08 new file mode 100644 index 0000000..5c83fbe --- /dev/null +++ b/gcc/testsuite/gfortran.dg/class_allocate_23.f08 @@ -0,0 +1,31 @@ +! { dg-do run } +! +! Test that pr78356 is fixed. +! Contributed by Janus Weil and Andrew Benson + +program p + implicit none + type ac + end type + type, extends(ac) :: a + integer, allocatable :: b + end type + type n + class(ac), allocatable :: acr(:) + end type + type(n) :: s,t + allocate(a :: s%acr(1)) + call nncp(s,t) + select type (cl => t%acr(1)) + class is (a) + if (allocated(cl%b)) error stop + class default + error stop + end select +contains + subroutine nncp(self,tg) + type(n) :: self, tg + allocate(tg%acr(1),source=self%acr(1)) + end +end +