From patchwork Sat Jan 23 09:04:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Richard Thomas X-Patchwork-Id: 1430656 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=2620:52:3:1:0:246e:9693:128c; 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=QxGyggB0; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (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 4DN9FH0zMmz9sB4 for ; Sat, 23 Jan 2021 20:05:03 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id D40EB39B8C80; Sat, 23 Jan 2021 09:04:58 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D40EB39B8C80 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1611392698; bh=wl3V7a8mra44CO/uXcGjfYcFrNoetzxGnv6l+ctMU1s=; h=Date:Subject:To:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=QxGyggB0jcsCX1hH3q44j0OYacl6LtDjKhxC7b7lS/vZGwD++HXQhVxP0/yIvOa4s lS16OBCkcxucJsiH0vmyaHc/bjTfBO6cr5VfJJ+gChQSl6tQpDtdOYYWpPczbiU6pf tTTdsggk8uwj+rk8BBoddzq36K7q082XPu1uB31w= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-lf1-x12a.google.com (mail-lf1-x12a.google.com [IPv6:2a00:1450:4864:20::12a]) by sourceware.org (Postfix) with ESMTPS id 0DB30385800F; Sat, 23 Jan 2021 09:04:55 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 0DB30385800F Received: by mail-lf1-x12a.google.com with SMTP id p21so5826433lfu.11; Sat, 23 Jan 2021 01:04:54 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=pMbNbcSBjwkm5E5BH7h4emIDWgT9yMa0dkqCY8V6dZI=; b=IgR/qbeED3Lj7kAfBxbmocJw9oEs23y5wHTdopAYxIxyrst6VSAAYwHUeDfQGaDZ8b S5S2/81mFJ9R17GIOlaN63LoGfT6Vd77s6l2p8wosvsHG04tclGI9xEp1WzQk3iTeBPb en+GhmE3LLfAgtBoT9fwSh0jyUQzjoPuuDuwxkrvbqYMrr700PwEAa8ncc+BwWnSzuF5 3ttPKNEm10h2oUg0qttSrl8rnwniUabsCz45MGU8IH4XTpql/5vOI5MnaEOmq5oWdYzA 8i32WfsuEczk0HSmSvTS9q3Snc8ehzvNqA3gbZUlPqIKfFqEs8lfADoMg1pL8hskDRoT 1aLg== X-Gm-Message-State: AOAM530otUvoe7GfFU6u9+TWmD9V7I1M2mc2J9sMLuaRKUrMN96ZrNu+ XvherhYdluGGGk/V8v+ej1L8KB9aBT4qKoAR9ilHJ2NNOuZEhQ== X-Google-Smtp-Source: ABdhPJwWujtMRZR19r11QK0cms28e0Nzoxp0RWrOs7dW5gOQ9LO9ZZaetjl8Kie2Uxiqn0L1goQelNhwB7qjfFkt7oc= X-Received: by 2002:a19:7d2:: with SMTP id 201mr4003462lfh.518.1611392693282; Sat, 23 Jan 2021 01:04:53 -0800 (PST) MIME-Version: 1.0 Date: Sat, 23 Jan 2021 09:04:41 +0000 Message-ID: Subject: [Patch, fortran] PR98573 - Dynamic type lost on assignment To: "fortran@gcc.gnu.org" , gcc-patches X-Spam-Status: No, score=-9.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, HTML_MESSAGE, 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-Content-Filtered-By: Mailman/MimeDel 2.1.29 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: Paul Richard Thomas via Gcc-patches From: Paul Richard Thomas Reply-To: Paul Richard Thomas Errors-To: gcc-patches-bounces@gcc.gnu.org Sender: "Gcc-patches" This is a relatively obvious patch. The chunk in trans-array.c is not part of the fix for the PR but does suppress some of the bad dtype's that arise from allocation of class objects. The part in trans-stmt.c provides vptrs for all class allocations if the expression3 is available. Regtests on FC33/x86_64 Paul Fortran: Fix missing setting of vptrs in allocate statements [PR98573]. 2021-01-22 Paul Thomas gcc/fortran PR fortran/98573 * trans-array.c (gfc_array_init_size): If expr3 descriptor is present, use it for the type. * trans-stmt.c (gfc_trans_allocate): Use the expr3 vptr for all class allocations. gcc/testsuite/ PR fortran/98573 * gfortran.dg/associated_target_7.f90 : New test. diff --git a/gcc/fortran/trans-array.c b/gcc/fortran/trans-array.c index 4bd4db877bd..306c2de7be7 100644 --- a/gcc/fortran/trans-array.c +++ b/gcc/fortran/trans-array.c @@ -5540,7 +5540,13 @@ gfc_array_init_size (tree descriptor, int rank, int corank, tree * poffset, gfc_se se; int n; - type = TREE_TYPE (descriptor); + if (expr->ts.type == BT_CLASS + && expr3_desc != NULL_TREE + && GFC_DESCRIPTOR_TYPE_P (TREE_TYPE (expr3_desc))) + type = TREE_TYPE (expr3_desc); + else + type = TREE_TYPE (descriptor); + stride = gfc_index_one_node; offset = gfc_index_zero_node; diff --git a/gcc/fortran/trans-stmt.c b/gcc/fortran/trans-stmt.c index 547468f7648..2bd7fdf0f1c 100644 --- a/gcc/fortran/trans-stmt.c +++ b/gcc/fortran/trans-stmt.c @@ -6908,7 +6908,8 @@ gfc_trans_allocate (gfc_code * code) /* Set the vptr only when no source= is set. When source= is set, then the trans_assignment below will set the vptr. */ - if (al_vptr != NULL_TREE && (!code->expr3 || code->expr3->mold)) + if (al_vptr != NULL_TREE && (!code->expr3 || code->expr3->mold + || code->expr3->ts.type == BT_CLASS)) { if (expr3_vptr != NULL_TREE) /* The vtab is already known, so just assign it. */