Changeset cdbfab0 for src/tests

Timestamp:

Nov 17, 2017, 4:57:57 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

4d5e57b

Parents:

0fe4e62

Message:

Remove unsafe void * constructors and assignment operators from prelude [closes #24] [fixes #51]

Location:

src/tests

Files:

• .expect/alloc-ERROR.txt (added)
• Makefile.am (modified) (1 diff)
• Makefile.in (modified) (1 diff)
• alloc.c (modified) (4 diffs)
• dtor-early-exit.c (modified) (1 diff)
• init_once.c (modified) (1 diff)
• multiDimension.c (modified) (3 diffs)
• tupleVariadic.c (modified) (1 diff)
• vector/vector_int.c (modified) (4 diffs)

src/tests/Makefile.am

@@ -141 +141 @@
 typedefRedef-ERR1: typedefRedef.c @CFA_BINDIR@/@CFA_NAME@
         ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR1 ${<} -o ${@}
+
+alloc-ERROR: alloc.c @CFA_BINDIR@/@CFA_NAME@
+        ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR1 ${<} -o ${@}

src/tests/Makefile.in

@@ -895 +895 @@
         ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR1 ${<} -o ${@}
 
+alloc-ERROR: alloc.c @CFA_BINDIR@/@CFA_NAME@
+        ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR1 ${<} -o ${@}
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.

src/tests/alloc.c

@@ -32 +32 @@
         // allocation, non-array types
 
-        p = (void *)malloc( sizeof(*p) );                   // C malloc, type unsafe
+        p = (int *)(void *)malloc( sizeof(*p) );                   // C malloc, type unsafe
         *p = 0xdeadbeef;
         printf( "C   malloc %#x\n", *p );
@@ -54 +54 @@
         printf( "\n" );
 
-        p = calloc( dim, sizeof( *p ) );                    // C array calloc, type unsafe
+        p = (int *)calloc( dim, sizeof( *p ) );                    // C array calloc, type unsafe
         printf( "C   array calloc, fill 0\n" );
         for ( int i = 0; i < dim; i += 1 ) { printf( "%#x ", p[i] ); }
@@ -83 +83 @@
         printf( "\n" );
 
-        p = (void *)realloc( p, dim * sizeof(*p) );         // C realloc
+        p = (int *)(void *)realloc( p, dim * sizeof(*p) );         // C realloc
         for ( int i = 0; i < dim; i += 1 ) { p[i] = 0xdeadbeef; }
         printf( "C   realloc\n" );
@@ -256 +256 @@
         stp = malloc();
         printf( "\nSHOULD FAIL\n" );
+#ifdef ERR1
         p = alloc( stp, dim * sizeof(*stp) );
         p = memset( stp, 10 );
         p = memcpy( &st1, &st );
+#endif
 } // main
 

src/tests/dtor-early-exit.c

@@ -22 +22 @@
 
 struct A {
-        char * name;
+        const char * name;
         int * x;
 };

src/tests/init_once.c

@@ -72 +72 @@
         insert( &constructed, &x );
 
-        x.x = malloc(sizeof(int));
+        x.x = (int *)malloc(sizeof(int));
 }
 

src/tests/multiDimension.c

@@ -7 +7 @@
   printf("default constructing\n");
   (this.a){ 123 };
-  this.ptr = malloc(sizeof(int));
+  this.ptr = (int *)malloc(sizeof(int));
 }
 
@@ -13 +13 @@
   printf("copy constructing\n");
   (this.a){ other.a };
-  this.ptr = malloc(sizeof(int));
+  this.ptr = (int *)malloc(sizeof(int));
 }
 
@@ -19 +19 @@
   printf("constructing with %d\n", a);
   (this.a){ a };
-  this.ptr = malloc(sizeof(int));
+  this.ptr = (int *)malloc(sizeof(int));
 }
 

src/tests/tupleVariadic.c

@@ -73 +73 @@
         [a0, a1, a2, a3] = args;
         a.size = 4;
-        a.data = malloc(sizeof(int)*a.size);
+        a.data = (int *)malloc(sizeof(int)*a.size);
         a.data[0] = a0;
         a.data[1] = a1;

src/tests/vector/vector_int.c

@@ -27 +27 @@
         vec.last = -1;
         vec.capacity = reserve;
-        vec.data = malloc( sizeof( int ) * reserve );
+        vec.data = (int *)malloc( sizeof( int ) * reserve );
 }
 
@@ -33 +33 @@
         vec.last = other.last;
         vec.capacity = other.capacity;
-        vec.data = malloc( sizeof( int ) * other.capacity );
+        vec.data = (int *)malloc( sizeof( int ) * other.capacity );
         for (int i = 0; i < vec.last; i++) {
                 vec.data[i] = other.data[i];
@@ -45 +45 @@
 void reserve( vector_int *vec, int reserve ) {
         if ( reserve > vec->capacity ) {
-                vec->data = realloc( vec->data, sizeof( int ) * reserve );
+                vec->data = (int *)realloc( vec->data, sizeof( int ) * reserve );
                 vec->capacity = reserve;
         }
@@ -54 +54 @@
         if ( vec->last == vec->capacity ) {
                 vec->capacity *= 2;
-                vec->data = realloc( vec->data, sizeof( int ) * vec->capacity );
+                vec->data = (int *)realloc( vec->data, sizeof( int ) * vec->capacity );
         }
         vec->data[ vec->last ] = element;