From patchwork Thu May 19 14:16:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre-Marie de Rodat X-Patchwork-Id: 54232 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 5C35D3838035 for ; Thu, 19 May 2022 14:42:58 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5C35D3838035 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1652971378; bh=hf6Td5590pzf4UtR45FmeZNFrH64bHb3Uw5md66pkh8=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=L+SlAuP4C+qwOJ7KCCNvyHgwhvdKce1wvNPS1jvtwwJUe/6aadyT0/poGo9Izt7y9 4u+hUkQ/qtUPOBQNMHUoBE3v15qFUF6N39EzpvbueVKYbdFkDuW7Fief35YlOkqzVn SVZw9QO0X8KC81UFyz1bzVUcNBdRUc3xb6j3+GGU= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wr1-x42f.google.com (mail-wr1-x42f.google.com [IPv6:2a00:1450:4864:20::42f]) by sourceware.org (Postfix) with ESMTPS id 05344383E83F for ; Thu, 19 May 2022 14:16:31 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 05344383E83F Received: by mail-wr1-x42f.google.com with SMTP id k30so7382449wrd.5 for ; Thu, 19 May 2022 07:16:30 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version :content-disposition; bh=hf6Td5590pzf4UtR45FmeZNFrH64bHb3Uw5md66pkh8=; b=rLNpkM0R9elD597OEI+3r1BANV0VSOBzRtAZ8xwhFwjQqdsDy4ClsykY3ZM16bPDIs wcxa4dA38ZE17TpghDmAt9Au12aw355UpmXptR5g32COfnodRWQI/svSV4dN0DYRMhbo FLr8uDaJVck5V3ZU4RXYrfwGAlalhaHaPqm4pLUKNE3anY8g06t65qwu5EiJwgNPTWSP 11s117uQlPDIW/FLbzJ6Qr1tkekSurn4zteCEwgcFdimmTX/Jg8jf8nNhicGnmwgFfr+ +aRkHx83drWsr+1o9oQVwKyoZmd6R5W895MNs4Wm1+XCDegRUwnhPGgc2zfIgTEpzKsE Gt6A== X-Gm-Message-State: AOAM532IXW+CL7sVcB8UInUGgDlkuvB9m/klr1QfRZSYuEHnozBkjHOZ VFgdHgRd3YaovopJGSki/hKohB1i8fCVwQ== X-Google-Smtp-Source: ABdhPJyqfEBdS9PTfTYdq44TFOw0Z3w3+jpgK6BUR8QlF7eEEKwHIvn3QCiD7EksBcqteqHPcBmC/g== X-Received: by 2002:adf:dc0e:0:b0:20c:8a3f:b523 with SMTP id t14-20020adfdc0e000000b0020c8a3fb523mr4308481wri.201.1652969790536; Thu, 19 May 2022 07:16:30 -0700 (PDT) Received: from adacore.com ([45.147.211.82]) by smtp.gmail.com with ESMTPSA id g7-20020a5d64e7000000b0020c5253d914sm5404514wri.96.2022.05.19.07.16.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 May 2022 07:16:29 -0700 (PDT) Date: Thu, 19 May 2022 14:16:29 +0000 To: gcc-patches@gcc.gnu.org Subject: [Ada] Small housekeeping work in gnat_gimplify_expr Message-ID: <20220519141629.GA3723581@adacore.com> MIME-Version: 1.0 Content-Disposition: inline X-Spam-Status: No, score=-13.3 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, 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: Pierre-Marie de Rodat via Gcc-patches From: Pierre-Marie de Rodat Reply-To: Pierre-Marie de Rodat Cc: Eric Botcazou Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" This alphabetizes the large switch statement, removes a useless nested switch statement, an artificial fall through and adds a default return. No functional changes. Tested on x86_64-pc-linux-gnu, committed on trunk gcc/ada/ * gcc-interface/trans.cc (gnat_gimplify_expr): Tidy up. diff --git a/gcc/ada/gcc-interface/trans.cc b/gcc/ada/gcc-interface/trans.cc --- a/gcc/ada/gcc-interface/trans.cc +++ b/gcc/ada/gcc-interface/trans.cc @@ -8638,30 +8638,6 @@ gnat_gimplify_expr (tree *expr_p, gimple_seq *pre_p, switch (TREE_CODE (expr)) { - case NULL_EXPR: - /* If this is an aggregate type, build a null pointer of the appropriate - type and dereference it. */ - if (AGGREGATE_TYPE_P (type) - || TREE_CODE (type) == UNCONSTRAINED_ARRAY_TYPE) - *expr_p = build_unary_op (INDIRECT_REF, NULL_TREE, - convert (build_pointer_type (type), - integer_zero_node)); - /* Otherwise, just make a VAR_DECL. */ - else - { - *expr_p = create_tmp_var (type, NULL); - suppress_warning (*expr_p); - } - - gimplify_and_add (TREE_OPERAND (expr, 0), pre_p); - return GS_OK; - - case UNCONSTRAINED_ARRAY_REF: - /* We should only do this if we are just elaborating for side-effects, - but we can't know that yet. */ - *expr_p = TREE_OPERAND (*expr_p, 0); - return GS_OK; - case ADDR_EXPR: op = TREE_OPERAND (expr, 0); @@ -8695,8 +8671,7 @@ gnat_gimplify_expr (tree *expr_p, gimple_seq *pre_p, else op = inner; } - - return GS_UNHANDLED; + break; case CALL_EXPR: /* If we are passing a constant fat pointer CONSTRUCTOR, make sure it is @@ -8720,8 +8695,62 @@ gnat_gimplify_expr (tree *expr_p, gimple_seq *pre_p, *(CALL_EXPR_ARGP (expr) + i) = tree_output_constant_def (arg); } } + break; + + case DECL_EXPR: + op = DECL_EXPR_DECL (expr); + + /* The expressions for the RM bounds must be gimplified to ensure that + they are properly elaborated. See gimplify_decl_expr. */ + if ((TREE_CODE (op) == TYPE_DECL || TREE_CODE (op) == VAR_DECL) + && !TYPE_SIZES_GIMPLIFIED (TREE_TYPE (op)) + && (INTEGRAL_TYPE_P (TREE_TYPE (op)) + || SCALAR_FLOAT_TYPE_P (TREE_TYPE (op)))) + { + tree type = TYPE_MAIN_VARIANT (TREE_TYPE (op)), t, val; + + val = TYPE_RM_MIN_VALUE (type); + if (val) + { + gimplify_one_sizepos (&val, pre_p); + for (t = type; t; t = TYPE_NEXT_VARIANT (t)) + SET_TYPE_RM_MIN_VALUE (t, val); + } + + val = TYPE_RM_MAX_VALUE (type); + if (val) + { + gimplify_one_sizepos (&val, pre_p); + for (t = type; t; t = TYPE_NEXT_VARIANT (t)) + SET_TYPE_RM_MAX_VALUE (t, val); + } + } + break; + + case NULL_EXPR: + /* If this is an aggregate type, build a null pointer of the appropriate + type and dereference it. */ + if (AGGREGATE_TYPE_P (type) + || TREE_CODE (type) == UNCONSTRAINED_ARRAY_TYPE) + *expr_p = build_unary_op (INDIRECT_REF, NULL_TREE, + convert (build_pointer_type (type), + integer_zero_node)); + + /* Otherwise, just make a VAR_DECL. */ + else + { + *expr_p = create_tmp_var (type, NULL); + suppress_warning (*expr_p); + } - return GS_UNHANDLED; + gimplify_and_add (TREE_OPERAND (expr, 0), pre_p); + return GS_OK; + + case UNCONSTRAINED_ARRAY_REF: + /* We should only do this if we are just elaborating for side effects, + but we can't know that yet. */ + *expr_p = TREE_OPERAND (*expr_p, 0); + return GS_OK; case VIEW_CONVERT_EXPR: op = TREE_OPERAND (expr, 0); @@ -8742,53 +8771,13 @@ gnat_gimplify_expr (tree *expr_p, gimple_seq *pre_p, TREE_OPERAND (expr, 0) = new_var; return GS_OK; } - - return GS_UNHANDLED; - - case DECL_EXPR: - op = DECL_EXPR_DECL (expr); - - /* The expressions for the RM bounds must be gimplified to ensure that - they are properly elaborated. See gimplify_decl_expr. */ - if ((TREE_CODE (op) == TYPE_DECL || TREE_CODE (op) == VAR_DECL) - && !TYPE_SIZES_GIMPLIFIED (TREE_TYPE (op))) - switch (TREE_CODE (TREE_TYPE (op))) - { - case INTEGER_TYPE: - case ENUMERAL_TYPE: - case BOOLEAN_TYPE: - case REAL_TYPE: - { - tree type = TYPE_MAIN_VARIANT (TREE_TYPE (op)), t, val; - - val = TYPE_RM_MIN_VALUE (type); - if (val) - { - gimplify_one_sizepos (&val, pre_p); - for (t = type; t; t = TYPE_NEXT_VARIANT (t)) - SET_TYPE_RM_MIN_VALUE (t, val); - } - - val = TYPE_RM_MAX_VALUE (type); - if (val) - { - gimplify_one_sizepos (&val, pre_p); - for (t = type; t; t = TYPE_NEXT_VARIANT (t)) - SET_TYPE_RM_MAX_VALUE (t, val); - } - - } - break; - - default: - break; - } - - /* ... fall through ... */ + break; default: - return GS_UNHANDLED; + break; } + + return GS_UNHANDLED; } /* Generate GIMPLE in place for the statement at *STMT_P. */