Changeset 6c2ba38 for src/tests

Timestamp:

Nov 28, 2017, 3:52:06 PM (8 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:

383e159, 8d5b9cf

Parents:

cf966b5 (diff), 8a0a64d9 (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

Location:

src/tests

Files:

• .expect/32/functions.txt (added)
• .expect/64/functions.txt (added)
• Makefile.am (modified) (2 diffs)
• Makefile.in (modified) (1 diff)
• designations.c (modified) (1 diff)
• functions.c (modified) (3 diffs)
• polymorphism.c (modified) (4 diffs)

src/tests/Makefile.am

@@ -11 +11 @@
 ## Created On       : Sun May 31 09:08:15 2015
 ## Last Modified By : Peter A. Buhr
-## Last Modified On : Tue Oct 10 14:04:40 2017
-## Update Count     : 47
+## Last Modified On : Mon Nov 27 21:34:33 2017
+## Update Count     : 48
 ###############################################################################
 
@@ -118 +118 @@
         ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
 
+functions: functions.c @CFA_BINDIR@/@CFA_NAME@
+        ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
+
 KRfunctions : KRfunctions.c @CFA_BINDIR@/@CFA_NAME@
         ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}

src/tests/Makefile.in

@@ -871 +871 @@
         ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
 
+functions: functions.c @CFA_BINDIR@/@CFA_NAME@
+        ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
+
 KRfunctions : KRfunctions.c @CFA_BINDIR@/@CFA_NAME@
         ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}

src/tests/designations.c

@@ -17 +17 @@
 // In particular, since the syntax for designations in Cforall differs from that of C, preprocessor substitution
 // is used for the designation syntax
-#ifdef __CFORALL__
+#ifdef __cforall
 #define DES :
 #else

src/tests/functions.c

@@ -10 +10 @@
 // Created On       : Wed Aug 17 08:39:58 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Aug 17 08:40:52 2016
-// Update Count     : 1
+// Last Modified On : Mon Nov 27 18:08:54 2017
+// Update Count     : 11
 // 
 
@@ -66 +66 @@
 // Cforall extensions
 
-[] f( );
+// [] f( );
 [int] f( );
-[] f(int);
+// [] f(int);
 [int] f(int);
-[] f( ) {}
+// [] f( ) {}
 [int] f( ) {}
-[] f(int) {}
+// [] f(int) {}
 [int] f(int) {}
 
 [int x] f( );
-[] f(int x);
-[int x] f(int x);
-[int x] f( ) {}
-[] f(int x) {}
-[int x] f(int x) {}
+// [] f(int x);
+//[int x] f(int x);
+//[int x] f( ) {}
+// [] f(int x) {}
+//[int x] f(int x) {}
 
 [int, int x] f( );
-[] f(int, int x);
+// [] f(int, int x);
 [int, int x] f(int, int x);
 [int, int x] f( ) {}
-[] f(int, int x) {}
+// [] f(int, int x) {}
 [int, int x] f(int, int x) {}
 
 [int, int x, int] f( );
-[] f(int, int x, int);
+// [] f(int, int x, int);
 [int, int x, int] f(int, int x, int);
 [int, int x, int] f( ) {}
-[] f(int, int x, int) {}
+// [] f(int, int x, int) {}
 [int, int x, int] f(int, int x, int) {}
 
 [int, int x, * int y] f( );
-[] f(int, int x, * int y);
+// [] f(int, int x, * int y);
 [int, int x, * int y] f(int, int x, * int y);
 [int, int x, * int y] f( ) {}
-[] f(int, int x, * int y) {}
+// [] f(int, int x, * int y) {}
 [int, int x, * int y] f(int, int x, * int y) {}
 
-[ int ] f11( int ), f12;  // => int f11( int ), f12( int );
+// function prototypes
+
+[ int ] f11( int ), f12();  // => int f11( int ), f12( void );
+
+const double bar1(), bar2( int ), bar3( double );               // C version
+[const double] foo(), foo( int ), foo( double ) { return 3.0; } // CFA version
+struct S { int i; };
+[S] rtn( int ) {}
+
 
 [int] f(
@@ -109 +117 @@
         [int](int)
         ) {
-        int (*(*p)[][10])[][3];
+        int (*(*pc)[][10])[][3];
         * [][10] * [][3] int p;
         * [] * [int](int) p;

src/tests/polymorphism.c

@@ -47 +47 @@
         S s;
         s.i = i;
-        assert(s.i == i);
+        assertf(s.i == i, "struct operation fails in polymorphic context.");
 
         B b;
@@ -73 +73 @@
         {
                 // test aggregates with polymorphic members
-                typedef uint32_t x_type;
-                typedef uint64_t y_type;
+                typedef __attribute__((aligned(8))) uint32_t x_type;
+                typedef __attribute__((aligned(8))) uint64_t y_type;
 
                 x_type x = 3;
@@ -89 +89 @@
                 // ensure that the size of aggregates with polymorphic members
                 // matches the size of the aggregates in a monomorphic context
-                assert( struct_size(x, y) == sizeof(S) );
-                assert( union_size(x, y) == sizeof(U) );
+                size_t ssz = struct_size(x, y);
+                size_t usz = union_size(x, y);
+                assertf( ssz == sizeof(S), "struct size differs in polymorphic context: %zd / %zd", ssz, sizeof(S));
+                assertf( usz == sizeof(U), "union size differs in polymorphic context: %zd / %zd", usz, sizeof(U));
 
                 y_type ?=?(y_type & this, zero_t) {
@@ -111 +113 @@
                 u.f2 = 0;
                 u.f1 = x;
-                assert(ret == u.f2);
+                assertf(ret == u.f2, "union operation fails in polymorphic context.");
         }
 }