From patchwork Mon Mar 20 07:44:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ken Matsui X-Patchwork-Id: 72020 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp1073026wrt; Mon, 20 Mar 2023 00:45:56 -0700 (PDT) X-Google-Smtp-Source: AK7set9BPvzlwQi7HI6w8tIkpSp1yNibJJPL6lq+wyBV/RVzy9rd5AhVREBj6Qvtiq31+gHquVMR X-Received: by 2002:a17:906:174c:b0:878:5372:a34b with SMTP id d12-20020a170906174c00b008785372a34bmr8729906eje.45.1679298355994; Mon, 20 Mar 2023 00:45:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679298355; cv=none; d=google.com; s=arc-20160816; b=dDhavFeaeQRz1ExAAxgMnuOaYYi4E85Gub1f3NiiyrkzDKt7Kpwygnn6l/RGHt4CVd l8fQosFW1yr5xvNjo0XZ7w2JZdlMZhwZDSWoPfrehf3/lgAcMvCql0Sl606vxn9xWH73 4xI3MZvFkedU8CfO1RnAr3iPrre7B7lSYx2Uiq9V8HhzLJhhmOvfRM3wWOzraAAboo13 jEZ0jTdiTUcC5o4bU8hcg/ttyDvu8qchacb2lDd1cl1Mp9Ssanm9Txz9WsRREnVGjHfZ aHYKskcWDMK8sRiUYeV2+wq0uTnmR8GVqy+9S76Q2F7KG1mRc7OZFZqhPnGAu1mb4bjz 0YBQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:cc:to:subject :message-id:date:mime-version:dmarc-filter:delivered-to :dkim-signature:dkim-filter; bh=u6SusSfNEvshRcJk8rjWjAqqOA+tAXA170+lEPR4Rq4=; b=DYCngRocluAiY/MbJns/+hvXFCW5DelXHjkpKxSiMFlbKHpldfnRS5eRauHoKBVp0K 10gT3nEs9wPMD6krNhoSclgsFw62aSZi0yWxpFakdbKQ0O1eMH3iAtV76V5MsNdG4hU5 fZNqTD1PAX6y3bD0D+RbG+1ja0ojnrmdAYp4j/8mAR+o1kk+RJN+Uwaup1Di4K8pqd3C x9uZUPsNx/apaC0uK86lzAWfG0y7ngjR0UBxAIZRLHUS1A2VRwVjrltXSh4SH/uFFcCG DtfMnaxbKQbGhzxezH1aKmPM8GWHSpyvO30JXAnVE4oOSB6uwxN7dh26Xuf6r9TCeSiv 7IPw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=jkwrxJSm; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id o3-20020a170906774300b008e491ea86ddsi9329523ejn.474.2023.03.20.00.45.55 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Mar 2023 00:45:55 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=jkwrxJSm; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id C6F2A385840D for ; Mon, 20 Mar 2023 07:45:54 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C6F2A385840D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1679298354; bh=u6SusSfNEvshRcJk8rjWjAqqOA+tAXA170+lEPR4Rq4=; h=Date:Subject:To:Cc:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=jkwrxJSmn3oMSHNwvrs3xpaVMyVofMJQD22pIseiQPK7ogjJsuJlUxwZnYVpthnbi cCz303p/XuECPJbc7v/0DxuOQRSVKHn/vfveHoTwG8+eGSJuqGvK+QU3L1l+OJoHar erw4BAo033x7tO4qq9rosA+JtKoqcAmhu7yC4rB4= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org 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 Received: by mail-ua1-x929.google.com with SMTP id r7so7236985uaj.2 for ; Mon, 20 Mar 2023 00:45:11 -0700 (PDT) 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-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 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 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 X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Ken Matsui via Gcc-patches From: Ken Matsui Reply-To: Ken Matsui Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1760871952886527982?= X-GMAIL-MSGID: =?utf-8?q?1760871952886527982?= 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