about summary refs log tree commit diff
diff options
context:
space:
mode:
authorStan Shebs <stanshebs@google.com>2018-05-09 11:28:09 -0700
committerStan Shebs <stanshebs@google.com>2019-04-30 18:17:39 -0700
commit2b89ce53dc160974be2a872d0a52950e2ebe5a71 (patch)
tree42b9a878b419f6df94bf78c9be1a5f3d88a28c90
parentc3f0d624e9bb869968e447e12ba75caf1a0726c9 (diff)
downloadglibc-2b89ce53dc160974be2a872d0a52950e2ebe5a71.tar.gz
glibc-2b89ce53dc160974be2a872d0a52950e2ebe5a71.tar.xz
glibc-2b89ce53dc160974be2a872d0a52950e2ebe5a71.zip
Defeat a malloc optimization by declaring things volatile.
-rw-r--r--malloc/tst-malloc-backtrace.c4
-rw-r--r--malloc/tst-malloc-too-large.c2
-rw-r--r--malloc/tst-malloc.c2
-rw-r--r--malloc/tst-mcheck.c2
-rw-r--r--malloc/tst-valloc.c2
5 files changed, 6 insertions, 6 deletions
diff --git a/malloc/tst-malloc-backtrace.c b/malloc/tst-malloc-backtrace.c
index 8702e7e1c5..4e7fee9fc1 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 15e25f558e..654bc2e408 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 f9552226ef..5b62efd998 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 ac44cb8a6c..7399b0bb23 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 a2e27c1e91..d1c3f81772 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;