From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 520E53857814; Mon, 23 Aug 2021 13:46:18 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 520E53857814 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jonathan Wakely To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r12-3082] libstdc++: Use __builtin_expect in __dynamic_cast X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/master X-Git-Oldrev: bc97e736a5597ac1545b7f9069472117b6caa867 X-Git-Newrev: da6ce351069bda74d814b723934008d75bd4e8b0 Message-Id: <20210823134618.520E53857814@sourceware.org> Date: Mon, 23 Aug 2021 13:46:18 +0000 (GMT) X-BeenThere: libstdc++-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Aug 2021 13:46:18 -0000 https://gcc.gnu.org/g:da6ce351069bda74d814b723934008d75bd4e8b0 commit r12-3082-gda6ce351069bda74d814b723934008d75bd4e8b0 Author: Jonathan Wakely Date: Mon Aug 23 13:12:24 2021 +0100 libstdc++: Use __builtin_expect in __dynamic_cast The null pointer check is never needed for correct code, only to gracefully handle undefined cases. Add __builtin_expect to be sure that we don't pessimize the valid uses. libstdc++-v3/ChangeLog: * libsupc++/dyncast.cc (__dynamic_cast): Add __builtin_expect to precondition check. Diff: --- libstdc++-v3/libsupc++/dyncast.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libstdc++-v3/libsupc++/dyncast.cc b/libstdc++-v3/libsupc++/dyncast.cc index f8f707ee4d4..a1138d04f6d 100644 --- a/libstdc++-v3/libsupc++/dyncast.cc +++ b/libstdc++-v3/libsupc++/dyncast.cc @@ -47,9 +47,9 @@ __dynamic_cast (const void *src_ptr, // object started from const __class_type_info *dst_type, // desired target type ptrdiff_t src2dst) // how src and dst are related { - if (!src_ptr) - /* Handle precondition violations gracefully. */ - return NULL; + if (__builtin_expect(!src_ptr, 0)) + return NULL; // Handle precondition violations gracefully. + const void *vtable = *static_cast (src_ptr); const vtable_prefix *prefix = (adjust_pointer @@ -70,7 +70,7 @@ __dynamic_cast (const void *src_ptr, // object started from (whole_vtable, -ptrdiff_t (offsetof (vtable_prefix, origin)))); if (whole_prefix->whole_type != whole_type) return NULL; - + whole_type->__do_dyncast (src2dst, __class_type_info::__contained_public, dst_type, whole_ptr, src_type, src_ptr, result); if (!result.dst_ptr)