From patchwork Fri Mar 17 18:41:08 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Merrill X-Patchwork-Id: 740425 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 3vlDhQ62Vrz9ryj for ; Sat, 18 Mar 2017 05:41:40 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="Sf2H0GU+"; 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 :mime-version:from:date:message-id:subject:to:content-type; q= dns; s=default; b=oWaDBB2z6NmlPEJPvH+agB3nvgvu9b/RwLevWLviYHme31 oW/QbExuvzdJWcPFC29biJY+xo5c+VUq+M/FNxXxiZQdFwwnHUb5/eyYMgfwwrtn cLm39zl9kIwH8aCo0FR8kQl0qYwF1rgLBNjUBxmkY99gFItKDHGbSZUbKMF/s= 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:from:date:message-id:subject:to:content-type; s= default; bh=Q9gxFSvp5BGgHos1oFtgJt5GPQM=; b=Sf2H0GU+/jVZlXoOMQS/ RmxE8vf5Rxrd2i15rkM1u5ds1HGYYutt+jM79RPYsiC6Jv7WIqXJrVAVlkE1jKxa ivG3xtQfB1rpjdRaEJNasNFcKiFsx2B4njZVZ10swZLFsXYDCjFOaR6ClO0cJ7yn iwGAweSjiu38fGd+lLL+A0E= Received: (qmail 11546 invoked by alias); 17 Mar 2017 18:41:32 -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 11531 invoked by uid 89); 17 Mar 2017 18:41:31 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-24.6 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, RCVD_IN_SORBS_SPAM autolearn=ham version=3.3.2 spammy= X-HELO: mail-ot0-f172.google.com Received: from mail-ot0-f172.google.com (HELO mail-ot0-f172.google.com) (74.125.82.172) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 17 Mar 2017 18:41:30 +0000 Received: by mail-ot0-f172.google.com with SMTP id o24so100724291otb.1 for ; Fri, 17 Mar 2017 11:41:30 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=yPUtJsna38FfV+5c19jE3v8Fgvfry9CQPoPzcAk+zYs=; b=VCtYEkq8CyyYr9rtjnfXbmtt8sRV2e8bUaFRihXWAiozJd6u7aqxooRkz1CD3RMpeu FJSrf8flCjE58M8iPTwFVymVdJNeZa5Rkh4dwKA2ZWHPn9ENzunRV/uE74sf2FpoZ4lc STjDViwEZuWKmKuYJ6gGFO181NQVmuuTQSJg6QqTDubAeI7+WdhUXG24Qjxve5QOwQd6 DLfLXkpamDwBWrLi3UDCm5iXYn0YxyaibONbozReJlNL9cbLoillrAP8ntxH6/UA7y1U O0bAimvjLlTkNWiyMmuk8IfKX/Njdxx52wMdXDGRnV0bK30UCyJrN2uDJzbGSkmI07G3 fEsQ== X-Gm-Message-State: AFeK/H1KiNDyczVrc8PeYpcx3teUPDqtbDn4vQ/rL2wvmxwUD6aEYDlG8zQgAHR5j2bTEjdHCA7xGi72WNPyOgrz X-Received: by 10.157.33.85 with SMTP id l21mr9122773otd.217.1489776089068; Fri, 17 Mar 2017 11:41:29 -0700 (PDT) MIME-Version: 1.0 Received: by 10.182.187.8 with HTTP; Fri, 17 Mar 2017 11:41:08 -0700 (PDT) From: Jason Merrill Date: Fri, 17 Mar 2017 14:41:08 -0400 Message-ID: Subject: C++ PATCH for c++/80073 (C++17 ICE with virtual base) To: gcc-patches List X-IsSubscribed: yes The code for setting CLASSTYPE_NON_AGGREGATE failed to consider indirect virtual bases. Tested x86_64-pc-linux-gnu, applying to trunk. commit 18b4a698996d151d87e5db2084859c83facd798f Author: Jason Merrill Date: Fri Mar 17 13:14:42 2017 -0400 PR c++/80073 - C++17 ICE with virtual base. * decl.c (xref_basetypes): Also check for indirect vbases. diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 61ecf81..bf24e8b 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -13812,6 +13812,9 @@ xref_basetypes (tree ref, tree base_list) if (max_vbases) { + /* An aggregate can't have virtual base classes. */ + CLASSTYPE_NON_AGGREGATE (ref) = true; + vec_alloc (CLASSTYPE_VBASECLASSES (ref), max_vbases); if (max_dvbases) diff --git a/gcc/testsuite/g++.dg/init/vbase2.C b/gcc/testsuite/g++.dg/init/vbase2.C new file mode 100644 index 0000000..1711ea9 --- /dev/null +++ b/gcc/testsuite/g++.dg/init/vbase2.C @@ -0,0 +1,8 @@ +// PR c++/80073 +// { dg-do compile { target c++11 } } + +struct A {}; + +struct B : virtual A {}; + +struct C : B {} c {};