From: Stan Shebs <stanshebs@google.com>
Date: Wed, 9 May 2018 18:28:09 +0000 (-0700)
Subject: Defeat a malloc optimization by declaring things volatile.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=58f9551f5bac093dac2dcf3c66e32a4934ff8bd6;p=thirdparty%2Fglibc.git

Defeat a malloc optimization by declaring things volatile.
---

diff --git a/malloc/tst-malloc-backtrace.c b/malloc/tst-malloc-backtrace.c
index 171cfcefb8f..b1708b35297 100644
--- a/malloc/tst-malloc-backtrace.c
+++ b/malloc/tst-malloc-backtrace.c
@@ -35,8 +35,8 @@ call_free (void *ptr)
 int
 do_test (void)
 {
-  void *ptr1 = malloc (SIZE);
-  void *ptr2 = malloc (SIZE);
+  void *volatile ptr1 = malloc (SIZE);
+  void *volatile ptr2 = malloc (SIZE);
 
   /* Avoid unwanted output to TTY after an expected memory corruption.  */
   ignore_stderr();
diff --git a/malloc/tst-malloc-too-large.c b/malloc/tst-malloc-too-large.c
index 10fb1365280..bdd2a9eebcf 100644
--- a/malloc/tst-malloc-too-large.c
+++ b/malloc/tst-malloc-too-large.c
@@ -69,7 +69,7 @@ test_setup (void)
 static void
 test_large_allocations (size_t size)
 {
-  void * ptr_to_realloc;
+  void *volatile ptr_to_realloc;
 
   test_setup ();
   TEST_VERIFY (malloc (size) == NULL);
diff --git a/malloc/tst-malloc.c b/malloc/tst-malloc.c
index aa1aa2aa41a..bd10351246c 100644
--- a/malloc/tst-malloc.c
+++ b/malloc/tst-malloc.c
@@ -33,7 +33,7 @@ merror (const char *msg)
 static int
 do_test (void)
 {
-  void *p, *q;
+  void *volatile p, *volatile q;
   int save;
 
   errno = 0;
diff --git a/malloc/tst-mcheck.c b/malloc/tst-mcheck.c
index 18b0d59bd9e..d4c427bc90c 100644
--- a/malloc/tst-mcheck.c
+++ b/malloc/tst-mcheck.c
@@ -33,7 +33,7 @@ merror (const char *msg)
 static int
 do_test (void)
 {
-  void *p, *q;
+  void *volatile p, *volatile q;
 
   errno = 0;
 
diff --git a/malloc/tst-valloc.c b/malloc/tst-valloc.c
index ba57d9559aa..b28163afe06 100644
--- a/malloc/tst-valloc.c
+++ b/malloc/tst-valloc.c
@@ -34,7 +34,7 @@ merror (const char *msg)
 static int
 do_test (void)
 {
-  void *p;
+  void *volatile p;
   unsigned long pagesize = getpagesize ();
   unsigned long ptrval;
   int save;