From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id 4C90A3849AF3 for ; Thu, 9 May 2024 17:42:55 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 4C90A3849AF3 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 4C90A3849AF3 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1715276582; cv=none; b=P60IBKweNpaLY7Wm2vcydZqnA8tk82XbHAVpuDJiAzt3272ZZ8kXdj/H1mwCLxhFmHPHUt+24N8SpmNm0oSp4YsPd2BCYjIFrAYewDp6s/MYyE3RpsVY266qZ4WT3GwRCTa5aXS9G6Di4uxWOdZRvckQIifa6zkSHcArwCLqbbE= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1715276582; c=relaxed/simple; bh=3YdkOI/A3mc4n0H9Xm1WcYMqkH5jrmuFZN5lepCO3lQ=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=IhUK835zhDAPg3UTy+KpNhNbESEbyt6uh04BP12LKTXcnUrGrn54p8hKUmWjI1XaM6PVow2+RTYSB5mxnemvsAy3FPzmI+3NzluMjE7BhhQac/+jeaWG+JSZjWWYnE0I4PAjUcSM+MAlFG63wXrUg0wpACjsFZJXXpw5zDbtw+I= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1715276574; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=lMsD4DkKwy6tiTz7aW/KcKk1RFG/kh5yEn2NIFAsG/g=; b=Jdq0Y6E4yWinysHxhr1kbKzncDM/JidpJ68xNTUIO+5yIjlhN/yLoQoBuwn802Gs+fAvh1 buxDS3wJwmHGlPbNCznZIksTAaiOuI05t3fRmzabR/VPXwUvO1WGLIm/WefZFLkPPbGzh7 ZydLJkd2ZDV+5PxvJINK4KqGOdr1QzU= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-353-SVGh5nFUNOCn0B9w_KkSBQ-1; Thu, 09 May 2024 13:42:53 -0400 X-MC-Unique: SVGh5nFUNOCn0B9w_KkSBQ-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 824D2101A551 for ; Thu, 9 May 2024 17:42:52 +0000 (UTC) Received: from t14s.localdomain.com (unknown [10.22.18.2]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5B0DF746821; Thu, 9 May 2024 17:42:52 +0000 (UTC) From: David Malcolm To: gcc-patches@gcc.gnu.org Cc: David Malcolm Subject: [PATCH 20/21] Fix ICE in -fdiagnostics-generate-patch [PR112684] Date: Thu, 9 May 2024 13:42:35 -0400 Message-Id: <20240509174236.2278921-21-dmalcolm@redhat.com> In-Reply-To: <20240509174236.2278921-1-dmalcolm@redhat.com> References: <20240509174236.2278921-1-dmalcolm@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.10 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-Spam-Status: No, score=-11.7 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: Backported from r14-8255-ge254d1224df306. gcc/ChangeLog: PR middle-end/112684 * toplev.cc (toplev::main): Don't ICE in -fdiagnostics-generate-patch when exiting after options, since no edit context will have been created. Signed-off-by: David Malcolm --- gcc/toplev.cc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/gcc/toplev.cc b/gcc/toplev.cc index 109c9d58cbd..19391208eac 100644 --- a/gcc/toplev.cc +++ b/gcc/toplev.cc @@ -2292,10 +2292,8 @@ toplev::main (int argc, char **argv) emit some diagnostics here. */ invoke_plugin_callbacks (PLUGIN_FINISH, NULL); - if (flag_diagnostics_generate_patch) + if (global_dc->edit_context_ptr) { - gcc_assert (global_dc->edit_context_ptr); - pretty_printer pp; pp_show_color (&pp) = pp_show_color (global_dc->printer); global_dc->edit_context_ptr->print_diff (&pp, true); -- 2.26.3