Changeset c6e2c18 for src/tests

Timestamp:

Nov 28, 2017, 10:21:50 AM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

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

Children:

9c35431

Parents:

c0d00b6 (diff), c029f4d (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 cleanup-dtors

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) );
+                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.");
         }
 }