tests: make no-optimize attribute Clang compatible

test/large_array_growth.c

@@ -1,8 +1,9 @@
 #include <stdlib.h>
 #include <string.h>
 
-__attribute__((optimize(0)))
+#include "test_util.h"
-int main(void) {
+
+OPTNONE int main(void) {
     void *p = NULL;
     size_t size = 256 * 1024;
 

test/mallinfo.c

@@ -1,7 +1,10 @@
+#include <stdio.h>
+
 #include <malloc.h>
 
-__attribute__((optimize(0)))
+#include "test_util.h"
-int main(void) {
+
+OPTNONE int main(void) {
     malloc(1024 * 1024 * 1024);
     malloc(16);
     malloc(32);

test/malloc_info.c

@@ -1,16 +1,18 @@
 #include <pthread.h>
+#include <stdio.h>
 
 #include <malloc.h>
 
-__attribute__((optimize(0)))
+#include "test_util.h"
-void leak_memory(void) {
+
+OPTNONE static void leak_memory(void) {
     (void)malloc(1024 * 1024 * 1024);
     (void)malloc(16);
     (void)malloc(32);
     (void)malloc(4096);
 }
 
-void *do_work(void *p) {
+static void *do_work(void *p) {
     leak_memory();
     return NULL;
 }

test/simple-memory-corruption/delete_type_size_mismatch.cc

@@ -1,11 +1,12 @@
 #include <stdint.h>
 
+#include "../test_util.h"
+
 struct foo {
     uint64_t a, b, c, d;
 };
 
-__attribute__((optimize(0)))
+OPTNONE int main(void) {
-int main(void) {
     void *p = new char;
     struct foo *c = (struct foo *)p;
     delete c;

test/simple-memory-corruption/double_free_large.c

@@ -1,7 +1,8 @@
 #include <stdlib.h>
 
-__attribute__((optimize(0)))
+#include "../test_util.h"
-int main(void) {
+
+OPTNONE int main(void) {
     void *p = malloc(128 * 1024);
     if (!p) {
         return 1;

test/simple-memory-corruption/double_free_large_delayed.c

@@ -1,7 +1,8 @@
 #include <stdlib.h>
 
-__attribute__((optimize(0)))
+#include "../test_util.h"
-int main(void) {
+
+OPTNONE int main(void) {
     void *p = malloc(128 * 1024);
     if (!p) {
         return 1;

test/simple-memory-corruption/double_free_small.c

@@ -1,7 +1,8 @@
 #include <stdlib.h>
 
-__attribute__((optimize(0)))
+#include "../test_util.h"
-int main(void) {
+
+OPTNONE int main(void) {
     void *p = malloc(16);
     if (!p) {
         return 1;

test/simple-memory-corruption/double_free_small_delayed.c

@@ -1,7 +1,8 @@
 #include <stdlib.h>
 
-__attribute__((optimize(0)))
+#include "../test_util.h"
-int main(void) {
+
+OPTNONE int main(void) {
     void *p = malloc(16);
     if (!p) {
         return 1;

test/simple-memory-corruption/eight_byte_overflow_large.c

@@ -1,7 +1,8 @@
 #include <stdlib.h>
 
-__attribute__((optimize(0)))
+#include "../test_util.h"
-int main(void) {
+
+OPTNONE int main(void) {
     char *p = malloc(256 * 1024);
     if (!p) {
         return 1;

test/simple-memory-corruption/eight_byte_overflow_small.c

@@ -1,7 +1,8 @@
 #include <stdlib.h>
 
-__attribute__((optimize(0)))
+#include "../test_util.h"
-int main(void) {
+
+OPTNONE int main(void) {
     char *p = malloc(8);
     if (!p) {
         return 1;

test/simple-memory-corruption/invalid_free_protected.c

@@ -2,8 +2,9 @@
 
 #include <sys/mman.h>
 
-__attribute__((optimize(0)))
+#include "../test_util.h"
-int main(void) {
+
+OPTNONE int main(void) {
     free(malloc(16));
     char *p = mmap(NULL, 4096 * 16, PROT_NONE, MAP_ANONYMOUS|MAP_PRIVATE, -1, 0);
     if (p == MAP_FAILED) {

test/simple-memory-corruption/invalid_free_small_region.c

@@ -1,7 +1,8 @@
 #include <stdlib.h>
 
-__attribute__((optimize(0)))
+#include "../test_util.h"
-int main(void) {
+
+OPTNONE int main(void) {
     char *p = malloc(16);
     if (!p) {
         return 1;

test/simple-memory-corruption/invalid_free_small_region_far.c

@@ -1,7 +1,8 @@
 #include <stdlib.h>
 
-__attribute__((optimize(0)))
+#include "../test_util.h"
-int main(void) {
+
+OPTNONE int main(void) {
     char *p = malloc(16);
     if (!p) {
         return 1;

test/simple-memory-corruption/invalid_free_unprotected.c

@@ -2,8 +2,9 @@
 
 #include <sys/mman.h>
 
-__attribute__((optimize(0)))
+#include "../test_util.h"
-int main(void) {
+
+OPTNONE int main(void) {
     free(malloc(16));
     char *p = mmap(NULL, 4096 * 16, PROT_READ|PROT_WRITE, MAP_ANONYMOUS|MAP_PRIVATE, -1, 0);
     if (p == MAP_FAILED) {

test/simple-memory-corruption/invalid_malloc_usable_size_small.c

@@ -1,7 +1,8 @@
 #include <malloc.h>
 
-__attribute__((optimize(0)))
+#include "../test_util.h"
-int main(void) {
+
+OPTNONE int main(void) {
     char *p = malloc(16);
     if (!p) {
         return 1;

test/simple-memory-corruption/invalid_malloc_usable_size_small_quarantine.c

@@ -1,7 +1,8 @@
 #include <malloc.h>
 
-__attribute__((optimize(0)))
+#include "../test_util.h"
-int main(void) {
+
+OPTNONE int main(void) {
     void *p = malloc(16);
     if (!p) {
         return 1;

test/simple-memory-corruption/malloc_object_size.c

@@ -1,10 +1,11 @@
 #include <stdbool.h>
 #include <malloc.h>
 
+#include "../test_util.h"
+
 size_t malloc_object_size(void *ptr);
 
-__attribute__((optimize(0)))
+OPTNONE int main(void) {
-int main(void) {
     char *p = malloc(16);
     size_t size = malloc_object_size(p);
     return size != (SLAB_CANARY ? 24 : 32);

test/simple-memory-corruption/malloc_object_size_offset.c

@@ -1,10 +1,11 @@
 #include <stdbool.h>
 #include <malloc.h>
 
+#include "../test_util.h"
+
 size_t malloc_object_size(void *ptr);
 
-__attribute__((optimize(0)))
+OPTNONE int main(void) {
-int main(void) {
     char *p = malloc(16);
     size_t size = malloc_object_size(p + 5);
     return size != (SLAB_CANARY ? 19 : 27);

test/simple-memory-corruption/read_after_free_large.c

@@ -2,8 +2,9 @@
 #include <stdlib.h>
 #include <string.h>
 
-__attribute__((optimize(0)))
+#include "../test_util.h"
-int main(void) {
+
+OPTNONE int main(void) {
     char *p = malloc(128 * 1024);
     if (!p) {
         return 1;

test/simple-memory-corruption/read_after_free_small.c

@@ -2,8 +2,9 @@
 #include <stdlib.h>
 #include <string.h>
 
-__attribute__((optimize(0)))
+#include "../test_util.h"
-int main(void) {
+
+OPTNONE int main(void) {
     char *p = malloc(16);
     if (!p) {
         return 1;

test/simple-memory-corruption/read_zero_size.c

@@ -1,8 +1,9 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-__attribute__((optimize(0)))
+#include "../test_util.h"
-int main(void) {
+
+OPTNONE int main(void) {
     char *p = malloc(0);
     if (!p) {
         return 1;

test/simple-memory-corruption/string_overflow.c

@@ -4,8 +4,9 @@
 
 #include <malloc.h>
 
-__attribute__((optimize(0)))
+#include "../test_util.h"
-int main(void) {
+
+OPTNONE int main(void) {
     char *p = malloc(16);
     if (!p) {
         return 1;

test/simple-memory-corruption/unaligned_free_large.c

@@ -1,7 +1,8 @@
 #include <stdlib.h>
 
-__attribute__((optimize(0)))
+#include "../test_util.h"
-int main(void) {
+
+OPTNONE int main(void) {
     char *p = malloc(128 * 1024);
     if (!p) {
         return 1;

test/simple-memory-corruption/unaligned_free_small.c

@@ -1,7 +1,8 @@
 #include <stdlib.h>
 
-__attribute__((optimize(0)))
+#include "../test_util.h"
-int main(void) {
+
+OPTNONE int main(void) {
     char *p = malloc(16);
     if (!p) {
         return 1;

test/simple-memory-corruption/unaligned_malloc_usable_size_small.c

@@ -1,7 +1,8 @@
 #include <malloc.h>
 
-__attribute__((optimize(0)))
+#include "../test_util.h"
-int main(void) {
+
+OPTNONE int main(void) {
     char *p = malloc(16);
     if (!p) {
         return 1;

test/simple-memory-corruption/uninitialized_free.c

@@ -1,7 +1,8 @@
 #include <stdlib.h>
 
-__attribute__((optimize(0)))
+#include "../test_util.h"
-int main(void) {
+
+OPTNONE int main(void) {
     free((void *)1);
     return 0;
 }

test/simple-memory-corruption/uninitialized_malloc_usable_size.c

@@ -1,7 +1,8 @@
 #include <malloc.h>
 
-__attribute__((optimize(0)))
+#include "../test_util.h"
-int main(void) {
+
+OPTNONE int main(void) {
     malloc_usable_size((void *)1);
     return 0;
 }

test/simple-memory-corruption/uninitialized_realloc.c

@@ -1,7 +1,8 @@
 #include <stdlib.h>
 
-__attribute__((optimize(0)))
+#include "../test_util.h"
-int main(void) {
+
+OPTNONE int main(void) {
     void *p = realloc((void *)1, 16);
     if (!p) {
         return 1;

test/simple-memory-corruption/write_after_free_large.c

@@ -1,8 +1,9 @@
 #include <stdlib.h>
 #include <string.h>
 
-__attribute__((optimize(0)))
+#include "../test_util.h"
-int main(void) {
+
+OPTNONE int main(void) {
     char *p = malloc(128 * 1024);
     if (!p) {
         return 1;

test/simple-memory-corruption/write_after_free_large_reuse.c

@@ -1,8 +1,9 @@
 #include <stdlib.h>
 #include <string.h>
 
-__attribute__((optimize(0)))
+#include "../test_util.h"
-int main(void) {
+
+OPTNONE int main(void) {
     char *p = malloc(128 * 1024);
     if (!p) {
         return 1;

test/simple-memory-corruption/write_after_free_small.c

@@ -1,8 +1,9 @@
 #include <stdlib.h>
 #include <string.h>
 
-__attribute__((optimize(0)))
+#include "../test_util.h"
-int main(void) {
+
+OPTNONE int main(void) {
     char *p = malloc(128);
     if (!p) {
         return 1;

test/simple-memory-corruption/write_after_free_small_reuse.c

@@ -1,8 +1,9 @@
 #include <stdlib.h>
 #include <string.h>
 
-__attribute__((optimize(0)))
+#include "../test_util.h"
-int main(void) {
+
+OPTNONE int main(void) {
     char *p = malloc(128);
     if (!p) {
         return 1;

test/simple-memory-corruption/write_zero_size.c

@@ -1,8 +1,9 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-__attribute__((optimize(0)))
+#include "../test_util.h"
-int main(void) {
+
+OPTNONE int main(void) {
     char *p = malloc(0);
     if (!p) {
         return 1;

test/test_util.h

@@ -0,0 +1,10 @@
+#ifndef TEST_UTIL_H
+#define TEST_UTIL_H
+
+#ifdef __clang__
+#define OPTNONE __attribute__((optnone))
+#else
+#define OPTNONE __attribute__((optimize(0)))
+#endif
+
+#endif