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.129.124]) by sourceware.org (Postfix) with ESMTPS id DDAF5385515F for ; Tue, 29 Nov 2022 17:14:47 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org DDAF5385515F Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1669742087; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/WhSZwGkM3tWh4wOVNMg0twDbDwLs/uxFZ/LSX/TgPs=; b=eGTecbZxTPC+z2hqF37+Unn5FjVI83+Wgx/u3jBuUkgMldlTXGSrfl3s7btF4ZcfXO5PmB SIRKwSD8TSLF2FDU6/Tmjc1b+usiIOYSbwff7M6BmKLmuPg04m53SXWvPqIi6vi7FrEqa+ RrDuxmJVOp1Ex63joPPMFbkWtsuTsZE= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-85-h3bA7RP4NH-OoLfVD9p_ww-1; Tue, 29 Nov 2022 12:14:43 -0500 X-MC-Unique: h3bA7RP4NH-OoLfVD9p_ww-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 59B99101246A; Tue, 29 Nov 2022 17:14:35 +0000 (UTC) Received: from localhost (unknown [10.33.36.164]) by smtp.corp.redhat.com (Postfix) with ESMTP id 215432024CBF; Tue, 29 Nov 2022 17:14:35 +0000 (UTC) From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed] libstdc++: Remove unnecessary tag dispatching in std::vector Date: Tue, 29 Nov 2022 17:14:32 +0000 Message-Id: <20221129171432.149718-1-jwakely@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.8 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,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE,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: Tested x86_64-linux. Pushed to trunk. -- >8 -- There's no need to call a _M_xxx_dispatch function with a statically-known __false_type tag, we can just directly call the function that should be dispatched to. This will compile a tiny bit faster and save a function call with optimization or inlining turned off. Also add the always_inline attribute to the __iterator_category helper used for dispatching on the iterator category. libstdc++-v3/ChangeLog: * include/bits/stl_iterator_base_types.h (__iterator_category): Add always_inline attribute. * include/bits/stl_vector.h (assign(Iter, Iter)): Call _M_assign_aux directly, instead of _M_assign_dispatch. (insert(const_iterator, Iter, Iter)): Call _M_range_insert directly instead of _M_insert_dispatch. --- libstdc++-v3/include/bits/stl_iterator_base_types.h | 1 + libstdc++-v3/include/bits/stl_vector.h | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/libstdc++-v3/include/bits/stl_iterator_base_types.h b/libstdc++-v3/include/bits/stl_iterator_base_types.h index 9eecd1dd855..5d90c0d8ea7 100644 --- a/libstdc++-v3/include/bits/stl_iterator_base_types.h +++ b/libstdc++-v3/include/bits/stl_iterator_base_types.h @@ -233,6 +233,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION * sugar for internal library use only. */ template + __attribute__((__always_inline__)) inline _GLIBCXX_CONSTEXPR typename iterator_traits<_Iter>::iterator_category __iterator_category(const _Iter&) diff --git a/libstdc++-v3/include/bits/stl_vector.h b/libstdc++-v3/include/bits/stl_vector.h index b4ff3989a5d..e87fab0e51c 100644 --- a/libstdc++-v3/include/bits/stl_vector.h +++ b/libstdc++-v3/include/bits/stl_vector.h @@ -821,7 +821,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER _GLIBCXX20_CONSTEXPR void assign(_InputIterator __first, _InputIterator __last) - { _M_assign_dispatch(__first, __last, __false_type()); } + { _M_assign_aux(__first, __last, std::__iterator_category(__first)); } #else template void @@ -1478,8 +1478,8 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER _InputIterator __last) { difference_type __offset = __position - cbegin(); - _M_insert_dispatch(begin() + __offset, - __first, __last, __false_type()); + _M_range_insert(begin() + __offset, __first, __last, + std::__iterator_category(__first)); return begin() + __offset; } #else -- 2.38.1