From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-lf1-x135.google.com (mail-lf1-x135.google.com [IPv6:2a00:1450:4864:20::135]) by sourceware.org (Postfix) with ESMTPS id 5F6063858281; Wed, 20 Sep 2023 07:03:55 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 5F6063858281 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-lf1-x135.google.com with SMTP id 2adb3069b0e04-50325ce89e9so3727776e87.0; Wed, 20 Sep 2023 00:03:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1695193432; x=1695798232; darn=gcc.gnu.org; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=25voc7i3ae+PonofhDI99P8owcaqjYH00CHXepGuyZc=; b=Ir8QpG+Dkr5rzTZGhfpoWLScdwPI+iKLyldH7dM1wjMiULy9DzUke7i8MR9AIhIzAA ugppDxV783IrbEfgtFnX8XgD9r5H/ACIcs74SgFcfdjr/Cah/acgyfdc2YVFieo3xCwc kNbcfKDbsmfCAPi86KfvSUe6l7tyAiIFZ8G6+cvo3ujNSbYYM6qdGR+yfyazwR9m/6ij Fyj/gjpQNDciwrsFHxxiawM7rH34BdUDTffbYs5WY1O1jqDrOgoPiuDKXuQTxj8uuQa+ 95o9zjtC8+/BCjcn215cZ+NFllgAudIWrEvdai0lp9A0+L27YmQnb+ze+bayL9zLNOjR 62CQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695193432; x=1695798232; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=25voc7i3ae+PonofhDI99P8owcaqjYH00CHXepGuyZc=; b=eiESI6i7J5Jzbx6ZSchzlXpjSSbZhhLX75af2AbcSv0bUk4MrQiWjNQM72rk9wCkra vnzOWMBEsbMR7WSTwtwOVlsPpA1MBZ8jlaggP/Sdr+I2wS82UbJGmao2XHCCHg1MGt+l Kx4LoQPh/yHqqx7IUrl63gZbKIWmqdt++OPQRG4ScmFEJ6hIcRCnl+VbLRiJnWBv+jJm QisAOh5C6wKdcf27JqtTKQu8g1OYj4A/ZFw6kQi/8fdXvKgRpByPLRdxgRKem/SBdDa1 DYtqrMUqBH7+mOtYWhrACU9OE+sDcVyRwBudVr+R1/Rf3/bjReqDUfRBecuJ5Jwjklo2 Wnlw== X-Gm-Message-State: AOJu0Yz0BxhMPJYvrhZ8Z8hSdzCA5qvDZwWZXgK4fAsz8OmHk7p+Bj9D FgbXVYg9Ed1Ur70IQMC1OSEm/mCil0kwUUyI5Z0+UZRgqiU= X-Google-Smtp-Source: AGHT+IGx2Nj1A0Ny6y/0HCUlRgdsgL9+wWF5FewecphlNT60qAJrQUWB76DA/5t/RKkXerU/DpeTX9XdoD+9wMRKEnI= X-Received: by 2002:a05:6512:36d1:b0:503:3587:fd15 with SMTP id e17-20020a05651236d100b005033587fd15mr1285023lfs.61.1695193431921; Wed, 20 Sep 2023 00:03:51 -0700 (PDT) MIME-Version: 1.0 From: Paul Richard Thomas Date: Wed, 20 Sep 2023 08:03:39 +0100 Message-ID: Subject: [Patch, fortran] PR68155 - ICE on initializing character array in type (len_lhs <> len_rhs) To: "fortran@gcc.gnu.org" , gcc-patches Content-Type: multipart/mixed; boundary="00000000000056b4d20605c4fac2" X-Spam-Status: No, score=-6.5 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.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: --00000000000056b4d20605c4fac2 Content-Type: text/plain; charset="UTF-8" Hi All, This is a straightforward patch that is adequately explained by the ChangeLog. Regtests fine - OK for trunk? Cheers Paul Fortran: Pad mismatched charlens in component initializers [PR68155] 2023-09-20 Paul Thomas gcc/fortran PR fortran/68155 * decl.cc (fix_initializer_charlen): New function broken out of add_init_expr_to_sym. (add_init_expr_to_sym, build_struct): Call the new function. gcc/testsuite/ PR fortran/68155 * gfortran.dg/pr68155.f90: New test. --00000000000056b4d20605c4fac2 Content-Type: text/x-patch; charset="US-ASCII"; name="fix.diff" Content-Disposition: attachment; filename="fix.diff" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_lmredncr0 ZGlmZiAtLWdpdCBhL2djYy9mb3J0cmFuL2RlY2wuY2MgYi9nY2MvZm9ydHJhbi9kZWNsLmNjCmlu ZGV4IDgxODJlZjI5ZjQzLi40YTNjNWI4NmRlMCAxMDA2NDQKLS0tIGEvZ2NjL2ZvcnRyYW4vZGVj bC5jYworKysgYi9nY2MvZm9ydHJhbi9kZWNsLmNjCkBAIC0xOTYwLDYgKzE5NjAsNDUgQEAgZ2Zj X2ZyZWVfZW51bV9oaXN0b3J5ICh2b2lkKQogfQogCiAKKy8qIEZ1bmN0aW9uIHRvIGZpeCBpbml0 aWFsaXplciBjaGFyYWN0ZXIgbGVuZ3RoIGlmIHRoZSBsZW5ndGggb2YgdGhlCisgICBzeW1ib2wg b3IgY29tcG9uZW50IGlzIGNvbnN0YW50LiAgKi8KKworc3RhdGljIGJvb2wKK2ZpeF9pbml0aWFs aXplcl9jaGFybGVuIChnZmNfdHlwZXNwZWMgKnRzLCBnZmNfZXhwciAqaW5pdCkKK3sKKyAgaWYg KCFnZmNfc3BlY2lmaWNhdGlvbl9leHByICh0cy0+dS5jbC0+bGVuZ3RoKSkKKyAgICByZXR1cm4g ZmFsc2U7CisKKyAgaW50IGsgPSBnZmNfdmFsaWRhdGVfa2luZCAoQlRfSU5URUdFUiwgZ2ZjX2No YXJsZW5faW50X2tpbmQsIGZhbHNlKTsKKworICAvKiByZXNvbHZlX2NoYXJsZW4gd2lsbCBjb21w bGFpbiBsYXRlciBvbiBpZiB0aGUgbGVuZ3RoCisgICAgIGlzIHRvbyBsYXJnZS4gIEp1c3Qgc2tp cCB0aGUgaW5pdGlhbGl6YXRpb24gaW4gdGhhdCBjYXNlLiAgKi8KKyAgaWYgKG1wel9jbXAgKHRz LT51LmNsLT5sZW5ndGgtPnZhbHVlLmludGVnZXIsCisJICAgICAgIGdmY19pbnRlZ2VyX2tpbmRz W2tdLmh1Z2UpIDw9IDApCisgICAgeworICAgICAgSE9TVF9XSURFX0lOVCBsZW4KKwkJPSBnZmNf bXB6X2dldF9od2kgKHRzLT51LmNsLT5sZW5ndGgtPnZhbHVlLmludGVnZXIpOworCisgICAgICBp ZiAoaW5pdC0+ZXhwcl90eXBlID09IEVYUFJfQ09OU1RBTlQpCisJZ2ZjX3NldF9jb25zdGFudF9j aGFyYWN0ZXJfbGVuIChsZW4sIGluaXQsIC0xKTsKKyAgICAgIGVsc2UgaWYgKGluaXQtPmV4cHJf dHlwZSA9PSBFWFBSX0FSUkFZKQorCXsKKwkgIGdmY19jb25zdHJ1Y3RvciAqY29uczsKKworCSAg LyogQnVpbGQgYSBuZXcgY2hhcmxlbiB0byBwcmV2ZW50IHNpbXBsaWZpY2F0aW9uIGZyb20KKwkg ICAgIGRlbGV0aW5nIHRoZSBsZW5ndGggYmVmb3JlIGl0IGlzIHJlc29sdmVkLiAgKi8KKwkgIGlu aXQtPnRzLnUuY2wgPSBnZmNfbmV3X2NoYXJsZW4gKGdmY19jdXJyZW50X25zLCBOVUxMKTsKKwkg IGluaXQtPnRzLnUuY2wtPmxlbmd0aCA9IGdmY19jb3B5X2V4cHIgKHRzLT51LmNsLT5sZW5ndGgp OworCSAgY29ucyA9IGdmY19jb25zdHJ1Y3Rvcl9maXJzdCAoaW5pdC0+dmFsdWUuY29uc3RydWN0 b3IpOworCSAgZm9yICg7IGNvbnM7IGNvbnMgPSBnZmNfY29uc3RydWN0b3JfbmV4dCAoY29ucykp CisJICAgIGdmY19zZXRfY29uc3RhbnRfY2hhcmFjdGVyX2xlbiAobGVuLCBjb25zLT5leHByLCAt MSk7CisJfQorICAgIH0KKworICByZXR1cm4gdHJ1ZTsKK30KKworCiAvKiBGdW5jdGlvbiBjYWxs ZWQgYnkgdmFyaWFibGVfZGVjbCgpIHRoYXQgYWRkcyBhbiBpbml0aWFsaXphdGlvbgogICAgZXhw cmVzc2lvbiB0byBhIHN5bWJvbC4gICovCiAKQEAgLTIwNzMsNDAgKzIxMTIsMTAgQEAgYWRkX2lu aXRfZXhwcl90b19zeW0gKGNvbnN0IGNoYXIgKm5hbWUsIGdmY19leHByICoqaW5pdHAsIGxvY3Vz ICp2YXJfbG9jdXMpCiAJCQkJZ2ZjX2NvcHlfZXhwciAoaW5pdC0+dHMudS5jbC0+bGVuZ3RoKTsK IAkJfQogCSAgICB9Ci0JICAvKiBVcGRhdGUgaW5pdGlhbGl6ZXIgY2hhcmFjdGVyIGxlbmd0aCBh Y2NvcmRpbmcgc3ltYm9sLiAgKi8KLQkgIGVsc2UgaWYgKHN5bS0+dHMudS5jbC0+bGVuZ3RoLT5l eHByX3R5cGUgPT0gRVhQUl9DT05TVEFOVCkKLQkgICAgewotCSAgICAgIGlmICghZ2ZjX3NwZWNp ZmljYXRpb25fZXhwciAoc3ltLT50cy51LmNsLT5sZW5ndGgpKQotCQlyZXR1cm4gZmFsc2U7Ci0K LQkgICAgICBpbnQgayA9IGdmY192YWxpZGF0ZV9raW5kIChCVF9JTlRFR0VSLCBnZmNfY2hhcmxl bl9pbnRfa2luZCwKLQkJCQkJIGZhbHNlKTsKLQkgICAgICAvKiByZXNvbHZlX2NoYXJsZW4gd2ls bCBjb21wbGFpbiBsYXRlciBvbiBpZiB0aGUgbGVuZ3RoCi0JCSBpcyB0b28gbGFyZ2UuICBKdXN0 IHNrZWVwIHRoZSBpbml0aWFsaXphdGlvbiBpbiB0aGF0IGNhc2UuICAqLwotCSAgICAgIGlmICht cHpfY21wIChzeW0tPnRzLnUuY2wtPmxlbmd0aC0+dmFsdWUuaW50ZWdlciwKLQkJCSAgIGdmY19p bnRlZ2VyX2tpbmRzW2tdLmh1Z2UpIDw9IDApCi0JCXsKLQkJICBIT1NUX1dJREVfSU5UIGxlbgot CQkgICAgPSBnZmNfbXB6X2dldF9od2kgKHN5bS0+dHMudS5jbC0+bGVuZ3RoLT52YWx1ZS5pbnRl Z2VyKTsKLQotCQkgIGlmIChpbml0LT5leHByX3R5cGUgPT0gRVhQUl9DT05TVEFOVCkKLQkJICAg IGdmY19zZXRfY29uc3RhbnRfY2hhcmFjdGVyX2xlbiAobGVuLCBpbml0LCAtMSk7Ci0JCSAgZWxz ZSBpZiAoaW5pdC0+ZXhwcl90eXBlID09IEVYUFJfQVJSQVkpCi0JCSAgICB7Ci0JCSAgICAgIGdm Y19jb25zdHJ1Y3RvciAqYzsKLQotCQkgICAgICAvKiBCdWlsZCBhIG5ldyBjaGFybGVuIHRvIHBy ZXZlbnQgc2ltcGxpZmljYXRpb24gZnJvbQotCQkJIGRlbGV0aW5nIHRoZSBsZW5ndGggYmVmb3Jl IGl0IGlzIHJlc29sdmVkLiAgKi8KLQkJICAgICAgaW5pdC0+dHMudS5jbCA9IGdmY19uZXdfY2hh cmxlbiAoZ2ZjX2N1cnJlbnRfbnMsIE5VTEwpOwotCQkgICAgICBpbml0LT50cy51LmNsLT5sZW5n dGgKLQkJCT0gZ2ZjX2NvcHlfZXhwciAoc3ltLT50cy51LmNsLT5sZW5ndGgpOwotCi0JCSAgICAg IGZvciAoYyA9IGdmY19jb25zdHJ1Y3Rvcl9maXJzdCAoaW5pdC0+dmFsdWUuY29uc3RydWN0b3Ip OwotCQkJICAgYzsgYyA9IGdmY19jb25zdHJ1Y3Rvcl9uZXh0IChjKSkKLQkJCWdmY19zZXRfY29u c3RhbnRfY2hhcmFjdGVyX2xlbiAobGVuLCBjLT5leHByLCAtMSk7Ci0JCSAgICB9Ci0JCX0KLQkg ICAgfQorCSAgLyogVXBkYXRlIGluaXRpYWxpemVyIGNoYXJhY3RlciBsZW5ndGggYWNjb3JkaW5n IHRvIHN5bWJvbC4gICovCisJICBlbHNlIGlmIChzeW0tPnRzLnUuY2wtPmxlbmd0aC0+ZXhwcl90 eXBlID09IEVYUFJfQ09OU1RBTlQKKwkJICAgJiYgIWZpeF9pbml0aWFsaXplcl9jaGFybGVuICgm c3ltLT50cywgaW5pdCkpCisJICAgIHJldHVybiBmYWxzZTsKIAl9CiAKICAgICAgIGlmIChzeW0t PmF0dHIuZmxhdm9yID09IEZMX1BBUkFNRVRFUiAmJiBzeW0tPmF0dHIuZGltZW5zaW9uICYmIHN5 bS0+YXMKQEAgLTIzNjksNiArMjM3OCwxMyBAQCBidWlsZF9zdHJ1Y3QgKGNvbnN0IGNoYXIgKm5h bWUsIGdmY19jaGFybGVuICpjbCwgZ2ZjX2V4cHIgKippbml0LAogICBjLT5pbml0aWFsaXplciA9 ICppbml0OwogICAqaW5pdCA9IE5VTEw7CiAKKyAgLyogVXBkYXRlIGluaXRpYWxpemVyIGNoYXJh Y3RlciBsZW5ndGggYWNjb3JkaW5nIHRvIGNvbXBvbmVudC4gICovCisgIGlmIChjLT50cy50eXBl ID09IEJUX0NIQVJBQ1RFUiAmJiBjLT50cy51LmNsLT5sZW5ndGgKKyAgICAgICYmIGMtPnRzLnUu Y2wtPmxlbmd0aC0+ZXhwcl90eXBlID09IEVYUFJfQ09OU1RBTlQKKyAgICAgICYmIGMtPmluaXRp YWxpemVyICYmIGMtPmluaXRpYWxpemVyLT50cy50eXBlID09IEJUX0NIQVJBQ1RFUgorICAgICAg JiYgIWZpeF9pbml0aWFsaXplcl9jaGFybGVuICgmYy0+dHMsIGMtPmluaXRpYWxpemVyKSkKKyAg ICByZXR1cm4gZmFsc2U7CisKICAgYy0+YXMgPSAqYXM7CiAgIGlmIChjLT5hcyAhPSBOVUxMKQog ICAgIHsK --00000000000056b4d20605c4fac2 Content-Type: text/x-fortran; charset="US-ASCII"; name="pr68155.f90" Content-Disposition: attachment; filename="pr68155.f90" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_lmredz6l1 ISB7IGRnLWRvIHJ1biB9CiEKISBGaXggZm9yIFBSNjgxNTUgaW4gd2hpY2ggaW5pdGlhbGl6ZXJz IG9mIGNvbnN0YW50IGxlbmd0aCwgY2hhcmFjdGVyCiEgY29tcG9uZW50cyBvZiBkZXJpdmVkIHR5 cGVzIHdlcmUgbm90IGJlaW5nIHBhZGRlZCBpZiB0aGV5IHdlcmUgdG9vIHNob3J0LgohIE9yaWdp bmFsbHksIG1pc21hdGNoZWQgbGVuZ3RocyBjYXVzZWQgSUNFcy4gVGhpcyBzZWVtcyB0byBoYXZl IGJlZW4gZml4ZWQKISBpbiA5LWJyYW5jaC4KIQohIENvbnRyaWJ1dGVkIGJ5IEdlcmhhcmQgU3Rl aW5tZXR6ICA8Z2VyaGFyZC5zdGVpbm1ldHouZm9ydHJhbkB0LW9ubGluZS5kZT4KIQpwcm9ncmFt IHAKICBpbXBsaWNpdCBub25lCiAgdHlwZSB0CiAgICBjaGFyYWN0ZXIoMykgOjogYzEoMikgPSBb ICAgICAgICAgICAgICAgICAnYicsICdjJ10gICAgICAgICAgISBPSwogICAgY2hhcmFjdGVyKDMp IDo6IGMyKDIpID0gWyBjaGFyYWN0ZXIoMSkgOjogJ2InLCAnYyddIC8vICIiICAgICEgT0sKICAg IGNoYXJhY3RlcigzKSA6OiBjMygyKSA9IFsgICAgICAgICAgICAgICAgICdiJywgJ2MnXSAvLyAi IiAgICAhIHdhcyBub3QgcGFkZGVkCiAgICBjaGFyYWN0ZXIoMykgOjogYzQoMikgPSBbICAgICAg ICAgICAgICAgICAnJyAsICcnIF0gLy8gIiIgICAgISB3YXMgbm90IHBhZGRlZAogICAgY2hhcmFj dGVyKDMpIDo6IGM1KDIpID0gWyAgICAgICAgICAgICAgICAgJ2InLCAnYyddIC8vICdhJyAgICEg d2FzIG5vdCBwYWRkZWQKICAgIGNoYXJhY3RlcigzKSA6OiBjNigyKSA9IFsgICAgICAgICAgICAg ICAgICdiJywgJ2MnXSAvLyAnYXgnICAhIE9LCiAgICBjaGFyYWN0ZXIoMykgOjogYzcoMikgPSBb ICAgICAgICAgICAgICAgICAnYicsICdjJ10gLy8gJ2F4eScgISBPSyB0cmltbWVkCiAgZW5kIHR5 cGUgdAogIHR5cGUodCkgICAgICA6OiB6CiAgaWYgKHolYzEoMikgLm5lLiAnYyAgJykgc3RvcCAx CiAgaWYgKHolYzIoMikgLm5lLiAnYyAgJykgc3RvcCAyCiAgaWYgKHolYzMoMikgLm5lLiAnYyAg Jykgc3RvcCAzCiAgaWYgKHolYzQoMikgLm5lLiAnICAgJykgc3RvcCA0CiAgaWYgKHolYzUoMikg Lm5lLiAnY2EgJykgc3RvcCA1CiAgaWYgKHolYzYoMikgLm5lLiAnY2F4Jykgc3RvcCA2CiAgaWYg KHolYzcoMikgLm5lLiAnY2F4Jykgc3RvcCA3CmVuZAo= --00000000000056b4d20605c4fac2--