From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 17290 invoked by alias); 28 Apr 2016 08:59:22 -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 17275 invoked by uid 89); 28 Apr 2016 08:59:21 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.4 required=5.0 tests=AWL,BAYES_00,RCVD_IN_DNSWL_LOW,SPF_PASS autolearn=ham version=3.3.2 spammy= X-HELO: mail-qg0-f44.google.com Received: from mail-qg0-f44.google.com (HELO mail-qg0-f44.google.com) (209.85.192.44) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-GCM-SHA256 encrypted) ESMTPS; Thu, 28 Apr 2016 08:59:11 +0000 Received: by mail-qg0-f44.google.com with SMTP id 90so11640054qgz.1 for ; Thu, 28 Apr 2016 01:59:11 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:date :message-id:subject:from:to:cc; bh=zXVfjy7BFJLOub98tK8Bu5ObiC3yrQPsQwQEmoOT9wA=; b=lMYgHaVudjjyDhi7g2fEaW/dUoVyvdQYT2tQqeuM2Uaz7eCzWSMKxRJM4azae01PJW GQ15N4UdvuqRICI7VYET0CcLk6QpvbZTLjGgAg3bBesXGRElN8NKMo6aXCGrAXcD4NTw l58zoZVSBLp5O7sQK35ExK0i07xdEpCFIbniDfvcS448cWfNXUZW9774DPDVZsEmBpFm 3xzV6rvsd48Mn5iw3O5YkJaJ2HRo/QN3M/GwaX0RtB4L9SWCS42zxPRiuSYCOK9FHor9 PzxiEA54qjgvgmkvZC39rr89JX9UGjSr62wM4/hqY2BlPLIj5zunMJBXeTjJEDf6HuUR wCDg== X-Gm-Message-State: AOPr4FX7XZGUfzzsyHqGx2eZxnwCuDvY9vRbM3iswRI0k9doOyJBlnOExrjgMdYa0fyMFO61LTxmLVGkmKZ942sk MIME-Version: 1.0 X-Received: by 10.140.99.80 with SMTP id p74mr12472816qge.97.1461833948753; Thu, 28 Apr 2016 01:59:08 -0700 (PDT) Received: by 10.140.99.73 with HTTP; Thu, 28 Apr 2016 01:59:08 -0700 (PDT) In-Reply-To: References: <20160426130238.GU26501@tucnak.zalov.cz> <20160426225139.GZ26501@tucnak.zalov.cz> Date: Thu, 28 Apr 2016 08:59:00 -0000 Message-ID: Subject: Re: [PATCH] operand_equal_p checking (PR sanitizer/70683) From: Christophe Lyon To: Richard Biener Cc: Jakub Jelinek , "gcc-patches@gcc.gnu.org" Content-Type: text/plain; charset=UTF-8 X-IsSubscribed: yes X-SW-Source: 2016-04/txt/msg01763.txt.bz2 Hi, This caused: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=70843 On 27 April 2016 at 14:41, Richard Biener wrote: > On Wed, 27 Apr 2016, Jakub Jelinek wrote: > >> On Tue, Apr 26, 2016 at 03:02:38PM +0200, Jakub Jelinek wrote: >> > The debugging hack is too ugly and slows down the compiler (by artificially >> > increasing number of collisions), so it is not appropriate, but perhaps we >> > can add some internal only use OEP_* flag, pass it to the recursive calls >> > of operand_equal_p and if not set and flag_checking, verify >> > iterative_hash_expr equality in the outermost call). >> >> Here is the corresponding checking patch. It uncovered two further issues >> in the tree.[ch] patch which I'm going to post momentarily. >> Both patches together bootstrapped/regtested on x86_64-linux and i686-linux, >> ok for trunk? > > Ok. > > Thanks, > Richard. > >> 2016-04-27 Jakub Jelinek >> >> PR sanitizer/70683 >> * tree-core.h (enum operand_equal_flag): Add OEP_NO_HASH_CHECK. >> * fold-const.c (operand_equal_p): If flag_checking and >> OEP_NO_HASH_CHECK is not set in flag, recurse with OEP_NO_HASH_CHECK >> and if it returns non-zero, assert iterative_hash_expr on both >> args is the same. >> >> --- gcc/tree-core.h.jj 2016-04-22 18:21:55.000000000 +0200 >> +++ gcc/tree-core.h 2016-04-26 17:47:19.875753297 +0200 >> @@ -765,7 +765,9 @@ enum operand_equal_flag { >> OEP_ONLY_CONST = 1, >> OEP_PURE_SAME = 2, >> OEP_MATCH_SIDE_EFFECTS = 4, >> - OEP_ADDRESS_OF = 8 >> + OEP_ADDRESS_OF = 8, >> + /* Internal within operand_equal_p: */ >> + OEP_NO_HASH_CHECK = 16 >> }; >> >> /* Enum and arrays used for tree allocation stats. >> --- gcc/fold-const.c.jj 2016-04-22 18:21:32.000000000 +0200 >> +++ gcc/fold-const.c 2016-04-26 18:30:40.919080701 +0200 >> @@ -2749,6 +2749,25 @@ combine_comparisons (location_t loc, >> int >> operand_equal_p (const_tree arg0, const_tree arg1, unsigned int flags) >> { >> + /* When checking, verify at the outermost operand_equal_p call that >> + if operand_equal_p returns non-zero then ARG0 and ARG1 has the same >> + hash value. */ >> + if (flag_checking && !(flags & OEP_NO_HASH_CHECK)) >> + { >> + if (operand_equal_p (arg0, arg1, flags | OEP_NO_HASH_CHECK)) >> + { >> + inchash::hash hstate0 (0), hstate1 (0); >> + inchash::add_expr (arg0, hstate0, flags); >> + inchash::add_expr (arg1, hstate1, flags); >> + hashval_t h0 = hstate0.end (); >> + hashval_t h1 = hstate1.end (); >> + gcc_assert (h0 == h1); >> + return 1; >> + } >> + else >> + return 0; >> + } >> + >> /* If either is ERROR_MARK, they aren't equal. */ >> if (TREE_CODE (arg0) == ERROR_MARK || TREE_CODE (arg1) == ERROR_MARK >> || TREE_TYPE (arg0) == error_mark_node >> >> >> Jakub >> >> > > -- > Richard Biener > SUSE LINUX GmbH, GF: Felix Imendoerffer, Jane Smithard, Graham Norton, HRB 21284 (AG Nuernberg)