]> git.ipfire.org Git - thirdparty/gcc.git/commit
c++: Don't mix timevar_start and auto_cond_timevar for TV_NAME_LOOKUP [PR116681]
authorSimon Martin <simon@nasilyan.com>
Fri, 13 Sep 2024 14:40:22 +0000 (16:40 +0200)
committerSimon Martin <simon@nasilyan.com>
Sat, 14 Sep 2024 13:23:25 +0000 (15:23 +0200)
commit005f7176e0f457a1e1a7398ddcb4a4972da28c62
tree1ae10616049bfecb91a45087526d1a9573203f51
parenta900349485cc4753084527bf0234f173967979b0
c++: Don't mix timevar_start and auto_cond_timevar for TV_NAME_LOOKUP [PR116681]

We currently ICE upon the following testcase when using -ftime-report

=== cut here ===
template < int> using __conditional_t = int;
template < typename _Iter >
concept random_access_iterator = requires { new _Iter; };
template < typename _Iterator >
struct reverse_iterator {
  using iterator_concept =
    __conditional_t< random_access_iterator< _Iterator>>;
};
void RemoveBottom() {
  int iter;
  for (reverse_iterator< int > iter;;)
      ;
}
=== cut here ===

The problem is that qualified_namespace_lookup does a plain start() of
the TV_NAME_LOOKUP timer (that asserts that the timer is not already
started). However this timer has already been cond_start()'d in the call
stack - by pushdecl - so the assert fails.

This patch simply ensures that we always conditionally start this timer
(which is done in all other places that use it).

PR c++/116681

gcc/cp/ChangeLog:

* name-lookup.cc (qualified_namespace_lookup): Use an
auto_cond_timer instead of using timevar_start and timevar_stop.

gcc/testsuite/ChangeLog:

* g++.dg/cpp2a/concepts-pr116681.C: New test.
gcc/cp/name-lookup.cc
gcc/testsuite/g++.dg/cpp2a/concepts-pr116681.C [new file with mode: 0644]