From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr1-x429.google.com (mail-wr1-x429.google.com [IPv6:2a00:1450:4864:20::429]) by sourceware.org (Postfix) with ESMTPS id A8C783858407 for ; Tue, 14 Feb 2023 12:42:16 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org A8C783858407 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=adacore.com Received: by mail-wr1-x429.google.com with SMTP id o18so15519460wrj.3 for ; Tue, 14 Feb 2023 04:42:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=f0Sl3YHe17yP9v4aYWUhcLamLTwegp80dxiVmNZHw9k=; b=aSB9Vr7cGnWqblVXIe7cDqVM0EvC0AjkxGD/KwddUAaS3H8WP+2pz4Zf86OPg3r6R7 cl0o6hLoy5MdCeqprPBhnzadtYuGQRp3FRjPBCafa/3UjtLjCgogGw/7gq0LwGg7hEkC nAn3jX63LivqAnZQ4/M1eQnNoTqZrNx1EFbHWrdWVjO9cBs7INanuFJhstb5TTjmYxxU Vu/2gE39GlqR5vL7M2b+WJPGg+ykgkc3ZaBr2hEZ6Jw4Tpb4/lIRWvT0v7YvolHo/U3J o1uhvClOtGCp1KiBfJsVETypV7HeuqSLfQs1QTgfduZYGpz020snVTQozV9i5o1e2zZr L0pw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=f0Sl3YHe17yP9v4aYWUhcLamLTwegp80dxiVmNZHw9k=; b=6swbTBVKTdZpeQ4u03j3DGxm2B8/BZ2bGPWwoMu0YFFDuTX196zsFLM1KXHWEDn/XT 7tUmPdJb6z6WHJHgXb8bY3AL36suVvHTUk6xOUWzyrOQWkCkm+fFG/Rq5jbZA+upArby lvzrG+Hdzzcp1HkL2yMXRWVbackpEUVKH2L0Wfza29bHZrnueDx++B/Z3mUW46i/VJGZ 2/XlVieKu9HfYdBDh/D1vkNowagiTO6RFBvyahh1VM9dUH9Va9VD5yG72i4E+GIs0bew I0klERlvDqP3EWgLJVv8gxDPaR5HhYqZ62GRXeedtDHyWcm0bwjjKWWTaiDGt8eL8FHY HalQ== X-Gm-Message-State: AO0yUKUjKt/i8mJWe/QkPFr8Nw811dUqikOx1ksVeviamn3DNmG60SxD sDxE+LuiBhmNEvqf21NKZEwYHalx92wB5/gg X-Google-Smtp-Source: AK7set95ByD0iE2kIuzGNKh+FHZDcHEj2/hWGJHWYk+SIZZ0Ogk0nm5aewvX1kvf7mki6eGmDy4jUQ== X-Received: by 2002:a5d:6310:0:b0:2c4:459:48cb with SMTP id i16-20020a5d6310000000b002c4045948cbmr1934126wru.39.1676378535291; Tue, 14 Feb 2023 04:42:15 -0800 (PST) Received: from fomalhaut.localnet ([2a01:e0a:8d5:d990:e654:e8ff:fe8f:2ce6]) by smtp.gmail.com with ESMTPSA id l2-20020a5d6742000000b002c55cdb1de5sm3893611wrw.116.2023.02.14.04.42.14 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Feb 2023 04:42:14 -0800 (PST) From: Eric Botcazou X-Google-Original-From: Eric Botcazou To: gcc-patches@gcc.gnu.org Subject: [PATCH] Fix small regression in Ada Date: Tue, 14 Feb 2023 13:42:14 +0100 Message-ID: <3481520.iIbC2pHGDl@fomalhaut> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="nextPart9065062.CDJkKcVGEf" Content-Transfer-Encoding: 7Bit X-Spam-Status: No, score=-10.6 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,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: This is a multi-part message in MIME format. --nextPart9065062.CDJkKcVGEf Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" It is present on the mainline and 12 branch and comes from Andrew P. and me forgetting about the VOID_TYPE_P case of SAVE_EXPRs. Tested on x86-64/Linux, applied on mainline and 12 branch as obvious. 2023-02-14 Eric Botcazou gcc/ * gimplify.cc (gimplify_save_expr): Add missing guard. gcc/ada/ * gcc-interface/trans.cc (gnat_gimplify_expr): Add missing guard. 2023-02-14 Eric Botcazou * gnat.dg/shift2.adb: New test. -- Eric Botcazou --nextPart9065062.CDJkKcVGEf Content-Disposition: attachment; filename="p.diff" Content-Transfer-Encoding: 7Bit Content-Type: text/x-patch; charset="UTF-8"; name="p.diff" diff --git a/gcc/ada/gcc-interface/trans.cc b/gcc/ada/gcc-interface/trans.cc index 28e3867d142..5fc1a26fede 100644 --- a/gcc/ada/gcc-interface/trans.cc +++ b/gcc/ada/gcc-interface/trans.cc @@ -9049,7 +9049,9 @@ gnat_gimplify_expr (tree *expr_p, gimple_seq *pre_p, /* Propagate TREE_NO_WARNING from expression to temporary by using the SAVE_EXPR itself as an intermediate step. See gimplify_save_expr. */ - if (SAVE_EXPR_RESOLVED_P (expr)) + if (type == void_type_node) + ; + else if (SAVE_EXPR_RESOLVED_P (expr)) TREE_NO_WARNING (op) = TREE_NO_WARNING (expr); else TREE_NO_WARNING (expr) = TREE_NO_WARNING (op); diff --git a/gcc/gimplify.cc b/gcc/gimplify.cc index 1b362dd83e3..96845154a92 100644 --- a/gcc/gimplify.cc +++ b/gcc/gimplify.cc @@ -6441,7 +6441,7 @@ gimplify_save_expr (tree *expr_p, gimple_seq *pre_p, gimple_seq *post_p) gcc_assert (TREE_CODE (*expr_p) == SAVE_EXPR); val = TREE_OPERAND (*expr_p, 0); - if (TREE_TYPE (val) == error_mark_node) + if (val && TREE_TYPE (val) == error_mark_node) return GS_ERROR; /* If the SAVE_EXPR has not been resolved, then evaluate it once. */ --nextPart9065062.CDJkKcVGEf Content-Disposition: attachment; filename="shift2.adb" Content-Transfer-Encoding: 7Bit Content-Type: text/x-adasrc; charset="UTF-8"; name="shift2.adb" -- { dg-do compile } with Interfaces; use Interfaces; function Shift2 (V : Unsigned_32) return Unsigned_32 is begin return Shift_Left (V, (case V is when 0 => 1, when others => 0)); end; --nextPart9065062.CDJkKcVGEf--