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.133.124]) by sourceware.org (Postfix) with ESMTPS id 201D0382891B for ; Fri, 27 May 2022 18:07:42 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 201D0382891B Received: from mail-qt1-f199.google.com (mail-qt1-f199.google.com [209.85.160.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-124-3cp0kyl5PHSEQ43vboyprA-1; Fri, 27 May 2022 14:07:35 -0400 X-MC-Unique: 3cp0kyl5PHSEQ43vboyprA-1 Received: by mail-qt1-f199.google.com with SMTP id f40-20020a05622a1a2800b002fcc151deebso4204869qtb.4 for ; Fri, 27 May 2022 11:07:35 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Dn29b9feBrfxIHwwDxy6PMyvvShPWk3yVxbZz1i0S/s=; b=oqWp2qqkxXYaW90qxdn+gJ7Fu8zYmu9PQHt/bXV0aaWW8IeDVn3W1SxwdyCRM+wClR 0nYaxs71ZXDS2bQybH3zJbHaydunR5ws2ezjsOMyKRTFfERVxrQ2oEIWKMhWrUF9cj1U ox36qk9l/G27U3cgorZMoIf8Vu2dyyYf10TY8WIUm1JIGLu0DvX5/kGR05HFvVxrYZ8V nJeOsD1Y87Z/QeqtIgvQzBY9rBx2IASka+5Heo0hXRR3Y8Qh1HRc71ymNA4v8laclLc1 JOV6uf5Myk0QAHEFpbrd0xrjv7WFWkURZMpunR8fTGRSOR9WuxhFlW+a3QOfCYnstVGo yhnA== X-Gm-Message-State: AOAM533O4bToQvTgtHB+2We1ytBh0LvcLw29Uap5NReyklNiliNga277 X4oDIGlovTb24bcxmDMVcw01rU3oyb76WDlu2ZtSHTIGDurXjq+tlCxL9x7GKSPoL4rpscOn7hl Nd5urdqJLRGJ6fDIrPqi/td8yJKo7CpqScfSJCb598FPMVvbLsQtQxP/np+13g2d8Aok= X-Received: by 2002:ac8:5a83:0:b0:2f3:bafa:3bcc with SMTP id c3-20020ac85a83000000b002f3bafa3bccmr34158991qtc.366.1653674854923; Fri, 27 May 2022 11:07:34 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwYDCvGpz9T/25licTn3Ub5uHFqNrVAnRqB0SRyGxkZU40WX59+r2oJ5e+VpV/HLifeHQVdlQ== X-Received: by 2002:ac8:5a83:0:b0:2f3:bafa:3bcc with SMTP id c3-20020ac85a83000000b002f3bafa3bccmr34158964qtc.366.1653674854641; Fri, 27 May 2022 11:07:34 -0700 (PDT) Received: from localhost.localdomain (ool-457670bb.dyn.optonline.net. [69.118.112.187]) by smtp.gmail.com with ESMTPSA id h4-20020a379e04000000b006a328ed2cecsm3314338qke.29.2022.05.27.11.07.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 May 2022 11:07:34 -0700 (PDT) From: Patrick Palka To: gcc-patches@gcc.gnu.org Subject: [PATCH] c++: document comp_template_args's default args Date: Fri, 27 May 2022 14:07:32 -0400 Message-Id: <20220527180732.2909166-1-ppalka@redhat.com> X-Mailer: git-send-email 2.36.1.195.g8ddf593a25 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-Spam-Status: No, score=-14.3 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, 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 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-List-Received-Date: Fri, 27 May 2022 18:07:43 -0000 In passing, use bool for its return type. gcc/cp/ChangeLog: * cp-tree.h (comp_template_args): Change return type to bool. * pt.cc (comp_template_args): Document default arguments. Change return type to bool and adjust returns accordingly. --- gcc/cp/cp-tree.h | 2 +- gcc/cp/pt.cc | 24 +++++++++++------------- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h index d77fd1eb8a9..da8898155e0 100644 --- a/gcc/cp/cp-tree.h +++ b/gcc/cp/cp-tree.h @@ -7327,7 +7327,7 @@ extern tree get_template_info (const_tree); extern int template_class_depth (tree); extern int is_specialization_of (tree, tree); extern bool is_specialization_of_friend (tree, tree); -extern int comp_template_args (tree, tree, tree * = NULL, +extern bool comp_template_args (tree, tree, tree * = NULL, tree * = NULL, bool = false); extern int template_args_equal (tree, tree, bool = false); extern tree maybe_process_partial_specialization (tree); diff --git a/gcc/cp/pt.cc b/gcc/cp/pt.cc index ec168234325..b5064990857 100644 --- a/gcc/cp/pt.cc +++ b/gcc/cp/pt.cc @@ -9368,27 +9368,25 @@ template_args_equal (tree ot, tree nt, bool partial_order /* = false */) } } -/* Returns 1 iff the OLDARGS and NEWARGS are in fact identical sets of - template arguments. Returns 0 otherwise, and updates OLDARG_PTR and +/* Returns true iff the OLDARGS and NEWARGS are in fact identical sets of + template arguments. Returns false otherwise, and updates OLDARG_PTR and NEWARG_PTR with the offending arguments if they are non-NULL. */ -int +bool comp_template_args (tree oldargs, tree newargs, - tree *oldarg_ptr, tree *newarg_ptr, - bool partial_order) + tree *oldarg_ptr /* = NULL */, tree *newarg_ptr /* = NULL */, + bool partial_order /* = false */) { - int i; - if (oldargs == newargs) - return 1; + return true; if (!oldargs || !newargs) - return 0; + return false; if (TREE_VEC_LENGTH (oldargs) != TREE_VEC_LENGTH (newargs)) - return 0; + return false; - for (i = 0; i < TREE_VEC_LENGTH (oldargs); ++i) + for (int i = 0; i < TREE_VEC_LENGTH (oldargs); ++i) { tree nt = TREE_VEC_ELT (newargs, i); tree ot = TREE_VEC_ELT (oldargs, i); @@ -9399,10 +9397,10 @@ comp_template_args (tree oldargs, tree newargs, *oldarg_ptr = ot; if (newarg_ptr != NULL) *newarg_ptr = nt; - return 0; + return false; } } - return 1; + return true; } inline bool -- 2.36.1.195.g8ddf593a25