Changeset e67a82d for tests/alloc.cfa

Timestamp:

Aug 20, 2020, 11:48:15 PM (5 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

d685cb0

Parents:

67ca73e (diff), 013b028 (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:

fix conflicts

File:

• tests/alloc.cfa (modified) (3 diffs)

tests/alloc.cfa

@@ -10 +10 @@
 // Created On       : Wed Feb  3 07:56:22 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Apr  6 21:08:23 2020
-// Update Count     : 428
+// Last Modified On : Fri Aug 14 16:59:59 2020
+// Update Count     : 430
 //
 
@@ -90 +90 @@
         // do not free
 
-        ip1 = alloc_set( 2 * dim, ip );                                         // CFA array alloc, fill
+        ip1 = alloc_set( 2 * dim, ip, 2 * dim );                                // CFA array alloc, fill
         printf( "CFA array alloc, fill from array\n" );
         for ( i; 2 * dim ) { printf( "%#x %#x, ", ip[i], ip1[i] ); }
@@ -288 +288 @@
         // do not free
 
-        stp1 = alloc_align_set( Alignment, dim, stp );          // CFA array memalign, fill
+        stp1 = alloc_align_set( Alignment, dim, stp, dim );     // CFA array memalign, fill
         assert( (uintptr_t)stp % Alignment == 0 );
         printf( "CFA array alloc_align, fill array\n" );