Changeset 8a78dd3 for src/tests

Timestamp:

Nov 27, 2017, 4:17:28 PM (7 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:

8a0a64d9

Parents:

56de6b39 (diff), a16a7ec (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/polymorphism.c (modified) (4 diffs)

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) );
+                assertf( struct_size(x, y) == sizeof(S), "struct size differs in polymorphic context." );
+                assertf( union_size(x, y) == sizeof(U), "union size differs in polymorphic context." );
 
                 y_type ?=?(y_type & this, zero_t) {
@@ -111 +111 @@
                 u.f2 = 0;
                 u.f1 = x;
-                assert(ret == u.f2);
+                assertf(ret == u.f2, "union operation fails in polymorphic context.");
         }
 }