From patchwork Tue Feb 11 14:11:16 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kai Tietz X-Patchwork-Id: 319295 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 804452C00AE for ; Wed, 12 Feb 2014 01:11:27 +1100 (EST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :mime-version:date:message-id:subject:from:to:content-type; q= dns; s=default; b=Tw4HPkTHG2yi4IiAZzjuHJ7MZfYMnQsG00d+BEyXakhIb9 rmqj2q0HTpf9rgan6C/a/4251zco0UkPZbXWeJMI5ASxeqaTeH5qfaYcgzDCWfgN cQSGt4F+PyyIsVwlwEI32UxDumrtWpa0Of1Bngnku2QeIoMNCKVnsqQRMPJus= 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 :mime-version:date:message-id:subject:from:to:content-type; s= default; bh=zYhWtPCcJDGwgRH9JNxCVbrRgOY=; b=KsEdj/18oElbEhSWfCoU 1leDrR2jWVLmGnyNWPS2KExlq3Nl0FrJUtBDxDniwUCgQfO7JkEOIGjNZanY6aJ5 XfuAnPNq4lBIeiQaoMrrOOuOvXFlQ8mFuTMGTgWw/J7wl4Ykg5tlxs2PqOJRiTaf mNEVgv5RTZ+xWJYloGXjYAA= Received: (qmail 13908 invoked by alias); 11 Feb 2014 14:11:19 -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 13897 invoked by uid 89); 11 Feb 2014 14:11:19 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.8 required=5.0 tests=AWL, BAYES_00, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.2 X-HELO: mail-qc0-f174.google.com Received: from mail-qc0-f174.google.com (HELO mail-qc0-f174.google.com) (209.85.216.174) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-SHA encrypted) ESMTPS; Tue, 11 Feb 2014 14:11:18 +0000 Received: by mail-qc0-f174.google.com with SMTP id x13so12779450qcv.5 for ; Tue, 11 Feb 2014 06:11:16 -0800 (PST) MIME-Version: 1.0 X-Received: by 10.224.114.78 with SMTP id d14mr58150801qaq.19.1392127876101; Tue, 11 Feb 2014 06:11:16 -0800 (PST) Received: by 10.96.131.102 with HTTP; Tue, 11 Feb 2014 06:11:16 -0800 (PST) Date: Tue, 11 Feb 2014 15:11:16 +0100 Message-ID: Subject: [patch c++]: Fix pr/58835 [4.7/4.8/4.9 Regression] ICE with __PRETTY_FUNCTION__ in broken function From: Kai Tietz To: GCC Patches X-IsSubscribed: yes Hi, the following patch adds missing handling of error_mark_node result of fname_decl within finish_fname. ChangeLog 2014-02-11 Kai Tietz PR c++/58835 * semantics.c (finish_fname): Handle error_mark_node. Regression tested for x86_64-unknown-linux-gnu, i686-w64-mingw32. Ok for apply? Regards, Kai Index: semantics.c =================================================================== --- semantics.c (Revision 207686) +++ semantics.c (Arbeitskopie) @@ -2630,7 +2630,8 @@ finish_fname (tree id) tree decl; decl = fname_decl (input_location, C_RID_CODE (id), id); - if (processing_template_decl && current_function_decl) + if (processing_template_decl && current_function_decl + && decl != error_mark_node) decl = DECL_NAME (decl); return decl; }