This is an archive of the discontinued LLVM Phabricator instance.

Differential D102390

Fix Google Test compilation failure when standard library implements LWG 2221
AbandonedPublic

Authored by Godin on May 13 2021, 1:34 AM.

Details

Reviewers
pcc
bkramer
Summary

Without this patch when using CMAKE_CXX_STANDARD=17
and MSVC 19.28.29914.0 compilation of unit tests
(for example clang\unittests\Basic\SourceManagerTest.cpp)
fails with

llvm\utils\unittest\googletest\include\gtest\gtest-printers.h(250): error C2593: 'operator <<' is ambiguous

Patch is taken from Google Test:
https://github.com/google/googletest/commit/f66ab00704cd47e4e63ef6d425ca14b9192aaebb

Add printer for std::nullptr_t, addressing https://github.com/google/googletest/issues/1616

Diff Detail

Event Timeline

Godin requested review of this revision.May 13 2021, 1:34 AM
Godin created this revision.
Herald added a project: Restricted Project. · View Herald TranscriptMay 13 2021, 1:34 AM
Herald added a subscriber: llvm-commits. · View Herald Transcript
Harbormaster completed remote builds in B104226: Diff 345069.May 13 2021, 2:23 AM
Godin added reviewers: pcc, bkramer.May 14 2021, 6:11 AM
bkramer added a comment.May 14 2021, 8:33 AM

Updated googletest to 1.8.1 in 4dd546131ad2749fbde3e048583cf29d615b9851, which includes this change.

Godin abandoned this revision.May 14 2021, 10:32 AM

@bkramer 👍

Revision Contents

PathSize
llvm/
utils/
unittest/
googletest/
include/
gtest/
4 lines

Diff 345069

llvm/utils/unittest/googletest/include/gtest/gtest-printers.h

Show First 20 Lines • Show All 576 Lines • ▼ Show 20 Lines
#if GTEST_HAS_STD_WSTRING #if GTEST_HAS_STD_WSTRING
GTEST_API_ void PrintWideStringTo(const ::std::wstring&s, ::std::ostream* os); GTEST_API_ void PrintWideStringTo(const ::std::wstring&s, ::std::ostream* os);
inline void PrintTo(const ::std::wstring& s, ::std::ostream* os) { inline void PrintTo(const ::std::wstring& s, ::std::ostream* os) {
PrintWideStringTo(s, os); PrintWideStringTo(s, os);
} }
#endif // GTEST_HAS_STD_WSTRING #endif // GTEST_HAS_STD_WSTRING
#if GTEST_LANG_CXX11
inline void PrintTo(std::nullptr_t, ::std::ostream* os) { *os << "(nullptr)"; }
Lint: Pre-merge checks
Inline Actions

clang-tidy: warning: invalid case style for function 'PrintTo' [readability-identifier-naming]
not useful
clang-tidy: warning: invalid case style for parameter 'os' [readability-identifier-naming]
not useful
clang-format: please reformat the code

-inline void PrintTo(std::nullptr_t, ::std::ostream* os) { *os << "(nullptr)"; }
-#endif  // GTEST_LANG_CXX11
+inline void PrintTo(std::nullptr_t, ::std::ostream *os) { *os << "(nullptr)"; }
+#endif // GTEST_LANG_CXX11
Lint: Pre-merge checks: clang-tidy: warning: invalid case style for function 'PrintTo' [readability-identifier-naming]…
#endif // GTEST_LANG_CXX11
#if GTEST_HAS_TR1_TUPLE || GTEST_HAS_STD_TUPLE_ #if GTEST_HAS_TR1_TUPLE || GTEST_HAS_STD_TUPLE_
// Helper function for printing a tuple. T must be instantiated with // Helper function for printing a tuple. T must be instantiated with
// a tuple type. // a tuple type.
template <typename T> template <typename T>
void PrintTupleTo(const T& t, ::std::ostream* os); void PrintTupleTo(const T& t, ::std::ostream* os);
#endif // GTEST_HAS_TR1_TUPLE || GTEST_HAS_STD_TUPLE_ #endif // GTEST_HAS_TR1_TUPLE || GTEST_HAS_STD_TUPLE_
#if GTEST_HAS_TR1_TUPLE #if GTEST_HAS_TR1_TUPLE
▲ Show 20 Lines • Show All 402 Lines • Show Last 20 Lines