From patchwork Thu Oct 27 15:06:08 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Martin_Li=C5=A1ka?= X-Patchwork-Id: 79705 Delivered-To: patch@linaro.org Received: by 10.80.142.83 with SMTP id 19csp695383edx; Thu, 27 Oct 2016 08:06:36 -0700 (PDT) X-Received: by 10.98.194.150 with SMTP id w22mr15444644pfk.24.1477580796154; Thu, 27 Oct 2016 08:06:36 -0700 (PDT) Return-Path: Received: from sourceware.org (server1.sourceware.org. [209.132.180.131]) by mx.google.com with ESMTPS id f13si8375157pfe.156.2016.10.27.08.06.35 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 27 Oct 2016 08:06:36 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-return-439761-patch=linaro.org@gcc.gnu.org designates 209.132.180.131 as permitted sender) client-ip=209.132.180.131; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org; spf=pass (google.com: domain of gcc-patches-return-439761-patch=linaro.org@gcc.gnu.org designates 209.132.180.131 as permitted sender) smtp.mailfrom=gcc-patches-return-439761-patch=linaro.org@gcc.gnu.org DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :subject:to:references:cc:from:message-id:date:mime-version :in-reply-to:content-type; q=dns; s=default; b=lQW9emQ0cUnOll6B0 eOpyt7a1PdFwWoyk0ovO8KHgTsqHajMB+ZhqT+rcUU/XRKUGTwdmbpyk28zbIBOZ MsHH0HKk3fC4Ym7AYKPzTA4oGueDPE4e9vHDnNSrXKTClUs+2KYErtHJCUJx2zeZ 7z1APpDDj+l0uwK4hDF5CZ4nOQ= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :subject:to:references:cc:from:message-id:date:mime-version :in-reply-to:content-type; s=default; bh=WFRVUX60j8Acxq3Mi0qp7FD BkUw=; b=q+DSjgtAYC7K3c13/+eXvyYpjqCBdM9BQpdnZRt0LFj/31Wdde6fKYe 68CT1UtJ5xhl2BrBiCzVaWL/Z1FGPgoxONa5p9uNPVp9M81BU4QjMCH9LkcMI1M2 3VfSZI7a6RWhi6Uwnv4WboSAgJvZNvsChpHrE6xrAQDNlKmfEmTE= Received: (qmail 19238 invoked by alias); 27 Oct 2016 15:06:21 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 19225 invoked by uid 89); 27 Oct 2016 15:06:21 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.9 required=5.0 tests=BAYES_00, SPF_PASS autolearn=ham version=3.3.2 spammy=Ready X-HELO: mx2.suse.de Received: from mx2.suse.de (HELO mx2.suse.de) (195.135.220.15) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 27 Oct 2016 15:06:10 +0000 Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id A566BAB9B; Thu, 27 Oct 2016 15:06:08 +0000 (UTC) Subject: Re: [PATCH] Fix host_size_t_cst_p predicate To: Richard Biener References: <5ec537b5-6c63-503c-3480-28ac6cab2699@suse.cz> Cc: GCC Patches From: =?UTF-8?Q?Martin_Li=c5=a1ka?= Message-ID: Date: Thu, 27 Oct 2016 17:06:08 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.4.0 MIME-Version: 1.0 In-Reply-To: X-IsSubscribed: yes On 10/27/2016 03:35 PM, Richard Biener wrote: > On Thu, Oct 27, 2016 at 9:41 AM, Martin Liška wrote: >> Running simple test-case w/o the proper header file causes ICE: >> strncmp ("a", "b", -1); >> >> 0xe74462 tree_to_uhwi(tree_node const*) >> ../../gcc/tree.c:7324 >> 0x90a23f host_size_t_cst_p >> ../../gcc/fold-const-call.c:63 >> 0x90a23f fold_const_call(combined_fn, tree_node*, tree_node*, tree_node*, tree_node*) >> ../../gcc/fold-const-call.c:1512 >> 0x787b01 fold_builtin_3 >> ../../gcc/builtins.c:8385 >> 0x787b01 fold_builtin_n(unsigned int, tree_node*, tree_node**, int, bool) >> ../../gcc/builtins.c:8465 >> 0x9052b1 fold(tree_node*) >> ../../gcc/fold-const.c:11919 >> 0x6de2bb c_fully_fold_internal >> ../../gcc/c/c-fold.c:185 >> 0x6e1f6b c_fully_fold(tree_node*, bool, bool*) >> ../../gcc/c/c-fold.c:90 >> 0x67cbbf c_process_expr_stmt(unsigned int, tree_node*) >> ../../gcc/c/c-typeck.c:10369 >> 0x67cfbd c_finish_expr_stmt(unsigned int, tree_node*) >> ../../gcc/c/c-typeck.c:10414 >> 0x6cb578 c_parser_statement_after_labels >> ../../gcc/c/c-parser.c:5430 >> 0x6cd333 c_parser_compound_statement_nostart >> ../../gcc/c/c-parser.c:4944 >> 0x6cdbde c_parser_compound_statement >> ../../gcc/c/c-parser.c:4777 >> 0x6c93ac c_parser_declaration_or_fndef >> ../../gcc/c/c-parser.c:2176 >> 0x6d51ab c_parser_external_declaration >> ../../gcc/c/c-parser.c:1574 >> 0x6d5c09 c_parser_translation_unit >> ../../gcc/c/c-parser.c:1454 >> 0x6d5c09 c_parse_file() >> ../../gcc/c/c-parser.c:18173 >> 0x72ffd2 c_common_parse_file() >> ../../gcc/c-family/c-opts.c:1087 >> >> Following patch improves the host_size_t_cst_p predicate. >> >> Patch can bootstrap on ppc64le-redhat-linux and survives regression tests. >> >> Ready to be installed? > > I believe the wi::min_precision (t, UNSIGNED) <= sizeof (size_t) * > CHAR_BIT test is now redundant. > > OTOH it was probably desired to allow -1 here? A little looking back > in time should tell. Ok, it started with r229922, where it was changed from: if (tree_fits_uhwi_p (len) && p1 && p2) { const int i = strncmp (p1, p2, tree_to_uhwi (len)); ... to current version: case CFN_BUILT_IN_STRNCMP: { bool const_size_p = host_size_t_cst_p (arg2, &s2); Thus I'm suggesting to change to back to it. Ready to be installed? Thanks, Martin > > Richard. > >> Martin >From 608ed3ac6b743846e9bce62cd0b0e83e2b018684 Mon Sep 17 00:00:00 2001 From: marxin Date: Wed, 26 Oct 2016 13:48:39 +0200 Subject: [PATCH] Fix host_size_t_cst_p predicat gcc/ChangeLog: 2016-10-26 Martin Liska * fold-const-call.c (host_size_t_cst_p): Test whether it can fit to uhwi. gcc/testsuite/ChangeLog: 2016-10-26 Martin Liska * gcc.dg/tree-ssa/builtins-folding-gimple-ub.c (main): Add test case. --- gcc/fold-const-call.c | 3 +-- gcc/testsuite/gcc.dg/tree-ssa/builtins-folding-gimple-ub.c | 4 ++++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/gcc/fold-const-call.c b/gcc/fold-const-call.c index 05a15f9..b8154c8 100644 --- a/gcc/fold-const-call.c +++ b/gcc/fold-const-call.c @@ -57,8 +57,7 @@ complex_cst_p (tree t) static inline bool host_size_t_cst_p (tree t, size_t *size_out) { - if (integer_cst_p (t) - && wi::min_precision (t, UNSIGNED) <= sizeof (size_t) * CHAR_BIT) + if (tree_fits_uhwi_p (t)) { *size_out = tree_to_uhwi (t); return true; diff --git a/gcc/testsuite/gcc.dg/tree-ssa/builtins-folding-gimple-ub.c b/gcc/testsuite/gcc.dg/tree-ssa/builtins-folding-gimple-ub.c index df0ede2..e1658d1 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/builtins-folding-gimple-ub.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/builtins-folding-gimple-ub.c @@ -17,6 +17,10 @@ main (void) if (__builtin_memchr (foo1, 'x', 1000)) /* Not folded away. */ __builtin_abort (); + /* STRNCMP. */ + if (strncmp ("a", "b", -1)) /* { dg-warning "implicit declaration of function" } */ + __builtin_abort (); + return 0; } -- 2.10.1