Skip to content

Commit

Permalink
Fixed compilation issue with GoogleTest on GCC 11.1.
Browse files Browse the repository at this point in the history
It was added patch from google/googletest#3024 to silence error=maybe-uninitialized warning.
  • Loading branch information
hejllukas committed May 1, 2021
1 parent 62592ca commit d38e3ed
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 0 deletions.
1 change: 1 addition & 0 deletions deps/deps-unix-common.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ ExternalProject_Add(dep_gtest
EXCLUDE_FROM_ALL 1
URL "https://github.com/google/googletest/archive/release-1.8.1.tar.gz"
URL_HASH SHA256=9bf1fe5182a604b4135edc1a425ae356c9ad15e9b23f9f12a02e80184c3a249c
PATCH_COMMAND patch -p1 -i ${CMAKE_CURRENT_LIST_DIR}/gtest/0001-Fix-warning-maybe-uninitialized.patch
CMAKE_ARGS -DBUILD_GMOCK=OFF ${DEP_CMAKE_OPTS} -DCMAKE_INSTALL_PREFIX=${DESTDIR}/usr/local
)

Expand Down
31 changes: 31 additions & 0 deletions deps/gtest/0001-Fix-warning-maybe-uninitialized.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
From 4679637f1c9d5a0728bdc347a531737fad0b1ca3 Mon Sep 17 00:00:00 2001
From: tbarbier <thomas.barbier@amadeus.com>
Date: Thu, 24 Sep 2020 16:51:06 +0200
Subject: [PATCH] Fix warning maybe-uninitialized

---
googletest/src/gtest-death-test.cc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/googletest/src/gtest-death-test.cc b/googletest/src/gtest-death-test.cc
index 31de7d627e..0764f2eb43 100644
--- a/googletest/src/gtest-death-test.cc
+++ b/googletest/src/gtest-death-test.cc
@@ -1281,7 +1281,7 @@ static void StackLowerThanAddress(const void* ptr,
GTEST_ATTRIBUTE_NO_SANITIZE_ADDRESS_
GTEST_ATTRIBUTE_NO_SANITIZE_HWADDRESS_
static void StackLowerThanAddress(const void* ptr, bool* result) {
- int dummy;
+ int dummy = 0;
*result = (&dummy < ptr);
}

@@ -1289,7 +1289,7 @@ static void StackLowerThanAddress(const void* ptr, bool* result) {
GTEST_ATTRIBUTE_NO_SANITIZE_ADDRESS_
GTEST_ATTRIBUTE_NO_SANITIZE_HWADDRESS_
static bool StackGrowsDown() {
- int dummy;
+ int dummy = 0;
bool result;
StackLowerThanAddress(&dummy, &result);
return result;

0 comments on commit d38e3ed

Please sign in to comment.