From patchwork Mon Jul 6 18:11:09 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Egas Ribeiro X-Patchwork-Id: 138609 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from vm01.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 538DB4BA2E16 for ; Mon, 6 Jul 2026 18:12:30 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 538DB4BA2E16 Authentication-Results: sourceware.org; dkim=pass (2048-bit key, unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20251104 header.b=MgyoX2+L X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wm1-x330.google.com (mail-wm1-x330.google.com [IPv6:2a00:1450:4864:20::330]) by sourceware.org (Postfix) with ESMTPS id 1B90F4BA2E05 for ; Mon, 6 Jul 2026 18:11:53 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 1B90F4BA2E05 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 1B90F4BA2E05 Authentication-Results: sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::330 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1783361513; cv=none; b=PRONwf9Z4428aAUEnH2UQrWZmuU1CeEQCfZ6Z+AD0x63+BoNuBZGW0xZ3AV6H2MSjOJiiHB0oU/FoIBh8g4b4rimpvJiYhoJuoh/stB+VDIq8nfNwkrVUvxsTpCnuuEypypO/U3syjJsiBBhml/avesJf1y0vVBbaKaLzgeDWSQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1783361513; c=relaxed/simple; bh=gWHnlyaArdeEOIkcjcHpLYHUZkpACmIWNbVjNme65Zw=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=mh/wf9Bem9IXA1uplPEKcjrMAPYE45/NC9Kvt+7TvLlOCeMvoL5nwaf48uJTYhnqTxpX97oZgWfxdQEieUf2bqXRwzgeuSYz1gpCxPX8sYFe47xd+sVmbhl+9jqn3FYJotyTHvxCxfVYsJfzdgXu0839K9r55J+4NG2ktFoc434= ARC-Authentication-Results: i=1; sourceware.org; dkim=pass (2048-bit key, unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20251104 header.b=MgyoX2+L DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1B90F4BA2E05 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-493c2c0b9a8so30009715e9.1 for ; Mon, 06 Jul 2026 11:11:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1783361512; x=1783966312; darn=gcc.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to:content-type; bh=H1EJGqi43e32MLgsHi+jCq6bJzt/qZuzE0TcqXDRDUQ=; b=MgyoX2+L3aIcawGqYHnxW40ndFq++GKk0AVTOE9EBBJ+rIuciEQ7ixfbcM3g4l770B hKVjeDy7dTZryyTVkyusR2JmphDQ7pwTGT4nSf7Za5hXnuMhJQazRaG4SCOrR6AGRhLy rAizXrZpLu3H/DYbSSg0makvsO4SBPsWVEZF87QFvxID6dfhlNFv2TtAewwazGa1tHNY 68044c2nRS2FFBTyaa6DntKoKTpIOhErAxXWrSdqCiyWNcjQIMOoWZhKqxVaI3NEijVg AJg3ZhmmYI1FDfkpAM/RBeomBSQ3EOwZrYXMBrm/Pnc+senfD1L5MHkulpJxykNras20 Wotg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783361512; x=1783966312; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=H1EJGqi43e32MLgsHi+jCq6bJzt/qZuzE0TcqXDRDUQ=; b=Q2ca04h3UWxK8MIOeUfqQEtz5Vr5kNMF0c4yGUj3M5t/zES4b4224+aVNaxj1yVYnJ HGEuGQ/iArYnDRLN+6UdB9gzEbhcCcbOyLkoWhevrVz16fjPQ5q9FM6b48Z84ZG63k9x /jQISY0JGVobCiV3nXQAMmbjxBsKnaEJ7e4kkoa48ptFhXoyDO9UsZeRf8h85U3y5mIb BycAcmsgMHIaa+8Kg/PzjdiDZBIqUA2TNBVzn2Y2re7/Gt4LzoDF85NH+LnNuZB4oyW1 7pmt31IgBsUcIpDnqfkS/HhnTOs4A7go8dOrDTNquGKA4HlvAZpwtDcQizNXbvONmasS UwRA== X-Gm-Message-State: AOJu0Yy8hvnYKIn3ByJfG+Yi6m6EY8zJ1TVzNxfaBiZaXMC0cG3OUV+S 3jGpDFEtQcT2IHEVQzwPU3XzfvE5WGCV81Rm/BmdUKbWmr/iirYN4VTmdbpQk7d0 X-Gm-Gg: AfdE7clbLwwW8blKmPjrJgtRoFKLgrWTpensO9G7ot0z71qCLOvWPDDLaFHKsT/wEJQ H9bwpDl3A16WPHldCAW0eSNyu+rBChorDncqHpw9HDQ/bcZj+3jg2SKIpDO5OKXyLaz8GjCFA3f X9JJbks58GRVDwJjFzjWowXE8OsYkz4p31sYM37M2VMcAyYTMHLLBf2ZvnpJM/5mOG+5sEoWsvU ouv3bwbtu1MTbtdFJLYRy9xntbGi4ffWRn6Fvt3DzBrb/TjhE+Lk3h8IWTg1sdj+I5qpGfRsDeA zd3+lPsNK8Blu/uC1p+I7N3tTZJa/Z6TM828MSqD3458bybYw/m0Gd32M0y8cAs0c1+2+vlmyg2 TJ61lI99ftoNFIYbQHwt9ow1KU21ibMFOuv5/pHqfPk+ul6plYjHHfmOFIXgEAJWTu37y3OURje UZWAM15h1NRrhY4kFdn7el/0jhO3Gkd4FVv7xV/kDW4UD/Km+LJ+uWBj0= X-Received: by 2002:a05:600c:5308:b0:493:d0f7:69c3 with SMTP id 5b1f17b1804b1-493df09fe25mr19447415e9.33.1783361511753; Mon, 06 Jul 2026 11:11:51 -0700 (PDT) Received: from archlinux (bl10-236-131.dsl.telepac.pt. [85.243.236.131]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-47aa039b0cesm26501899f8f.22.2026.07.06.11.11.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Jul 2026 11:11:51 -0700 (PDT) From: Egas Ribeiro To: gcc-patches@gcc.gnu.org Cc: dmalcolm@redhat.com, jason@redhat.com, Egas Ribeiro Subject: [PATCH v3] c++: handle nullptr_t in can_convert_eh Date: Mon, 6 Jul 2026 19:11:09 +0100 Message-ID: <20260706181108.88645-2-egas.g.ribeiro@gmail.com> X-Mailer: git-send-email 2.54.0 MIME-Version: 1.0 X-Spam-Status: No, score=-9.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_PBL, SPF_HELO_NONE, SPF_PASS, TXREP shortcircuit=no autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on 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 can_convert_eh implements the [except.handle] matching rules, but did not cover the case of a std::nullptr_t exception being caught by a handler of pointer or pointer-to-member type. Add it. gcc/cp/ChangeLog: * except.cc (can_convert_eh): Handle a nullptr_t exception caught by a pointer or pointer-to-member handler. gcc/testsuite/ChangeLog: * g++.dg/eh/can-convert-nullptr.C: New test. Signed-off-by: Egas Ribeiro --- gcc/cp/except.cc | 3 +++ gcc/testsuite/g++.dg/eh/can-convert-nullptr.C | 7 +++++++ 2 files changed, 10 insertions(+) create mode 100644 gcc/testsuite/g++.dg/eh/can-convert-nullptr.C diff --git a/gcc/cp/except.cc b/gcc/cp/except.cc index 4f40a49ae3f..9ec635af74d 100644 --- a/gcc/cp/except.cc +++ b/gcc/cp/except.cc @@ -982,6 +982,9 @@ can_convert_eh (tree to, tree from) if (same_type_ignoring_top_level_qualifiers_p (to, from)) return true; + if (NULLPTR_TYPE_P (from) && TYPE_PTR_OR_PTRMEM_P (to)) + return true; + if (TYPE_PTR_P (to) && TYPE_PTR_P (from)) { to = TREE_TYPE (to); diff --git a/gcc/testsuite/g++.dg/eh/can-convert-nullptr.C b/gcc/testsuite/g++.dg/eh/can-convert-nullptr.C new file mode 100644 index 00000000000..b609234591e --- /dev/null +++ b/gcc/testsuite/g++.dg/eh/can-convert-nullptr.C @@ -0,0 +1,7 @@ +// { dg-do compile { target c++11 } } + +int main() { + try { throw nullptr; } + catch (void *) {} + catch (decltype(nullptr)) {} // { dg-warning "will be caught by earlier handler" } +}