This is an archive of the discontinued LLVM Phabricator instance.

Paths

Table of Contentst

-
libcxx/test/std/iterators/iterator.primitives/iterator.traits/
-
test/
-
std/
-
iterators/
-
iterator.primitives/
-
iterator.traits/
-
empty.fail.cpp

Differential D92142

[libc++] Support no libc++ namespace in the iterator test.
ClosedPublic

Authored by vvereschaka on Nov 25 2020, 4:02 PM.

Download Raw Diff

Details

Reviewers

ldionne
phosek

Group Reviewers

Restricted Project

Commits

rG24b3c57adecd: [libc++] Support no libc++ namespace in the iterator test.

Summary

The 5f12f4ff9078455cad9d4806da01f570553a5bf9 commit suppress printing of inline namespace names in diagnostics by default that breaks the libc++ iterator test, which expects __1 in the namespace.

See more details here: https://reviews.llvm.org/rG5f12f4ff9078455cad9d4806da01f570553a5bf9

This patch fixes the test by supporting a test case without __1 in the namespace.

The broken test log for example:
http://lab.llvm.org:8011/#/builders/119/builds/1049/steps/14/logs/FAIL__libc____empty_fail_cpp

Diff Detail

Repository: rG LLVM Github Monorepo

Event Timeline

vvereschaka created this revision.Nov 25 2020, 4:02 PM

Herald added a reviewer: Restricted Project. · View Herald TranscriptNov 25 2020, 4:02 PM

Herald added a subscriber: libcxx-commits. · View Herald Transcript

vvereschaka requested review of this revision.Nov 25 2020, 4:02 PM

Harbormaster completed remote builds in B80162: Diff 307722.Nov 25 2020, 10:46 PM

miyuki added a subscriber: miyuki.Nov 26 2020, 3:19 AM

Thanks for fixing!

This revision is now accepted and ready to land.Nov 26 2020, 9:11 AM

Closed by commit rG24b3c57adecd: [libc++] Support no libc++ namespace in the iterator test. (authored by vvereschaka). · Explain WhyNov 27 2020, 3:05 PM

This revision was automatically updated to reflect the committed changes.

vvereschaka added a commit: rG24b3c57adecd: [libc++] Support no libc++ namespace in the iterator test..

• Quuxplusone mentioned this in D92239: [libc++] Support simply `std::iterator_traits` in the iterator_traits test..Nov 27 2020, 6:26 PM

• arthur.j.odwyer mentioned this in rGc3e15b3c1c1c: [libc++] Support simply `std::iterator_traits` in the iterator_traits test..Dec 1 2020, 7:14 PM

Revision Contents

Path

Size

libcxx/

test/

std/

iterators/

iterator.primitives/

iterator.traits/

empty.fail.cpp

60 lines

Diff 308118

libcxx/test/std/iterators/iterator.primitives/iterator.traits/empty.fail.cpp

Show First 20 Lines • Show All 61 Lines • ▼ Show 20 Lines	struct NotAnIteratorNoCategory
typedef A& reference;		typedef A& reference;
// typedef std::forward_iterator_tag iterator_category;		// typedef std::forward_iterator_tag iterator_category;
};		};

