From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 90722 invoked by alias); 17 Aug 2016 06:55:21 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Received: (qmail 90539 invoked by uid 89); 17 Aug 2016 06:55:20 -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=Fold, 1508, 150,8, 1507 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; Wed, 17 Aug 2016 06:55:10 +0000 Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 95DA6ABEF for ; Wed, 17 Aug 2016 06:55:07 +0000 (UTC) Resent-From: =?UTF-8?Q?Martin_Li=c5=a1ka?= Resent-To: GCC Patches Resent-Date: Wed, 17 Aug 2016 08:55:06 +0200 Resent-Message-ID: <63fb0317-7156-77ea-35d7-6208628bc6fd@suse.cz> Resent-User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.2 Message-Id: In-Reply-To: References: From: marxin Date: Wed, 17 Aug 2016 06:55:00 -0000 Subject: [PATCH 1/3] Fold BUILT_IN_STRNCASECMP To: gcc-patches@gcc.gnu.org X-IsSubscribed: yes X-SW-Source: 2016-08/txt/msg01234.txt.bz2 gcc/ChangeLog: 2016-08-16 Martin Liska * builtins.c (fold_builtin_strncmp): Rename to fold_builtin_strncmp_strncasecmp and support also strncasecmp. (fold_builtin_3): Handle BUILT_IN_STRNCASECMP. --- gcc/builtins.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/gcc/builtins.c b/gcc/builtins.c index 03a0dc8..8f1c752 100644 --- a/gcc/builtins.c +++ b/gcc/builtins.c @@ -150,7 +150,8 @@ static tree fold_builtin_strchr (location_t, tree, tree, tree); static tree fold_builtin_memchr (location_t, tree, tree, tree, tree); static tree fold_builtin_memcmp (location_t, tree, tree, tree); static tree fold_builtin_strcmp (location_t, tree, tree); -static tree fold_builtin_strncmp (location_t, tree, tree, tree); +static tree fold_builtin_strncmp_strncasecmp (location_t, tree, tree, tree, + bool); static tree fold_builtin_isascii (location_t, tree); static tree fold_builtin_toascii (location_t, tree); static tree fold_builtin_isdigit (location_t, tree); @@ -7383,11 +7384,13 @@ fold_builtin_strcmp (location_t loc, tree arg1, tree arg2) return NULL_TREE; } -/* Fold function call to builtin strncmp with arguments ARG1, ARG2, and LEN. - Return NULL_TREE if no simplification can be made. */ +/* Fold function call to builtin strncmp (or strncasecmp) with arguments ARG1, + ARG2, and LEN. Return NULL_TREE if no simplification can be made. + IS_STRNCASECMP is true for strncasecmp, false otherwise. */ static tree -fold_builtin_strncmp (location_t loc, tree arg1, tree arg2, tree len) +fold_builtin_strncmp_strncasecmp (location_t loc, tree arg1, tree arg2, + tree len, bool is_strncasecmp) { if (!validate_arg (arg1, POINTER_TYPE) || !validate_arg (arg2, POINTER_TYPE) @@ -7442,7 +7445,8 @@ fold_builtin_strncmp (location_t loc, tree arg1, tree arg2, tree len) /* If len parameter is one, return an expression corresponding to (*(const unsigned char*)arg1 - (const unsigned char*)arg2). */ - if (tree_fits_uhwi_p (len) && tree_to_uhwi (len) == 1) + if (is_strncasecmp + && tree_fits_uhwi_p (len) && tree_to_uhwi (len) == 1) { tree cst_uchar_node = build_type_variant (unsigned_char_type_node, 1, 0); tree cst_uchar_ptr_node @@ -8483,7 +8487,10 @@ fold_builtin_3 (location_t loc, tree fndecl, break; case BUILT_IN_STRNCMP: - return fold_builtin_strncmp (loc, arg0, arg1, arg2); + return fold_builtin_strncmp_strncasecmp (loc, arg0, arg1, arg2, false); + + case BUILT_IN_STRNCASECMP: + return fold_builtin_strncmp_strncasecmp (loc, arg0, arg1, arg2, true); case BUILT_IN_MEMCHR: return fold_builtin_memchr (loc, arg0, arg1, arg2, type); -- 2.9.2