From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-ed1-x529.google.com (mail-ed1-x529.google.com [IPv6:2a00:1450:4864:20::529]) by sourceware.org (Postfix) with ESMTPS id A403F385840A; Sat, 13 May 2023 23:23:51 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org A403F385840A 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-ed1-x529.google.com with SMTP id 4fb4d7f45d1cf-50bc570b4a3so20483286a12.1; Sat, 13 May 2023 16:23:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684020230; x=1686612230; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=dre9x3IV/wtfaEtbToyVfLoniK6q7RxUOHq+sVkHQqA=; b=q+hsvyqgZLqRj62EzaMpEl9SL+NAKd8cRahRQwuxRpcmvlKA5VJsW85yzp1WOzq90/ HUpFEUYkgH85xdTi4jbYYxiRNvtxfmsynj+lBP27WzUwcW0JgIk/Qy3aHvEKaYM1jv2g 95HRNFHl/2cZAHaCiHoVYVxvtsAZoAvaiP16+r7upya3/sdBIsHN++40B/SHWNP6ysJ2 u8PlIFkHz0tawwGCVSJOJIH06cK1uYgnFNYMj6dsKdrsExx+VNaLaY06XY0joe9isM1a xZFLz5KqGsCnLUoAbn6KQBl/DjQjfpkzYd0N8/lA/Ru2+i+HXewnL/XzlOXV3Li7AH1v aB4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684020230; x=1686612230; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=dre9x3IV/wtfaEtbToyVfLoniK6q7RxUOHq+sVkHQqA=; b=gG8BKGD2whfLJSxAYK+fa0hZ9xQkAnnZ8eJ8dXLiOn4n+ARX1+kkXt/iXu3GeTrGJF VqVEcF4o7llLLp9+Eze0tq/Wor8IEWLX5ns5AQvmkCqGCPgKxVkej+se9tyqXYq3FhE1 DF+SvM4GaVE9XEtegkkRDQrsZl3Je48zSeok8agiX5J9P5yWZqfXFiGUq6rxxZrVvEjY YgSn2x9nMGQuMSKYqyTQc/pqFPe8im2Mo7MAfN53W9UVdHUmnKCvJSra/CG9NtXEBCc+ v9zFGT48i4gWugfCak+XNr3J1I6TNGXVH0gY5exMihuq9dOEbPdQy8gc0qJvDdRPaLUI jxDg== X-Gm-Message-State: AC+VfDyURTJJ1wH4q16N2abih0CxeDgpYOx0422rK+zadHuoeb6OZNgh +EeNiO6xzyIkqRTdhJe1oSSIOUmJTCU= X-Google-Smtp-Source: ACHHUZ6v7AxjZuLrhKCiuQHcOfrCkWwwxEwCUA6oAW3Z3ccjcuZLIOxFD2kE2xxmpBf/HzIZjEnoFQ== X-Received: by 2002:a17:907:9816:b0:96a:77a2:bba with SMTP id ji22-20020a170907981600b0096a77a20bbamr10435437ejc.60.1684020229440; Sat, 13 May 2023 16:23:49 -0700 (PDT) Received: from nbbrfq ([2001:871:227:ce8b:afc3:c345:e1dd:564e]) by smtp.gmail.com with ESMTPSA id og16-20020a1709071dd000b0096637a19dcasm7326211ejc.4.2023.05.13.16.23.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 13 May 2023 16:23:48 -0700 (PDT) Received: from b by nbbrfq with local (Exim 4.96) (envelope-from ) id 1pxyaZ-001AmK-34; Sun, 14 May 2023 01:23:47 +0200 From: Bernhard Reutner-Fischer To: gcc-patches@gcc.gnu.org Cc: Bernhard Reutner-Fischer Subject: [PATCH 02/14] analyzer: use _P() defines from tree.h Date: Sun, 14 May 2023 01:23:09 +0200 Message-Id: <20230513232321.279733-3-rep.dot.nop@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230513232321.279733-1-rep.dot.nop@gmail.com> References: <20230513232321.279733-1-rep.dot.nop@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-9.6 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,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 List-Id: From: Bernhard Reutner-Fischer gcc/analyzer/ChangeLog: * region-model-manager.cc (get_code_for_cast): Use _P defines from tree.h. (region_model_manager::get_or_create_cast): Ditto. (region_model_manager::get_region_for_global): Ditto. * region-model.cc (region_model::get_lvalue_1): Ditto. * region.cc (decl_region::maybe_get_constant_value): Ditto. --- gcc/analyzer/region-model-manager.cc | 8 ++++---- gcc/analyzer/region-model.cc | 2 +- gcc/analyzer/region.cc | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gcc/analyzer/region-model-manager.cc b/gcc/analyzer/region-model-manager.cc index fab5bba15d5..3b95e432aba 100644 --- a/gcc/analyzer/region-model-manager.cc +++ b/gcc/analyzer/region-model-manager.cc @@ -507,7 +507,7 @@ get_code_for_cast (tree dst_type, tree src_type) if (!src_type) return NOP_EXPR; - if (TREE_CODE (src_type) == REAL_TYPE) + if (SCALAR_FLOAT_TYPE_P (src_type)) { if (TREE_CODE (dst_type) == INTEGER_TYPE) return FIX_TRUNC_EXPR; @@ -531,9 +531,9 @@ region_model_manager::get_or_create_cast (tree type, const svalue *arg) return arg; /* Don't attempt to handle casts involving vector types for now. */ - if (TREE_CODE (type) == VECTOR_TYPE + if (VECTOR_TYPE_P (type) || (arg->get_type () - && TREE_CODE (arg->get_type ()) == VECTOR_TYPE)) + && VECTOR_TYPE_P (arg->get_type ()))) return get_or_create_unknown_svalue (type); enum tree_code op = get_code_for_cast (type, arg->get_type ()); @@ -1410,7 +1410,7 @@ region_model_manager::get_region_for_label (tree label) const decl_region * region_model_manager::get_region_for_global (tree expr) { - gcc_assert (TREE_CODE (expr) == VAR_DECL); + gcc_assert (VAR_P (expr)); decl_region **slot = m_globals_map.get (expr); if (slot) diff --git a/gcc/analyzer/region-model.cc b/gcc/analyzer/region-model.cc index fb81d43f91b..3bb3df2f063 100644 --- a/gcc/analyzer/region-model.cc +++ b/gcc/analyzer/region-model.cc @@ -2092,7 +2092,7 @@ region_model::get_lvalue_1 (path_var pv, region_model_context *ctxt) const { gcc_assert (TREE_CODE (expr) == SSA_NAME || TREE_CODE (expr) == PARM_DECL - || TREE_CODE (expr) == VAR_DECL + || VAR_P (expr) || TREE_CODE (expr) == RESULT_DECL); int stack_index = pv.m_stack_depth; diff --git a/gcc/analyzer/region.cc b/gcc/analyzer/region.cc index a18bfa50d09..8f0eb569b33 100644 --- a/gcc/analyzer/region.cc +++ b/gcc/analyzer/region.cc @@ -1162,7 +1162,7 @@ decl_region::get_stack_depth () const const svalue * decl_region::maybe_get_constant_value (region_model_manager *mgr) const { - if (TREE_CODE (m_decl) == VAR_DECL + if (VAR_P (m_decl) && DECL_IN_CONSTANT_POOL (m_decl) && DECL_INITIAL (m_decl) && TREE_CODE (DECL_INITIAL (m_decl)) == CONSTRUCTOR) -- 2.30.2