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 CE8013858424 for ; Sat, 16 Dec 2023 03:41:43 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org CE8013858424 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 CE8013858424 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=1702698114; cv=none; b=uupIWkkhEUy2OqhiI+vUAokZrbR6+CilbsktFt8vLOM1x0OcpkcDeO05DfgqsVPsI9z/qOz8YD6jhMSqs3r6BqCspmdcKoHR28H2pDhXH/RqSl43/hzsftPkN2L1KECe+YxAk35huvMBHX6G6IJF3Y1x/9ANpjLpamBC5VMofvc= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1702698114; c=relaxed/simple; bh=K4ebLS+JafYqUppeLofWL1B1atK9auETboleJYc1Rl4=; h=DKIM-Signature:Message-ID:Date:MIME-Version:Subject:To:From; b=t6qATjG0lpVvbCk/UWOoOy++mlTDEYijrdnyvLYIDVIx/wT0gf+vRAmR5mrsTsWue6bOF41xky3Qas4EUh/0OY5A0NuMMNwqJ8xrt9JjKuV1Q0b7W5sJsEA64VNV3mQ9TsTCcE2Q1UWLT7mj0PJ93YyXzfOakCsoLizQKyDDnl0= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1702698103; 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=Mw1Pv3CKF6mi2OgMchseThsIWZhKNdwbvA9+1cq0TCY=; b=QVWstw4reYiqrQfvBwixv/hpaYTHWMAahkdffByTj9SbwQMlGE9LjZXSfXa5WmNS7PrrkN w8B7lJxhlvsJoeHVLw7n5UL6T3d7Y/6lEYmW5JAPmSdpb/nsKvbJDORIQUMI9frnjoQ2fM RcAr44xe+7TwKJ1BkkTzht4ZmmNA77M= Received: from mail-qv1-f70.google.com (mail-qv1-f70.google.com [209.85.219.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-411-M8wLBUUiO1G4YimvcntCgw-1; Fri, 15 Dec 2023 22:41:32 -0500 X-MC-Unique: M8wLBUUiO1G4YimvcntCgw-1 Received: by mail-qv1-f70.google.com with SMTP id 6a1803df08f44-67ef53b1f17so20373726d6.3 for ; Fri, 15 Dec 2023 19:41:32 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702698092; x=1703302892; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Mw1Pv3CKF6mi2OgMchseThsIWZhKNdwbvA9+1cq0TCY=; b=k0fwxoggajuA3U6emqQsQcoLoApefKPHwVfpuoDzOa7CtrkzIXnT1aampmJWgX4j3D yF4dkG2UtznqKSe5YA8LFx0fQhi6dny61s6yhm1aVZb/Hp/jP/fssLPrTkt3OlO9s7Dx pIcScgcQtCE7S6KsxtUzbULDZOOhu7m2tqzh8R5Dsi7GL4Rnm3Y1TgRaYCGEXb/sd2GL SulDUfcflEugW+k2d1YpgXDFHT6OmR6Agy9vs5/JDhS0tK8Y3416Jz9q3ywqrZbKuaL2 mykPxyQO9M2lGkbkvjUPqyC1PHVxG4NXFF8ggZNgTFCP6KUrCruJSyb2xhFp7/YZDTsE klOQ== X-Gm-Message-State: AOJu0YzeZ+hrMhWzmzhR65anDidiZi/0A6XoTar9BRhN58Jxpbk+xvgW N+6ZKpUhn0vouhCB7Freoy8q1uQtDStteiVXXL3BHwSc0YAzP6kaCLkyUQlKEwSjnP+kp9XgGZp lRG6x7L5vTwfVa9LKCg== X-Received: by 2002:ad4:4af0:0:b0:67e:f0c8:5a4d with SMTP id cp16-20020ad44af0000000b0067ef0c85a4dmr6946972qvb.40.1702698092256; Fri, 15 Dec 2023 19:41:32 -0800 (PST) X-Google-Smtp-Source: AGHT+IEqydaRUTCFbMQJGZvXIhI7SCyr22hjepCtINqGCjWmwgpaHGPwrvLmQkcUXlsuIpklWOwXqQ== X-Received: by 2002:ad4:4af0:0:b0:67e:f0c8:5a4d with SMTP id cp16-20020ad44af0000000b0067ef0c85a4dmr6946965qvb.40.1702698092000; Fri, 15 Dec 2023 19:41:32 -0800 (PST) Received: from [192.168.1.146] (130-44-146-16.s12558.c3-0.arl-cbr1.sbo-arl.ma.cable.rcncustomer.com. [130.44.146.16]) by smtp.gmail.com with ESMTPSA id nd21-20020a056214421500b0067a2a0b44ddsm7413801qvb.44.2023.12.15.19.41.30 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 15 Dec 2023 19:41:31 -0800 (PST) Message-ID: Date: Fri, 15 Dec 2023 22:41:30 -0500 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH] c++: Fix unchecked use of CLASSTYPE_AS_BASE [PR113031] To: Nathaniel Shead , gcc-patches@gcc.gnu.org Cc: Jonathan Wakely References: <657ced36.170a0220.f138a.ff27@mx.google.com> From: Jason Merrill In-Reply-To: <657ced36.170a0220.f138a.ff27@mx.google.com> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-12.2 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,T_SCC_BODY_TEXT_LINE 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: On 12/15/23 19:20, Nathaniel Shead wrote: > Bootstrapped and regtested on x86_64-pc-linux-gnu with GLIBCXX_TESTSUITE_STDS=20 > and RUNTESTFLAGS="--target_board=unix/-D_GLIBCXX_USE_CXX11_ABI=0". OK, thanks. > -- >8 -- > > My previous patch (naively) assumed that a TREE_CODE of RECORD_TYPE or > UNION_TYPE was sufficient for optype to be considered a "class type". > However, this does not account for e.g. template type parameters of > record or union type. This patch corrects to check for CLASS_TYPE_P > before checking for as-base conversion. > > PR c++/113031 > > gcc/cp/ChangeLog: > > * constexpr.cc (cxx_fold_indirect_ref_1): Check for CLASS_TYPE > before using CLASSTYPE_AS_BASE. > > gcc/testsuite/ChangeLog: > > * g++.dg/cpp0x/pr113031.C: New test. > > Signed-off-by: Nathaniel Shead > --- > gcc/cp/constexpr.cc | 3 ++- > gcc/testsuite/g++.dg/cpp0x/pr113031.C | 34 +++++++++++++++++++++++++++ > 2 files changed, 36 insertions(+), 1 deletion(-) > create mode 100644 gcc/testsuite/g++.dg/cpp0x/pr113031.C > > diff --git a/gcc/cp/constexpr.cc b/gcc/cp/constexpr.cc > index e1b2d27fc36..051f73fb73f 100644 > --- a/gcc/cp/constexpr.cc > +++ b/gcc/cp/constexpr.cc > @@ -5709,7 +5709,8 @@ cxx_fold_indirect_ref_1 (const constexpr_ctx *ctx, location_t loc, tree type, > } > > /* Handle conversion to "as base" type. */ > - if (CLASSTYPE_AS_BASE (optype) == type) > + if (CLASS_TYPE_P (optype) > + && CLASSTYPE_AS_BASE (optype) == type) > return op; > > /* Handle conversion to an empty base class, which is represented with a > diff --git a/gcc/testsuite/g++.dg/cpp0x/pr113031.C b/gcc/testsuite/g++.dg/cpp0x/pr113031.C > new file mode 100644 > index 00000000000..aecdc3fc4b2 > --- /dev/null > +++ b/gcc/testsuite/g++.dg/cpp0x/pr113031.C > @@ -0,0 +1,34 @@ > +// PR c++/113031 > +// { dg-do compile } > + > +template struct variant; > + > +template > +variant<_Types> __variant_cast(_Tp __rhs) { return static_cast&>(__rhs); } > + > +template > +struct _Move_assign_base : _Types { > + void operator=(_Move_assign_base __rhs) { __variant_cast<_Types>(__rhs); } > +}; > + > +template > +struct variant : _Move_assign_base<_Types> { > + void emplace() { > + variant __tmp; > + *this = __tmp; > + } > +}; > + > +struct _Undefined_class { > + struct _Nocopy_types { > + void (_Undefined_class::*_M_member_pointer)(); > + }; > + struct function : _Nocopy_types { > + struct optional { > + void test03() { > + variant v; > + v.emplace(); > + } > + }; > + }; > +};