summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvladlosev <vladlosev@861a406c-534a-0410-8894-cb66d6ee9925>2011-06-13 20:09:57 +0000
committervladlosev <vladlosev@861a406c-534a-0410-8894-cb66d6ee9925>2011-06-13 20:09:57 +0000
commit4f9248a4270559cf286cb12937ba78b58bde053f (patch)
tree6afe7654ba11810c67b145c3f5a8dfd352a44534
parent95a77adfeb8f97d2a61956e2eda12afe7371f1db (diff)
downloadgoogletest-4f9248a4270559cf286cb12937ba78b58bde053f.tar.gz
Suppresses the tail-call optimization of StackGrowsDown() in GCC4.6 (by Paul Pluzhnikov).
git-svn-id: http://googletest.googlecode.com/svn/trunk@585 861a406c-534a-0410-8894-cb66d6ee9925
-rw-r--r--src/gtest-death-test.cc10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/gtest-death-test.cc b/src/gtest-death-test.cc
index 8b2e413..44ff6b2 100644
--- a/src/gtest-death-test.cc
+++ b/src/gtest-death-test.cc
@@ -936,15 +936,17 @@ static int ExecDeathTestChildMain(void* child_arg) {
// GTEST_NO_INLINE_ is required to prevent GCC 4.6 from inlining
// StackLowerThanAddress into StackGrowsDown, which then doesn't give
// correct answer.
-bool StackLowerThanAddress(const void* ptr) GTEST_NO_INLINE_;
-bool StackLowerThanAddress(const void* ptr) {
+void StackLowerThanAddress(const void* ptr, bool* result) GTEST_NO_INLINE_;
+void StackLowerThanAddress(const void* ptr, bool* result) {
int dummy;
- return &dummy < ptr;
+ *result = (&dummy < ptr);
}
bool StackGrowsDown() {
int dummy;
- return StackLowerThanAddress(&dummy);
+ bool result;
+ StackLowerThanAddress(&dummy, &result);
+ return result;
}
// A threadsafe implementation of fork(2) for threadsafe-style death tests