Changeset 7416d46a for src/tests/alloc.c

Timestamp:

Jan 30, 2018, 3:54:32 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

633a642

Parents:

f792cb8 (diff), 42be3c3 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• src/tests/alloc.c (modified) (4 diffs)

src/tests/alloc.c

@@ -10 +10 @@
 // Created On       : Wed Feb  3 07:56:22 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Nov 24 23:06:42 2017
-// Update Count     : 319
+// Last Modified On : Mon Jan 22 21:26:40 2018
+// Update Count     : 326
 //
 
@@ -32 +32 @@
         // allocation, non-array types
 
-        // int &r = malloc();
+        // int & r = malloc();
         // r = 0xdeadbeef;
         // printf( "C   malloc %#x\n", r );
         // free( &r );
 
-        p = (int *)(void *)malloc( sizeof(*p) );                        // C malloc, type unsafe
+        p = (int *)malloc( sizeof(*p) );                                        // C malloc, type unsafe
         *p = 0xdeadbeef;
         printf( "C   malloc %#x\n", *p );
@@ -88 +88 @@
         printf( "\n" );
 
-        p = (int *)(void *)realloc( p, dim * sizeof(*p) );      // C realloc
+        p = (int *)realloc( p, dim * sizeof(*p) );                      // C realloc
         for ( int i = 0; i < dim; i += 1 ) { p[i] = 0xdeadbeef; }
         printf( "C   realloc\n" );
@@ -259 +259 @@
         free( p );
 
+#ifdef ERR1
         stp = malloc();
         printf( "\nSHOULD FAIL\n" );
-#ifdef ERR1
-        p = alloc( stp, dim * sizeof(*stp) );
+        p = realloc( stp, dim * sizeof( *stp ) );
+        p = alloc( stp, dim * sizeof( *stp ) );
         p = memset( stp, 10 );
         p = memcpy( &st1, &st );