From patchwork Mon Dec 9 15:08:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Martin_Li=C5=A1ka?= X-Patchwork-Id: 1206339 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-515529-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=suse.cz Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="wTJRvYbq"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47Wmms1pbSz9sNH for ; Tue, 10 Dec 2019 02:09:01 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :subject:to:cc:message-id:date:mime-version:content-type; q=dns; s=default; b=P+mt9tkKCeaNE0O6QbMpcLl8lDdVElVEw75RXHe3Y95VpchZKF HSGylOM4j+SpFzKVwgJ+2uT1q3/M/Bqveb8KPsKb39T6iVBPHqwTs3q9jNdFmMYC w9g5eudEDV9UtCOmjVzInmHyKuiZMVeAuDgA/+nkk4dV/P5z8lN3oqyTk= 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:from :subject:to:cc:message-id:date:mime-version:content-type; s= default; bh=K2qYPJMsAXE5VvVJkqrDZkV2l3U=; b=wTJRvYbqWd/Th+1wPhkO QEBgb2u35mRODHGCmjRT2ewa1NEz7rlkjD7DMmc7ZiK6VobCbaSQrjlTfh1LiCMg N68MwO9VthJPyfuW2kWFh08yH/dBwjYjZLzOykEBlXoI4kGSJiakrgZF3A+YEFOO rQpQC/T6NycQZPxPaJK3N1A= Received: (qmail 8583 invoked by alias); 9 Dec 2019 15:08:54 -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 8573 invoked by uid 89); 9 Dec 2019 15:08:53 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-18.6 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, SPF_PASS autolearn=ham version=3.3.1 spammy= X-HELO: mx1.suse.de Received: from mx2.suse.de (HELO mx1.suse.de) (195.135.220.15) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 09 Dec 2019 15:08:52 +0000 Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id D5742ACF2; Mon, 9 Dec 2019 15:08:49 +0000 (UTC) From: =?utf-8?q?Martin_Li=C5=A1ka?= Subject: [PATCH] Fix typos in 2 functions. To: gcc-patches@gcc.gnu.org Cc: Jan Hubicka Message-ID: Date: Mon, 9 Dec 2019 16:08:49 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.2.2 MIME-Version: 1.0 X-IsSubscribed: yes Hi. I'm sending fix for 2 locations where we have a typo. Second hunk is pre-approved by Rich, first one needs to be approved by Honza? Patch can bootstrap on x86_64-linux-gnu and survives regression tests. Ready to be installed? Thanks, Martin gcc/ChangeLog: 2019-12-09 Martin Liska PR tree-optimization/92862 * predict.c (predict_paths_leading_to_edge): Fix typo from e to e2. * tree-ssa-loop-niter.c (loop_only_exit_p): Return false instead of true; --- gcc/predict.c | 7 +++---- gcc/tree-ssa-loop-niter.c | 10 +++------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/gcc/predict.c b/gcc/predict.c index 67f850de17a..8db24816d29 100644 --- a/gcc/predict.c +++ b/gcc/predict.c @@ -3217,16 +3217,15 @@ predict_paths_leading_to_edge (edge e, enum br_predictor pred, basic_block bb = e->src; FOR_EACH_EDGE (e2, ei, bb->succs) if (e2->dest != e->src && e2->dest != e->dest - && !unlikely_executed_edge_p (e) + && !unlikely_executed_edge_p (e2) && !dominated_by_p (CDI_POST_DOMINATORS, e->src, e2->dest)) { has_nonloop_edge = true; break; } + if (!has_nonloop_edge) - { - predict_paths_for_bb (bb, bb, pred, taken, auto_bitmap (), in_loop); - } + predict_paths_for_bb (bb, bb, pred, taken, auto_bitmap (), in_loop); else predict_edge_def (e, pred, taken); } diff --git a/gcc/tree-ssa-loop-niter.c b/gcc/tree-ssa-loop-niter.c index f0dd9a0b363..39e937705f1 100644 --- a/gcc/tree-ssa-loop-niter.c +++ b/gcc/tree-ssa-loop-niter.c @@ -2376,13 +2376,9 @@ loop_only_exit_p (const class loop *loop, basic_block *body, const_edge exit) return false; for (i = 0; i < loop->num_nodes; i++) - { - for (bsi = gsi_start_bb (body[i]); !gsi_end_p (bsi); gsi_next (&bsi)) - if (stmt_can_terminate_bb_p (gsi_stmt (bsi))) - { - return true; - } - } + for (bsi = gsi_start_bb (body[i]); !gsi_end_p (bsi); gsi_next (&bsi)) + if (stmt_can_terminate_bb_p (gsi_stmt (bsi))) + return false; return true; }