From patchwork Wed Nov 30 01:07:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Malcolm X-Patchwork-Id: 61242 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 79BDF385842A for ; Wed, 30 Nov 2022 01:07:59 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 79BDF385842A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1669770479; bh=uBYjheCNWNzV1sgAJR2opxopK87piErvay8ni8BBaU4=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=VLpedh1DYzJZLCQfFZmOULC6SFbvDNY8MJXtN0d41IerrQu3qsxc3lOW5+7Y3pTPu x7hQhT8X8WRKY7TFZnKciMD7pav1hICkUqvtRenElUQ1Y/8f7sd1uvELwYl8r/6lqo tCU115tTuu2ETHxn8oxMeEjRSez+11qV9OAeSzuA= 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.129.124]) by sourceware.org (Postfix) with ESMTPS id 9950B3858D35 for ; Wed, 30 Nov 2022 01:07:29 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 9950B3858D35 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-389-tPbrCg4fO0SS795MonT_UQ-1; Tue, 29 Nov 2022 20:07:27 -0500 X-MC-Unique: tPbrCg4fO0SS795MonT_UQ-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 81846811E75 for ; Wed, 30 Nov 2022 01:07:27 +0000 (UTC) Received: from t14s.localdomain.com (unknown [10.2.16.65]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5B04E140EBF5; Wed, 30 Nov 2022 01:07:27 +0000 (UTC) To: gcc-patches@gcc.gnu.org Cc: David Malcolm Subject: [committed] analyzer: fix folding of '(PTR + 0) => PTR' [PR105784] Date: Tue, 29 Nov 2022 20:07:22 -0500 Message-Id: <20221130010722.3663721-1-dmalcolm@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-11.4 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE, 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 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: David Malcolm via Gcc-patches From: David Malcolm Reply-To: David Malcolm Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" Successfully bootstrapped & regrtested on x86_64-pc-linux-gnu. Pushed to trunk as r13-4398-g3a32fb2eaa761a. gcc/analyzer/ChangeLog: PR analyzer/105784 * region-model-manager.cc (region_model_manager::maybe_fold_binop): For POINTER_PLUS_EXPR, PLUS_EXPR and MINUS_EXPR, eliminate requirement that the final type matches that of arg0 in favor of a cast. gcc/testsuite/ChangeLog: PR analyzer/105784 * gcc.dg/analyzer/torture/fold-ptr-arith-pr105784.c: New test. Signed-off-by: David Malcolm --- gcc/analyzer/region-model-manager.cc | 8 ++-- .../torture/fold-ptr-arith-pr105784.c | 43 +++++++++++++++++++ 2 files changed, 47 insertions(+), 4 deletions(-) create mode 100644 gcc/testsuite/gcc.dg/analyzer/torture/fold-ptr-arith-pr105784.c diff --git a/gcc/analyzer/region-model-manager.cc b/gcc/analyzer/region-model-manager.cc index d9a7ae91a35..ae63c664ae5 100644 --- a/gcc/analyzer/region-model-manager.cc +++ b/gcc/analyzer/region-model-manager.cc @@ -613,13 +613,13 @@ region_model_manager::maybe_fold_binop (tree type, enum tree_code op, case POINTER_PLUS_EXPR: case PLUS_EXPR: /* (VAL + 0) -> VAL. */ - if (cst1 && zerop (cst1) && type == arg0->get_type ()) - return arg0; + if (cst1 && zerop (cst1)) + return get_or_create_cast (type, arg0); break; case MINUS_EXPR: /* (VAL - 0) -> VAL. */ - if (cst1 && zerop (cst1) && type == arg0->get_type ()) - return arg0; + if (cst1 && zerop (cst1)) + return get_or_create_cast (type, arg0); break; case MULT_EXPR: /* (VAL * 0). */ diff --git a/gcc/testsuite/gcc.dg/analyzer/torture/fold-ptr-arith-pr105784.c b/gcc/testsuite/gcc.dg/analyzer/torture/fold-ptr-arith-pr105784.c new file mode 100644 index 00000000000..5e5a2bf79a5 --- /dev/null +++ b/gcc/testsuite/gcc.dg/analyzer/torture/fold-ptr-arith-pr105784.c @@ -0,0 +1,43 @@ +/* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } { "" } } */ + +#include "../analyzer-decls.h" + +extern _Bool quit_flag; +extern void char_charset (int); + +static void +__analyzer_ccl_driver (int *source, int src_size) +{ + int *src = source, *src_end = src + src_size; + int i = 0; + + while (!quit_flag) + { + if (src < src_end) + { + __analyzer_dump_path (); /* { dg-message "path" } */ + i = *src++; /* { dg-bogus "uninit" } */ + } + char_charset (i); + } +} + +void +Fccl_execute_on_string (char *str, long str_bytes) +{ + while (1) + { + char *p = str; + char *endp = str + str_bytes; + int source[1024]; + int src_size = 0; + + while (src_size < 1024 && p < endp) + { + __analyzer_dump_path (); /* { dg-message "path" } */ + source[src_size++] = *p++; + } + + __analyzer_ccl_driver (source, src_size); + } +}