From patchwork Mon Jul 24 13:54:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Segher Boessenkool X-Patchwork-Id: 792806 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gcc.gnu.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-458778-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="c4rst3uF"; 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 3xGNCf0KJTz9s4q for ; Mon, 24 Jul 2017 23:54:36 +1000 (AEST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:cc:subject:date:message-id; q=dns; s=default; b=RMBMlKEN3CvL Ion31D4a7rEKK5Ckef+Znl0ygyyxHXRh7WGiowHQT6jVMrsYTCIQ2YamrmgV/G9W MLDEvDBTbF447Q+iw8jsYPC+yYkxT3/a/afuPN7C8enNQ71fpunmeAqLaq1lUwXR BGNR5JtV/bWVuwWgjVq9FqizU7FVFzs= 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 :to:cc:subject:date:message-id; s=default; bh=zMt7NUjYPZuUVUO3KL Lr3uxMnz8=; b=c4rst3uFioyWxStA7Wnd+GxKOmj82JqdebsoRaHYs2XHS+mYud G1MpzwgIknuswb+KxUsOxUrx4pqwv+AlNqS1b/V0RhNkxub2yp1okdLrDeYodsKC IpNZqtNUD7/5NjdqjAv9uZZzoP7aeHHFoy7pLQku7Ki9NKcuouWc2AW5g= Received: (qmail 125569 invoked by alias); 24 Jul 2017 13:54:16 -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 125471 invoked by uid 89); 24 Jul 2017 13:54:15 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-24.0 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_LAZY_DOMAIN_SECURITY, RP_MATCHES_RCVD autolearn=ham version=3.3.2 spammy=emergency X-HELO: gcc1-power7.osuosl.org Received: from gcc1-power7.osuosl.org (HELO gcc1-power7.osuosl.org) (140.211.15.137) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 24 Jul 2017 13:54:13 +0000 Received: by gcc1-power7.osuosl.org (Postfix, from userid 10019) id E55FE1C0706; Mon, 24 Jul 2017 13:54:10 +0000 (UTC) From: Segher Boessenkool To: gcc-patches@gcc.gnu.org Cc: Segher Boessenkool Subject: [PATCH 1/2] cfgrtl: Don't crash in rtl_dump_bb if BB_END(bb) is NULL Date: Mon, 24 Jul 2017 13:54:05 +0000 Message-Id: X-IsSubscribed: yes Currently rtl_dump_bb crashes if BB_END(bb) is NULL, like it can be during expand (rtl_dump_bb can be called at any time, by the emergency dump added recently for example). This fixes it. Segher 2017-07-24 Segher Boessenkool * gcc/cfgrtl.c (rtl_dump_bb): Don't call NEXT_INSN on NULL. --- gcc/cfgrtl.c | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/gcc/cfgrtl.c b/gcc/cfgrtl.c index 58d87fe..6ef47b7 100644 --- a/gcc/cfgrtl.c +++ b/gcc/cfgrtl.c @@ -2109,8 +2109,6 @@ commit_edge_insertions (void) static void rtl_dump_bb (FILE *outf, basic_block bb, int indent, dump_flags_t flags) { - rtx_insn *insn; - rtx_insn *last; char *s_indent; s_indent = (char *) alloca ((size_t) indent + 1); @@ -2124,18 +2122,22 @@ rtl_dump_bb (FILE *outf, basic_block bb, int indent, dump_flags_t flags) } if (bb->index != ENTRY_BLOCK && bb->index != EXIT_BLOCK) - for (insn = BB_HEAD (bb), last = NEXT_INSN (BB_END (bb)); insn != last; - insn = NEXT_INSN (insn)) - { - if (flags & TDF_DETAILS) - df_dump_insn_top (insn, outf); - if (! (flags & TDF_SLIM)) - print_rtl_single (outf, insn); - else - dump_insn_slim (outf, insn); - if (flags & TDF_DETAILS) - df_dump_insn_bottom (insn, outf); - } + { + rtx_insn *last = BB_END (bb); + if (last) + last = NEXT_INSN (last); + for (rtx_insn *insn = BB_HEAD (bb); insn != last; insn = NEXT_INSN (insn)) + { + if (flags & TDF_DETAILS) + df_dump_insn_top (insn, outf); + if (! (flags & TDF_SLIM)) + print_rtl_single (outf, insn); + else + dump_insn_slim (outf, insn); + if (flags & TDF_DETAILS) + df_dump_insn_bottom (insn, outf); + } + } if (df && (flags & TDF_DETAILS)) {