Changeset f80e0218 for src/examples/alloc.c

Timestamp:

Jun 30, 2016, 4:32:56 PM (9 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

ea29e73

Parents:

1b5c81ed (diff), 84d4d6f (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' into gc_noraii

Conflicts:

Jenkinsfile
src/SymTab/Validate.cc

File:

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

src/examples/alloc.c

@@ -11 +11 @@
 // Created On       : Wed Feb  3 07:56:22 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Feb 17 11:43:23 2016
-// Update Count     : 40
+// Last Modified On : Fri Mar 11 17:42:08 2016
+// Update Count     : 59
 // 
 
+forall( otype T ) T * malloc( char fill );
+forall( dtype T ) T *?=?( T **, void * );
+void *malloc( unsigned long int );
+#if 0
 #include <fstream>
 #include <stdlib>
@@ -25 +29 @@
 int * bar( int * p, int c ) { return p; }
 int * baz( int * p, int c ) { return p; }
+#endif
 
 int main( void ) {
+#if 0
     size_t size = 10;
     int * p;
     struct S { int x; double y; } * s;
+#endif
 
+#if 0
     p = malloc( sizeof(*p) );                                                   // C malloc, type unsafe
         printf( "here1\n" );
@@ -37 +45 @@
         printf( "here2\n" );
     free( p );
-    p = malloc( (char)'\0' );                                                                   // CFA malloc, type safe
+#endif
+//    int * p;
+//    p = malloc( (char)'\0' );                                                                 // CFA malloc, type safe
+    (int *)malloc( (char)'\0' );                                                                        // CFA malloc, type safe
+    (void *)malloc( (char)'\0' );                                                                       // CFA malloc, type safe
+#if 0
         printf( "here3\n" );
     p = malloc( p, 1000 );                                                              // CFA remalloc, type safe
@@ -60 +73 @@
         printf( "here9\n" );
     free( p );
-#if 0
+
     float * fp = malloc() + 1;
     fprintf( stderr, "%p %p\n", fp, fp - 1 );