aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2019-06-13 12:57:48 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2019-06-13 12:57:51 +0200
commitc165df198d6e9ea7292af0578024113803b8a6a2 (patch)
tree2b2c7f80e79b03411a5f13c8beffc073d33eb257
parent6cf81b01b48e871a35072dd08e7735c3ba42528c (diff)
parentb5a4abeca238a0fa37b34e35ca610dcfe7112c82 (diff)
downloadbitcoin-c165df198d6e9ea7292af0578024113803b8a6a2.tar.xz
Merge #16163: 0.17.2 backport: build with -fstack-reuse=none and test case
b5a4abeca238a0fa37b34e35ca610dcfe7112c82 Add test for GCC bug 90348 (Pieter Wuille) 05fb9f7fbb270638f8ff4990fe68037e1a52a85f build with -fstack-reuse=none (MarcoFalke) Pull request description: Backports: * [build with -fstack-reuse=none](https://github.com/bitcoin/bitcoin/pull/15983) * [Add test for GCC bug 90348](https://github.com/bitcoin/bitcoin/pull/15985) https://github.com/bitcoin/bitcoin/commit/b5a4abeca238a0fa37b34e35ca610dcfe7112c82 has been modified to replace the `setup_common.h` with `test_bitcoin.h` include. ACKs for commit b5a4ab: Empact: ACK https://github.com/bitcoin/bitcoin/pull/16163/commits/b5a4abeca238a0fa37b34e35ca610dcfe7112c82 by review of the linked PRs, the GCC bug and option, and visual inspection/comparison of the ported code laanwj: Code review + relevancy for backport ACK b5a4abeca238a0fa37b34e35ca610dcfe7112c82 Tree-SHA512: cdfdc6e2f208e8dc6a8a86cd7a7ed0f2a6f96604a0663efc970f580f693c1975353341fa8434b23de3cb681e03c6918e3342178752ed595d16a0ec50db913266
-rw-r--r--configure.ac4
-rw-r--r--src/Makefile.test.include1
-rw-r--r--src/test/compilerbug_tests.cpp43
3 files changed, 48 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac
index 9cc01a4028..8449617085 100644
--- a/configure.ac
+++ b/configure.ac
@@ -693,6 +693,10 @@ if test x$TARGET_OS != xwindows; then
AX_CHECK_COMPILE_FLAG([-fPIC],[PIC_FLAGS="-fPIC"])
fi
+# All versions of gcc that we commonly use for building are subject to bug
+# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=90348. To work around that, set
+# -fstack-reuse=none for all gcc builds. (Only gcc understands this flag)
+AX_CHECK_COMPILE_FLAG([-fstack-reuse=none],[HARDENED_CXXFLAGS="$HARDENED_CXXFLAGS -fstack-reuse=none"])
if test x$use_hardening != xno; then
use_hardening=yes
AX_CHECK_COMPILE_FLAG([-Wstack-protector],[HARDENED_CXXFLAGS="$HARDENED_CXXFLAGS -Wstack-protector"])
diff --git a/src/Makefile.test.include b/src/Makefile.test.include
index 1b6827d45a..65672f15e1 100644
--- a/src/Makefile.test.include
+++ b/src/Makefile.test.include
@@ -43,6 +43,7 @@ BITCOIN_TESTS =\
test/bswap_tests.cpp \
test/checkqueue_tests.cpp \
test/coins_tests.cpp \
+ test/compilerbug_tests.cpp \
test/compress_tests.cpp \
test/crypto_tests.cpp \
test/cuckoocache_tests.cpp \
diff --git a/src/test/compilerbug_tests.cpp b/src/test/compilerbug_tests.cpp
new file mode 100644
index 0000000000..701671314f
--- /dev/null
+++ b/src/test/compilerbug_tests.cpp
@@ -0,0 +1,43 @@
+// Copyright (c) 2019 The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#include <test/test_bitcoin.h>
+#include <boost/test/unit_test.hpp>
+
+BOOST_FIXTURE_TEST_SUITE(compilerbug_tests, BasicTestingSetup)
+
+#if defined(__GNUC__)
+// This block will also be built under clang, which is fine (as it supports noinline)
+void __attribute__ ((noinline)) set_one(unsigned char* ptr)
+{
+ *ptr = 1;
+}
+
+int __attribute__ ((noinline)) check_zero(unsigned char const* in, unsigned int len)
+{
+ for (unsigned int i = 0; i < len; ++i) {
+ if (in[i] != 0) return 0;
+ }
+ return 1;
+}
+
+void set_one_on_stack() {
+ unsigned char buf[1];
+ set_one(buf);
+}
+
+BOOST_AUTO_TEST_CASE(gccbug_90348) {
+ // Test for GCC bug 90348. See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=90348
+ for (int i = 0; i <= 4; ++i) {
+ unsigned char in[4];
+ for (int j = 0; j < i; ++j) {
+ in[j] = 0;
+ set_one_on_stack(); // Apparently modifies in[0]
+ }
+ BOOST_CHECK(check_zero(in, i));
+ }
+}
+#endif
+
+BOOST_AUTO_TEST_SUITE_END()