maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Speculatively adjust gtest's UnitTest::AddTestPartResult() to not rely on volatile store to null trapping 

This fallback path is used at least on PPC.
If this doesn't work on some compilers that take this path,
then this will have to be changed to either abort,
or partitioned to do different things based on the compiler.

Please refer to https://reviews.llvm.org/D105338.
This commit is contained in:
Roman Lebedev 2021-07-09 13:30:17 +03:00
parent 2df37d5ddd
commit aa9f58cc2c
No known key found for this signature in database
GPG Key ID: 083C3EBB4A1689E0
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
llvm/utils/unittest/googletest/src/gtest.cc
View File

@ -4813,10 +4813,9 @@ void UnitTest::AddTestPartResult(
// with clang/gcc we can achieve the same effect on x86 by invoking int3 // with clang/gcc we can achieve the same effect on x86 by invoking int3
asm("int3"); asm("int3");
#else #else
// Dereference nullptr through a volatile pointer to prevent the compiler // While some debuggers don't correctly trap abort(), we can't perform
// from removing. We use this rather than abort() or __builtin_trap() for // volatile store to null since it will be removed by clang and not trap.
// portability: some debuggers don't correctly trap abort(). __builtin_trap();
*static_cast<volatile int*>(nullptr) = 1;
#endif // GTEST_OS_WINDOWS #endif // GTEST_OS_WINDOWS
} else if (GTEST_FLAG(throw_on_failure)) { } else if (GTEST_FLAG(throw_on_failure)) {
#if GTEST_HAS_EXCEPTIONS #if GTEST_HAS_EXCEPTIONS