Changeset 8a0a64d9 for src/tests/polymorphism.c

Timestamp:

Nov 28, 2017, 11:49:12 AM (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:

36982fc, 6c2ba38, d5a52cc

Parents:

8a78dd3 (diff), 8eb348a (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) (1 diff)

src/tests/polymorphism.c

@@ -89 +89 @@
                 // ensure that the size of aggregates with polymorphic members
                 // matches the size of the aggregates in a monomorphic context
-                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." );
+                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) {