From patchwork Fri Jun 9 08:04:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Jelinek X-Patchwork-Id: 105355 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp784703vqr; Fri, 9 Jun 2023 01:05:23 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5W81tAyd3IxRVY248Ztf1CG4Rbq3WaFR1JdAl5R+dS5jEdZ0AueAY6HhDEJ8jRK9UrKi/e X-Received: by 2002:a17:906:4786:b0:94f:694e:b953 with SMTP id cw6-20020a170906478600b0094f694eb953mr925381ejc.59.1686297922931; Fri, 09 Jun 2023 01:05:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686297922; cv=none; d=google.com; s=arc-20160816; b=rl3yuepBCvFP5nvZenReJNnKK04brbofA2UujUFlXXQHMbo2TJTUGwrRxX68OTMi7I ufacL4kOXNAgqRHpjVZ/CO60CWO7N35nF+g9JKcJxGhx1PwMMFYKfRPysyPPZ1hYjy81 RZe+V8b1vhz6k/assno3a/sjJ/s4lyaSu3R9WCx/uqZSaG8ZLo385rn8kzBFhr+y2OMJ k+rEqhC/lAHFkpK1mP0WtCXlncWXefQxxt3BwHwma5yYKs9sABdHTDpu5ZPoe+UoCBPQ 12NPVYvxzkLaB2PfCM+wPbEzf0Oj0EnB5OGeIazCyG7y8LBUmDhKMjx5TRyjsZjB2AOT WuRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence :content-disposition:mime-version:message-id:subject:to:date :dmarc-filter:delivered-to:dkim-signature:dkim-filter; bh=Vs/uN65rDSAUM6ensyOdzYTklJiP3ZzO4SSRfl7FBZA=; b=Opj8MtBmVxsHjxE4cagWgDqID0MfHT5uwS9ky47ul8CEZr+KfJuhkNVPD1DfhfvkhB yl46bxfcrthqKWYc3m0y3pP1zHC4Z1ojyc7N6jSlWDh1909PrMJER/4GtCIolzd2pIbQ qOKyPH1yVshsCVQBxqAf+0olRt25R+RKOb4uc+QmRswZUDpT3U/FB1M3v4uoJT9exn/m xPRUIFp77L6qA+uaCl+mY0nsitfIMH7M6JUKlJtjSHHAZZDQRo9GWcbcIG/RmNpziaTA UVIr4Kx/4YTIblkrD6DIsCqKLIbA8SpLYr11mfhMYBJY9nGYKBGcPBgf0igPuE3Fs0Zj Ai5Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=lU+Fmsm6; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from sourceware.org (server2.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id uz7-20020a170907118700b0096a8202e209si1042041ejb.955.2023.06.09.01.05.22 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Jun 2023 01:05:22 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=lU+Fmsm6; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id BF752385696B for ; Fri, 9 Jun 2023 08:05:21 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org BF752385696B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1686297921; bh=Vs/uN65rDSAUM6ensyOdzYTklJiP3ZzO4SSRfl7FBZA=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=lU+Fmsm6JTaVdYa56awfZWp+fVKW4tSUuxIuSdUkx4b/6yOtMKcLgbZzlJlrZgE0x p7lhkbzPfCUdicZsECA3/pTER/ys3CzJy2iAad+PRRIM9liGFgQwDrGvPYlK69jFSl Ur1oOmNhO9MWUAFakEarw3pcGtwBMjEV3v7E5J3k= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id 408C03858D1E for ; Fri, 9 Jun 2023 08:04:38 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 408C03858D1E Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-564-d1HEudktOQeE7DHYoF0mGw-1; Fri, 09 Jun 2023 04:04:25 -0400 X-MC-Unique: d1HEudktOQeE7DHYoF0mGw-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7B44A3C0F365; Fri, 9 Jun 2023 08:04:25 +0000 (UTC) Received: from tucnak.zalov.cz (unknown [10.39.194.30]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3CE72492B0A; Fri, 9 Jun 2023 08:04:25 +0000 (UTC) Received: from tucnak.zalov.cz (localhost [127.0.0.1]) by tucnak.zalov.cz (8.17.1/8.17.1) with ESMTPS id 35984MAZ3618635 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Fri, 9 Jun 2023 10:04:23 +0200 Received: (from jakub@localhost) by tucnak.zalov.cz (8.17.1/8.17.1/Submit) id 35984MEJ3618634; Fri, 9 Jun 2023 10:04:22 +0200 Date: Fri, 9 Jun 2023 10:04:21 +0200 To: fortran@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed] fortran: Fix ICE on pr96024.f90 on big-endian hosts [PR96024] Message-ID: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Disposition: inline X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) 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: Jakub Jelinek via Gcc-patches From: Jakub Jelinek Reply-To: Jakub Jelinek Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768211530494294576?= X-GMAIL-MSGID: =?utf-8?q?1768211530494294576?= Hi! The pr96024.f90 testcase ICEs on big-endian hosts. The problem is that length->val.integer is accessed after checking length->expr_type == EXPR_CONSTANT, but it is a CHARACTER constant which uses length->val.character union member instead and on big-endian we end up reading constant 0x100000000 rather than some small number on little-endian and if target doesn't have enough memory for 4 times that (i.e. 16GB allocation), it ICEs. Fixed thusly, bootstrapped/regtested on {x86_64,i686,powerpc64le,aarch64,s390x}-linux, preapproved in bugzilla by Harald, committed to trunk and 13, 12, 11 and 10 release branches. 2023-06-09 Jakub Jelinek PR fortran/96024 * primary.cc (gfc_convert_to_structure_constructor): Only do constant string ctor length verification and truncation/padding if constant length has INTEGER type. Jakub --- gcc/fortran/primary.cc.jj 2023-05-20 15:31:09.183661713 +0200 +++ gcc/fortran/primary.cc 2023-06-08 11:49:39.354875373 +0200 @@ -3188,10 +3188,11 @@ gfc_convert_to_structure_constructor (gf goto cleanup; /* For a constant string constructor, make sure the length is - correct; truncate of fill with blanks if needed. */ + correct; truncate or fill with blanks if needed. */ if (this_comp->ts.type == BT_CHARACTER && !this_comp->attr.allocatable && this_comp->ts.u.cl && this_comp->ts.u.cl->length && this_comp->ts.u.cl->length->expr_type == EXPR_CONSTANT + && this_comp->ts.u.cl->length->ts.type == BT_INTEGER && actual->expr->ts.type == BT_CHARACTER && actual->expr->expr_type == EXPR_CONSTANT) {