From patchwork Wed Jun 8 01:47:33 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Segher Boessenkool X-Patchwork-Id: 631907 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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 3rPWZ11BByz9s9G for ; Wed, 8 Jun 2016 11:48:56 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b=Q6AzzMcM; dkim-atps=neutral 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:in-reply-to:references :in-reply-to:references; q=dns; s=default; b=trsrjec+O1tUU/x9Cwf NeThwrRVvPd6uIIJZZYdcQucOm45Fxzo8xGEHOwDaru0NyOPuc54ul0twDmltRaU 4p6MkGllfPIN2rrDDA6d+FCVIl+rc+y6e2+MxhFBwFLZZ2B2WbrOG/I+V7zyQHei i/OZ9GE1Rrh+pLqhlrAbcYFs= 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:in-reply-to:references :in-reply-to:references; s=default; bh=ngF+FUkjKzJoSgMpwwbQwKSIO bQ=; b=Q6AzzMcM+BeyLnQuC+SopG8ylKGkR6fbxkD9FXgWTkfbdx9sxHpCs4VKd Of05yjIldsCk4lRTZKAH2Fpo48L4AWSKqGuAsOwIADOMD4LO/qgo39spDF48u/R/ aOwoQlYQj+FBe5xJN+WUU0VIEBHnyMWRmHRnBeP0BbPyL4f/Y8= Received: (qmail 82955 invoked by alias); 8 Jun 2016 01:48:27 -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 82785 invoked by uid 89); 8 Jun 2016 01:48:24 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-2.0 required=5.0 tests=AWL, BAYES_00, KAM_LAZY_DOMAIN_SECURITY, RP_MATCHES_RCVD autolearn=ham version=3.3.2 spammy=Hx-languages-length:969, sk:outgoin, joining 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; Wed, 08 Jun 2016 01:48:16 +0000 Received: by gcc1-power7.osuosl.org (Postfix, from userid 10019) id 8E9851C07C3; Wed, 8 Jun 2016 01:48:12 +0000 (UTC) From: Segher Boessenkool To: gcc-patches@gcc.gnu.org Cc: dje.gcc@gmail.com, Segher Boessenkool Subject: [PATCH 2/9] cfgcleanup: Don't confuse CFI when -fshrink-wrap-separate Date: Wed, 8 Jun 2016 01:47:33 +0000 Message-Id: In-Reply-To: References: In-Reply-To: References: X-IsSubscribed: yes cfgcleanup would try to join noreturn paths with different concerns handled. This then fails in dwarf2cfi. 2016-06-07 Segher Boessenkool * cfgcleanup.c (outgoing_edges_match): Don't join noreturn calls if shrink_wrapped_separate. --- gcc/cfgcleanup.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/gcc/cfgcleanup.c b/gcc/cfgcleanup.c index 023b9d2..f08e4ee 100644 --- a/gcc/cfgcleanup.c +++ b/gcc/cfgcleanup.c @@ -1824,6 +1824,11 @@ outgoing_edges_match (int mode, basic_block bb1, basic_block bb2) || !find_reg_note (last1, REG_ARGS_SIZE, NULL))) return false; + /* If shrink-wrapping separate concerns, joining noreturn calls that + have different concerns set up will confuse dwarf2cfi. */ + if (!nonfakeedges && crtl->shrink_wrapped_separate) + return false; + /* fallthru edges must be forwarded to the same destination. */ if (fallthru1) {