int main(int, char**)		int main(int, char**)
{		{
{		{
typedef std::iterator_traits<NotAnIteratorEmpty> T;		typedef std::iterator_traits<NotAnIteratorEmpty> T;
typedef T::difference_type DT; // expected-error-re {{no type named 'difference_type' in 'std::{{.+}}::iterator_traits<{{.+}}>}}		typedef T::difference_type DT; // expected-error-re {{no type named 'difference_type' in 'std{{(::.+)?}}::iterator_traits<{{.+}}>}}
typedef T::value_type VT; // expected-error-re {{no type named 'value_type' in 'std::{{.+}}::iterator_traits<{{.+}}>}}		typedef T::value_type VT; // expected-error-re {{no type named 'value_type' in 'std{{(::.+)?}}::iterator_traits<{{.+}}>}}
typedef T::pointer PT; // expected-error-re {{no type named 'pointer' in 'std::{{.+}}::iterator_traits<{{.+}}>}}		typedef T::pointer PT; // expected-error-re {{no type named 'pointer' in 'std{{(::.+)?}}::iterator_traits<{{.+}}>}}
typedef T::reference RT; // expected-error-re {{no type named 'reference' in 'std::{{.+}}::iterator_traits<{{.+}}>}}		typedef T::reference RT; // expected-error-re {{no type named 'reference' in 'std{{(::.+)?}}::iterator_traits<{{.+}}>}}
typedef T::iterator_category CT; // expected-error-re {{no type named 'iterator_category' in 'std::{{.+}}::iterator_traits<{{.+}}>}}		typedef T::iterator_category CT; // expected-error-re {{no type named 'iterator_category' in 'std{{(::.+)?}}::iterator_traits<{{.+}}>}}
}		}

{		{
typedef std::iterator_traits<NotAnIteratorNoDifference> T;		typedef std::iterator_traits<NotAnIteratorNoDifference> T;
typedef T::difference_type DT; // expected-error-re {{no type named 'difference_type' in 'std::{{.+}}::iterator_traits<{{.+}}>}}		typedef T::difference_type DT; // expected-error-re {{no type named 'difference_type' in 'std{{(::.+)?}}::iterator_traits<{{.+}}>}}
typedef T::value_type VT; // expected-error-re {{no type named 'value_type' in 'std::{{.+}}::iterator_traits<{{.+}}>}}		typedef T::value_type VT; // expected-error-re {{no type named 'value_type' in 'std{{(::.+)?}}::iterator_traits<{{.+}}>}}
typedef T::pointer PT; // expected-error-re {{no type named 'pointer' in 'std::{{.+}}::iterator_traits<{{.+}}>}}		typedef T::pointer PT; // expected-error-re {{no type named 'pointer' in 'std{{(::.+)?}}::iterator_traits<{{.+}}>}}
typedef T::reference RT; // expected-error-re {{no type named 'reference' in 'std::{{.+}}::iterator_traits<{{.+}}>}}		typedef T::reference RT; // expected-error-re {{no type named 'reference' in 'std{{(::.+)?}}::iterator_traits<{{.+}}>}}
typedef T::iterator_category CT; // expected-error-re {{no type named 'iterator_category' in 'std::{{.+}}::iterator_traits<{{.+}}>}}		typedef T::iterator_category CT; // expected-error-re {{no type named 'iterator_category' in 'std{{(::.+)?}}::iterator_traits<{{.+}}>}}
}		}

{		{
typedef std::iterator_traits<NotAnIteratorNoValue> T;		typedef std::iterator_traits<NotAnIteratorNoValue> T;
typedef T::difference_type DT; // expected-error-re {{no type named 'difference_type' in 'std::{{.+}}::iterator_traits<{{.+}}>}}		typedef T::difference_type DT; // expected-error-re {{no type named 'difference_type' in 'std{{(::.+)?}}::iterator_traits<{{.+}}>}}
typedef T::value_type VT; // expected-error-re {{no type named 'value_type' in 'std::{{.+}}::iterator_traits<{{.+}}>}}		typedef T::value_type VT; // expected-error-re {{no type named 'value_type' in 'std{{(::.+)?}}::iterator_traits<{{.+}}>}}
typedef T::pointer PT; // expected-error-re {{no type named 'pointer' in 'std::{{.+}}::iterator_traits<{{.+}}>}}		typedef T::pointer PT; // expected-error-re {{no type named 'pointer' in 'std{{(::.+)?}}::iterator_traits<{{.+}}>}}
typedef T::reference RT; // expected-error-re {{no type named 'reference' in 'std::{{.+}}::iterator_traits<{{.+}}>}}		typedef T::reference RT; // expected-error-re {{no type named 'reference' in 'std{{(::.+)?}}::iterator_traits<{{.+}}>}}
typedef T::iterator_category CT; // expected-error-re {{no type named 'iterator_category' in 'std::{{.+}}::iterator_traits<{{.+}}>}}		typedef T::iterator_category CT; // expected-error-re {{no type named 'iterator_category' in 'std{{(::.+)?}}::iterator_traits<{{.+}}>}}
}		}

{		{
typedef std::iterator_traits<NotAnIteratorNoPointer> T;		typedef std::iterator_traits<NotAnIteratorNoPointer> T;
typedef T::difference_type DT; // expected-error-re {{no type named 'difference_type' in 'std::{{.+}}::iterator_traits<{{.+}}>}}		typedef T::difference_type DT; // expected-error-re {{no type named 'difference_type' in 'std{{(::.+)?}}::iterator_traits<{{.+}}>}}
typedef T::value_type VT; // expected-error-re {{no type named 'value_type' in 'std::{{.+}}::iterator_traits<{{.+}}>}}		typedef T::value_type VT; // expected-error-re {{no type named 'value_type' in 'std{{(::.+)?}}::iterator_traits<{{.+}}>}}
typedef T::pointer PT; // expected-error-re {{no type named 'pointer' in 'std::{{.+}}::iterator_traits<{{.+}}>}}		typedef T::pointer PT; // expected-error-re {{no type named 'pointer' in 'std{{(::.+)?}}::iterator_traits<{{.+}}>}}
typedef T::reference RT; // expected-error-re {{no type named 'reference' in 'std::{{.+}}::iterator_traits<{{.+}}>}}		typedef T::reference RT; // expected-error-re {{no type named 'reference' in 'std{{(::.+)?}}::iterator_traits<{{.+}}>}}
typedef T::iterator_category CT; // expected-error-re {{no type named 'iterator_category' in 'std::{{.+}}::iterator_traits<{{.+}}>}}		typedef T::iterator_category CT; // expected-error-re {{no type named 'iterator_category' in 'std{{(::.+)?}}::iterator_traits<{{.+}}>}}
}		}

{		{
typedef std::iterator_traits<NotAnIteratorNoReference> T;		typedef std::iterator_traits<NotAnIteratorNoReference> T;
typedef T::difference_type DT; // expected-error-re {{no type named 'difference_type' in 'std::{{.+}}::iterator_traits<{{.+}}>}}		typedef T::difference_type DT; // expected-error-re {{no type named 'difference_type' in 'std{{(::.+)?}}::iterator_traits<{{.+}}>}}
typedef T::value_type VT; // expected-error-re {{no type named 'value_type' in 'std::{{.+}}::iterator_traits<{{.+}}>}}		typedef T::value_type VT; // expected-error-re {{no type named 'value_type' in 'std{{(::.+)?}}::iterator_traits<{{.+}}>}}
typedef T::pointer PT; // expected-error-re {{no type named 'pointer' in 'std::{{.+}}::iterator_traits<{{.+}}>}}		typedef T::pointer PT; // expected-error-re {{no type named 'pointer' in 'std{{(::.+)?}}::iterator_traits<{{.+}}>}}
typedef T::reference RT; // expected-error-re {{no type named 'reference' in 'std::{{.+}}::iterator_traits<{{.+}}>}}		typedef T::reference RT; // expected-error-re {{no type named 'reference' in 'std{{(::.+)?}}::iterator_traits<{{.+}}>}}
typedef T::iterator_category CT; // expected-error-re {{no type named 'iterator_category' in 'std::{{.+}}::iterator_traits<{{.+}}>}}		typedef T::iterator_category CT; // expected-error-re {{no type named 'iterator_category' in 'std{{(::.+)?}}::iterator_traits<{{.+}}>}}
}		}

{		{
typedef std::iterator_traits<NotAnIteratorNoCategory> T;		typedef std::iterator_traits<NotAnIteratorNoCategory> T;
typedef T::difference_type DT; // expected-error-re {{no type named 'difference_type' in 'std::{{.+}}::iterator_traits<{{.+}}>}}		typedef T::difference_type DT; // expected-error-re {{no type named 'difference_type' in 'std{{(::.+)?}}::iterator_traits<{{.+}}>}}
typedef T::value_type VT; // expected-error-re {{no type named 'value_type' in 'std::{{.+}}::iterator_traits<{{.+}}>}}		typedef T::value_type VT; // expected-error-re {{no type named 'value_type' in 'std{{(::.+)?}}::iterator_traits<{{.+}}>}}
typedef T::pointer PT; // expected-error-re {{no type named 'pointer' in 'std::{{.+}}::iterator_traits<{{.+}}>}}		typedef T::pointer PT; // expected-error-re {{no type named 'pointer' in 'std{{(::.+)?}}::iterator_traits<{{.+}}>}}
typedef T::reference RT; // expected-error-re {{no type named 'reference' in 'std::{{.+}}::iterator_traits<{{.+}}>}}		typedef T::reference RT; // expected-error-re {{no type named 'reference' in 'std{{(::.+)?}}::iterator_traits<{{.+}}>}}
typedef T::iterator_category CT; // expected-error-re {{no type named 'iterator_category' in 'std::{{.+}}::iterator_traits<{{.+}}>}}		typedef T::iterator_category CT; // expected-error-re {{no type named 'iterator_category' in 'std{{(::.+)?}}::iterator_traits<{{.+}}>}}
}		}

return 0;		return 0;
}		}