From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-ua1-x929.google.com (mail-ua1-x929.google.com [IPv6:2607:f8b0:4864:20::929]) by sourceware.org (Postfix) with ESMTPS id 5B09D3858C53 for ; Mon, 20 Mar 2023 07:45:11 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 5B09D3858C53 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=cs.washington.edu Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=cs.washington.edu Received: by mail-ua1-x929.google.com with SMTP id r7so7236985uaj.2 for ; Mon, 20 Mar 2023 00:45:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cs.washington.edu; s=goo201206; t=1679298310; h=cc:to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=u6SusSfNEvshRcJk8rjWjAqqOA+tAXA170+lEPR4Rq4=; b=jRjMMRSpePSDBq1qf+CRzmMjvzwnIBhMzunjhO/S6Z1EYd9p4HA1LjNSZpEiAScHxt PHoTgwL5lAW6rQ8pe3p8wr5b/++uYdNPnSvK7Qrx9tovm2r8xQI+K3U799b0w4zJKLcr BKOxz9sPhcLn6ou3dsBCEC/kXLudQWU4r76+0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679298310; h=cc:to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=u6SusSfNEvshRcJk8rjWjAqqOA+tAXA170+lEPR4Rq4=; b=0hn93Iis2D8TKTbYpHvDNltXw6g4PRCKQcvLKhGXgYzUKMvvF3aSYzLFTt6i9E1d7P 7yR8Ug/bpAyVIXHlTx6vy5TNZpmZohrkG16Ne4WgiFIvjpyztMZyb4siUnty6TLzAnZF H7Q3Yzbr7hfL18XGLCWDZ7fNiTGm0UNIot2iHU6JtrCDtajxFSwF9w5YTik405tcRD+M YByndrRbZtYNMCFEVLKC49XoqxSTyVlu0vT0ItBmHT9J0zuvbsTmDtVw0ffJq5Ixe4ww 0MeJ40nRBUqzfbFEKICobaAuygmRvSJHWFAAkAQwtRznKrc/xEBJgwq1lzZ/Kiw8GyPS 6UgA== X-Gm-Message-State: AO0yUKWIEjfIH1nsDzWZRon+fNWpFkofhNzPQHzfmAk5se+W18AgoEaa GYOJJ2LMlnpnByeLAXDSevlsXxkQeJzgh70s0u7sEF6QVTplnXsVgpc= X-Google-Smtp-Source: AK7set83hMrsnYtXXLrMEKUZjICRzcHwsp/5c2FVOC45yJ30B/MbhMBRyZBw9P6XboipcZ1ZJRwLSzVTBVRxVjVWP7s= X-Received: by 2002:ab0:1006:0:b0:68a:5bba:ba40 with SMTP id f6-20020ab01006000000b0068a5bbaba40mr3580880uab.1.1679298310288; Mon, 20 Mar 2023 00:45:10 -0700 (PDT) MIME-Version: 1.0 From: Ken Matsui Date: Mon, 20 Mar 2023 00:44:59 -0700 Message-ID: Subject: [PATCH] c++: implement __add_pointer built-in trait To: gcc-patches@gcc.gnu.org Cc: Patrick Palka Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-10.5 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP 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: This patch implements built-in trait for std::add_pointer. gcc/cp/ChangeLog: * cp-trait.def: Define __add_pointer. * semantics.cc (finish_trait_type): Handle CPTK_ADD_POINTER. gcc/testsuite/ChangeLog: * g++.dg/ext/has-builtin-1.C: Test existence of __add_pointer. * g++.dg/ext/add_pointer.C: New test. --- diff --git a/gcc/cp/cp-trait.def b/gcc/cp/cp-trait.def index bac593c0094..07fab8db26b 100644 --- a/gcc/cp/cp-trait.def +++ b/gcc/cp/cp-trait.def @@ -91,6 +91,7 @@ DEFTRAIT_TYPE (REMOVE_CV, "__remove_cv", 1) DEFTRAIT_TYPE (REMOVE_REFERENCE, "__remove_reference", 1) DEFTRAIT_TYPE (REMOVE_CVREF, "__remove_cvref", 1) DEFTRAIT_TYPE (UNDERLYING_TYPE, "__underlying_type", 1) +DEFTRAIT_TYPE (ADD_POINTER, "__add_pointer", 1) /* These traits yield a type pack, not a type, and are represented by cp_parser_trait as a special BASES tree instead of a TRAIT_TYPE tree. */ diff --git a/gcc/cp/semantics.cc b/gcc/cp/semantics.cc index 87c2e8a7111..3527f596983 100644 --- a/gcc/cp/semantics.cc +++ b/gcc/cp/semantics.cc @@ -12273,6 +12273,10 @@ finish_trait_type (cp_trait_kind kind, tree type1, tree type2) if (TYPE_REF_P (type1)) type1 = TREE_TYPE (type1); return cv_unqualified (type1); + case CPTK_ADD_POINTER: + if (TYPE_REF_P (type1)) + type1 = TREE_TYPE (type1); + return build_pointer_type (type1); #define DEFTRAIT_EXPR(CODE, NAME, ARITY) \ case CPTK_##CODE: diff --git a/gcc/testsuite/g++.dg/ext/add_pointer.C b/gcc/testsuite/g++.dg/ext/add_pointer.C new file mode 100644 index 00000000000..e35873553c8 --- /dev/null +++ b/gcc/testsuite/g++.dg/ext/add_pointer.C @@ -0,0 +1,46 @@ +// { dg-do compile { target c++11 } } + +#define SA(X) static_assert((X),#X) + +SA(__is_same(__add_pointer(int), int*)); +SA(__is_same(__add_pointer(const int), const int*)); +SA(__is_same(__add_pointer(volatile int), volatile int*)); +SA(__is_same(__add_pointer(const volatile int), const volatile int*)); + +SA(__is_same(__add_pointer(int*), int**)); +SA(__is_same(__add_pointer(const int*), const int**)); +SA(__is_same(__add_pointer(volatile int*), volatile int**)); +SA(__is_same(__add_pointer(const volatile int*), const volatile int**)); + +SA(__is_same(__add_pointer(int* const), int* const*)); +SA(__is_same(__add_pointer(int* volatile), int* volatile*)); +SA(__is_same(__add_pointer(int* const volatile), int* const volatile*)); + +SA(__is_same(__add_pointer(int&), int*)); +SA(__is_same(__add_pointer(const int&), const int*)); +SA(__is_same(__add_pointer(volatile int&), volatile int*)); +SA(__is_same(__add_pointer(const volatile int&), const volatile int*)); + +SA(__is_same(__add_pointer(int&&), int*)); +SA(__is_same(__add_pointer(const int&&), const int*)); +SA(__is_same(__add_pointer(volatile int&&), volatile int*)); +SA(__is_same(__add_pointer(const volatile int&&), const volatile int*)); + +SA(__is_same(__add_pointer(int[3]), int(*)[3])); +SA(__is_same(__add_pointer(const int[3]), const int(*)[3])); +SA(__is_same(__add_pointer(volatile int[3]), volatile int(*)[3])); +SA(__is_same(__add_pointer(const volatile int[3]), const volatile int(*)[3])); + +SA(__is_same(__add_pointer(int(*)[3]), int(**)[3])); +SA(__is_same(__add_pointer(const int(*)[3]), const int(**)[3])); +SA(__is_same(__add_pointer(volatile int(*)[3]), volatile int(**)[3])); +SA(__is_same(__add_pointer(const volatile int(*)[3]), const volatile int(**)[3])); + +SA(__is_same(__add_pointer(int(* const)[3]), int(* const*)[3])); +SA(__is_same(__add_pointer(int(* volatile)[3]), int(* volatile*)[3])); +SA(__is_same(__add_pointer(int(* const volatile)[3]), int(* const volatile*)[3])); + +SA(__is_same(__add_pointer(int(int)), int(*)(int))); +SA(__is_same(__add_pointer(int(* const)(int)), int(* const*)(int))); +SA(__is_same(__add_pointer(int(* volatile)(int)), int(* volatile*)(int))); +SA(__is_same(__add_pointer(int(* const volatile)(int)), int(* const volatile*)(int))); diff --git a/gcc/testsuite/g++.dg/ext/has-builtin-1.C b/gcc/testsuite/g++.dg/ext/has-builtin-1.C index f343e153e56..bed4f932bfa 100644 --- a/gcc/testsuite/g++.dg/ext/has-builtin-1.C +++ b/gcc/testsuite/g++.dg/ext/has-builtin-1.C @@ -146,3 +146,6 @@ #if !__has_builtin (__remove_cvref) # error "__has_builtin (__remove_cvref) failed" #endif +#if !__has_builtin (__add_pointer) +# error "__has_builtin (__add_pointer) failed" +#endif