From patchwork Fri Jul 19 09:00:41 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Butcher X-Patchwork-Id: 260214 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 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "localhost", Issuer "www.qmailtoaster.com" (not verified)) by ozlabs.org (Postfix) with ESMTPS id 2B66E2C0091 for ; Fri, 19 Jul 2013 19:01:59 +1000 (EST) 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; q=dns; s= default; b=xGT+DTelKcyl/02Iznor/Z/x56oRtn+TQuuXv047TA3o8slMZX37i SaRPCjZJ2kEa4mDY9eead8AjAWmopKOEd/4Kaph8N4FlpCqdEwm7IsJ/DpVSuEqb jRsyLqaXzqXCSV+Nf2jMcSc4QffdWpz5JmJQMFVT+4q6iH2fxb1sXw= 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; s= default; bh=uDBesd8qeqPH80SQ6i8RwjZt2ZM=; b=FnqnJq1p1ZYbDh/XblJ9 A0nYM/DG4978zlnj+C4tdQ0sGP/cZsSYK91uXje+rPV1dIudWN3JJ+NIYfJUMuXf R4MZNNLn1BYEMv/6UyeSj14gaC3ZQ1BCp4C6m8x9TTNEdcvFaeHOd5XGvbzwFxj9 yr+NPJ8L2vPRlBntyPkFz2U= Received: (qmail 30002 invoked by alias); 19 Jul 2013 09:01: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 29932 invoked by uid 89); 19 Jul 2013 09:01:26 -0000 X-Spam-SWARE-Status: No, score=-2.9 required=5.0 tests=AWL, BAYES_00, FREEMAIL_FROM, KHOP_THREADED, RCVD_IN_DNSWL_LOW, RCVD_IN_HOSTKARMA_YE, RDNS_NONE, SPF_PASS autolearn=ham version=3.3.1 Received: from Unknown (HELO mail-wg0-f49.google.com) (74.125.82.49) by sourceware.org (qpsmtpd/0.84/v0.84-167-ge50287c) with ESMTP; Fri, 19 Jul 2013 09:01:26 +0000 Received: by mail-wg0-f49.google.com with SMTP id a12so3825694wgh.16 for ; Fri, 19 Jul 2013 02:01:18 -0700 (PDT) X-Received: by 10.180.74.146 with SMTP id t18mr10894178wiv.3.1374224478121; Fri, 19 Jul 2013 02:01:18 -0700 (PDT) Received: from archbang.lan (munkyhouse.force9.co.uk. [84.92.244.81]) by mx.google.com with ESMTPSA id i1sm46950413wiz.6.2013.07.19.02.01.16 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 19 Jul 2013 02:01:17 -0700 (PDT) From: Adam Butcher To: Jason Merrill Cc: gcc-patches@gcc.gnu.org, Andrew Sutton , Adam Butcher Subject: [PATCH 2/3] [lambda] Avoid crash on symbol table writing when generic lambda declared with iostream (or potentially other code) included. Date: Fri, 19 Jul 2013 10:00:41 +0100 Message-Id: <1374224442-9360-3-git-send-email-adam@jessamine.co.uk> In-Reply-To: <1374224442-9360-1-git-send-email-adam@jessamine.co.uk> References: <51DE19EC.10300@redhat.com> <1374224442-9360-1-git-send-email-adam@jessamine.co.uk> --- gcc/symtab.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/gcc/symtab.c b/gcc/symtab.c index 85d47a8..1ada0f7 100644 --- a/gcc/symtab.c +++ b/gcc/symtab.c @@ -116,6 +116,15 @@ insert_to_assembler_name_hash (symtab_node node, bool with_clones) tree name = DECL_ASSEMBLER_NAME (node->symbol.decl); + + // FIXME: how does this nullptr get here when declaring a C++ + // FIXME: generic lambda and including iostream (or presumably + // FIXME: any other header with whatever property is triggering + // FIXME: this)!? + // + if (name == 0) + return; + aslot = htab_find_slot_with_hash (assembler_name_hash, name, decl_assembler_name_hash (name), INSERT); @@ -156,6 +165,15 @@ unlink_from_assembler_name_hash (symtab_node node, bool with_clones) else { tree name = DECL_ASSEMBLER_NAME (node->symbol.decl); + + // FIXME: how does this nullptr get here when declaring a C++ + // FIXME: generic lambda and including iostream (or presumably + // FIXME: any other header with whatever property is triggering + // FIXME: this)!? + // + if (name == 0) + return; + void **slot; slot = htab_find_slot_with_hash (assembler_name_hash, name, decl_assembler_name_hash (name),