From patchwork Thu Feb 22 21:11:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Pinski X-Patchwork-Id: 86241 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 43E8E3858294 for ; Thu, 22 Feb 2024 21:12:45 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) by sourceware.org (Postfix) with ESMTPS id 95DBA3858CD1 for ; Thu, 22 Feb 2024 21:12:09 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 95DBA3858CD1 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=quicinc.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=quicinc.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 95DBA3858CD1 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=205.220.180.131 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1708636331; cv=none; b=vht/TUfwv1eCliyY8e+opx50jMt5jKMnSxYsZzqVMEc/z0N9ur0h45zPP0Hk8J8u82KCfT3ADUpIgro/uzQP4BOrmNNrjWRCMXc1rSjPBUWzEv2zESx+m1TGpuNZ5/3/Dn//KNp66qlUuhJ37NOslUEW3uzsV2u2yUrLtjzROo4= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1708636331; c=relaxed/simple; bh=Qf1AlGzIiq4D9SkxTYPNb9jc6GVYqTaJast4MevNdEY=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=dEbtRg6N4yq1fJBNVTWCX+J2rOMSM2Qv6JZRsDG9QxJsQPoaAf5vManQhAy4z0uHywRkdzG4TyFlLM4WnWJl14aX+zdDspIBzC/wCSxMNENfgzPNTJc1Za1Cdag5oGhAJlMOiioY7GNIoV/ZjaJNXgfVAEoSHzdk3a7N+Ta4EKI= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from pps.filterd (m0279872.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.17.1.24/8.17.1.24) with ESMTP id 41MKvqRZ022852 for ; Thu, 22 Feb 2024 21:12:09 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h= from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding:content-type; s=qcppdkim1; bh=hMdE5Vf F9gKh+1JS9xfFNrKhsMPQwWh9RMK3Fvu79T4=; b=jw/JH9yLShetDcDPEDdhm2L lsIayBLqQbAKtJFg7q+kqCbKGDltTbeNuni1sdfVeVWw1JFoOy5Ll2akbqcZh5FB UmP8tUmeXxcbxcJX2j16XPfqBwDuTsmZo9oTUndrP35bWJtmyB7ujCyoGm6Axp9D zxB3y/dI9B/udj1WCkCc9Icj0ALIZQKbMzBmUgOSNO2I08KmT2Bmh0hdYEmu+Zal 9QFkPhPbkQd9XtXI8beofeQzGxUQ4TeaJCEpYqZJA1dEHeYf4MlnoWOvIQ5KwDiD 2ExILESQ4FFcUI9LLjsFT+RKww7APWNJTcfZbEG8H4XcJf5cojKsWSchQea4dZw= = Received: from nasanppmta02.qualcomm.com (i-global254.qualcomm.com [199.106.103.254]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3we97tg7rp-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 22 Feb 2024 21:12:08 +0000 (GMT) Received: from nasanex01c.na.qualcomm.com (nasanex01c.na.qualcomm.com [10.45.79.139]) by NASANPPMTA02.qualcomm.com (8.17.1.5/8.17.1.5) with ESMTPS id 41MLC6pm030947 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 22 Feb 2024 21:12:06 GMT Received: from hu-apinski-lv.qualcomm.com (10.49.16.6) by nasanex01c.na.qualcomm.com (10.45.79.139) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.40; Thu, 22 Feb 2024 13:12:05 -0800 From: Andrew Pinski To: CC: Andrew Pinski Subject: [COMMITTED/13] warn-access: Fix handling of unnamed types [PR109804] Date: Thu, 22 Feb 2024 13:11:55 -0800 Message-ID: <20240222211155.3218320-1-quic_apinski@quicinc.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Originating-IP: [10.49.16.6] X-ClientProxiedBy: nalasex01b.na.qualcomm.com (10.47.209.197) To nasanex01c.na.qualcomm.com (10.45.79.139) X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-GUID: ibIIe8I13JA9bviny60Lrr0AWINhO8qP X-Proofpoint-ORIG-GUID: ibIIe8I13JA9bviny60Lrr0AWINhO8qP X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-02-22_15,2024-02-22_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 spamscore=0 bulkscore=0 priorityscore=1501 malwarescore=0 adultscore=0 phishscore=0 lowpriorityscore=0 mlxscore=0 suspectscore=0 mlxlogscore=999 impostorscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2402120000 definitions=main-2402220165 X-Spam-Status: No, score=-13.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS, 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 X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org This looks like an oversight of handling DEMANGLE_COMPONENT_UNNAMED_TYPE. DEMANGLE_COMPONENT_UNNAMED_TYPE only has the u.s_number.number set while the code expected newc.u.s_binary.left would be valid. So this treats DEMANGLE_COMPONENT_UNNAMED_TYPE like we treat function paramaters (DEMANGLE_COMPONENT_FUNCTION_PARAM) and template paramaters (DEMANGLE_COMPONENT_TEMPLATE_PARAM). Note the code in the demangler does this when it sets DEMANGLE_COMPONENT_UNNAMED_TYPE: ret->type = DEMANGLE_COMPONENT_UNNAMED_TYPE; ret->u.s_number.number = num; Committed as obvious after bootstrap/test on x86_64-linux-gnu PR tree-optimization/109804 gcc/ChangeLog: * gimple-ssa-warn-access.cc (new_delete_mismatch_p): Handle DEMANGLE_COMPONENT_UNNAMED_TYPE. gcc/testsuite/ChangeLog: * g++.dg/warn/Wmismatched-new-delete-8.C: New test. Signed-off-by: Andrew Pinski (cherry picked from commit 1076ffda6ce5e6d5fc9577deaf8233e549e5787a) --- gcc/gimple-ssa-warn-access.cc | 1 + .../g++.dg/warn/Wmismatched-new-delete-8.C | 42 +++++++++++++++++++ 2 files changed, 43 insertions(+) create mode 100644 gcc/testsuite/g++.dg/warn/Wmismatched-new-delete-8.C diff --git a/gcc/gimple-ssa-warn-access.cc b/gcc/gimple-ssa-warn-access.cc index 48e85e9cab5..cd02a02b1da 100644 --- a/gcc/gimple-ssa-warn-access.cc +++ b/gcc/gimple-ssa-warn-access.cc @@ -1700,6 +1700,7 @@ new_delete_mismatch_p (const demangle_component &newc, case DEMANGLE_COMPONENT_FUNCTION_PARAM: case DEMANGLE_COMPONENT_TEMPLATE_PARAM: + case DEMANGLE_COMPONENT_UNNAMED_TYPE: return newc.u.s_number.number != delc.u.s_number.number; case DEMANGLE_COMPONENT_CHARACTER: diff --git a/gcc/testsuite/g++.dg/warn/Wmismatched-new-delete-8.C b/gcc/testsuite/g++.dg/warn/Wmismatched-new-delete-8.C new file mode 100644 index 00000000000..0ddc056c6df --- /dev/null +++ b/gcc/testsuite/g++.dg/warn/Wmismatched-new-delete-8.C @@ -0,0 +1,42 @@ +/* PR tree-optimization/109804 */ +/* { dg-do compile { target c++11 } } */ +/* { dg-options "-Wall" } */ + +/* Here we used to ICE in new_delete_mismatch_p because + we didn't handle unnamed types from the demangler (DEMANGLE_COMPONENT_UNNAMED_TYPE). */ + +template +static inline T * construct_at(void *at, ARGS && args) +{ + struct Placeable : T + { + Placeable(ARGS && args) : T(args) { } + void * operator new (long unsigned int, void *ptr) { return ptr; } + void operator delete (void *, void *) { } + }; + return new (at) Placeable(static_cast(args)); +} +template +struct Reconstructible +{ + char _space[sizeof(MT)]; + Reconstructible() { } +}; +template +struct Constructible : Reconstructible +{ + Constructible(){} +}; +struct A { }; +struct B +{ + Constructible a { }; + B(int) { } +}; +Constructible b { }; +void f() +{ + enum { ENUM_A = 1 }; + enum { ENUM_B = 1 }; + construct_at(b._space, ENUM_B); +}