diff options
| author | Tanzinul Islam <t_17_7@hotmail.com> | 2018-05-05 18:53:33 (GMT) |
|---|---|---|
| committer | Tanzinul Islam <t_17_7@hotmail.com> | 2018-05-05 18:53:33 (GMT) |
| commit | 10f05a627c2da8d7de78da1b08f984ce8de398fb (patch) | |
| tree | 4f799952ac6fa35647a653cc12caf42efd73e005 /googletest/src/gtest.cc | |
| parent | 5c7c365d5f3e5467de350f2e81a31407a3f52505 (diff) | |
| parent | 278aba369c41e90e9e77a6f51443beb3692919cf (diff) | |
| download | googletest-10f05a627c2da8d7de78da1b08f984ce8de398fb.zip googletest-10f05a627c2da8d7de78da1b08f984ce8de398fb.tar.gz googletest-10f05a627c2da8d7de78da1b08f984ce8de398fb.tar.bz2 | |
Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116
Diffstat (limited to 'googletest/src/gtest.cc')
| -rw-r--r-- | googletest/src/gtest.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/googletest/src/gtest.cc b/googletest/src/gtest.cc index 948e4ea..4dbeac8 100644 --- a/googletest/src/gtest.cc +++ b/googletest/src/gtest.cc @@ -4549,6 +4549,11 @@ void UnitTest::AddTestPartResult( // when a failure happens and both the --gtest_break_on_failure and // the --gtest_catch_exceptions flags are specified. DebugBreak(); +#elif (!defined(__native_client__)) && \ + ((defined(__clang__) || defined(__GNUC__)) && \ + (defined(__x86_64__) || defined(__i386__))) + // with clang/gcc we can achieve the same effect on x86 by invoking int3 + asm("int3"); #else // Dereference NULL through a volatile pointer to prevent the compiler // from removing. We use this rather than abort() or __builtin_trap() for |