Changeset cad355a for src/InitTweak/GenInit.cc

Timestamp:

Jul 11, 2016, 5:20:03 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

919d1ba

Parents:

0b4d93ab

Message:

generated field constructors for structs with const members no longer cause an error, other generated constructors and destructors construct and destruct const members

File:

• src/InitTweak/GenInit.cc (modified) (1 diff)

src/InitTweak/GenInit.cc

@@ -162 +162 @@
                                                 // but it seems reasonable at the moment for this to be done by makeArrayFunction
                                                 // itself
-                                                assert( ctor.size() == 1 );
-                                                assert( dtor.size() == 1 );
-                                                objDecl->set_init( new ConstructorInit( new ImplicitCtorDtorStmt( ctor.front() ), new ImplicitCtorDtorStmt( dtor.front() ), objDecl->get_init() ) );
+                                                assert( ctor.size() == 1 && dynamic_cast< ImplicitCtorDtorStmt * >( ctor.front() ) );
+                                                assert( dtor.size() == 1 && dynamic_cast< ImplicitCtorDtorStmt * >( dtor.front() ) );
+                                                objDecl->set_init( new ConstructorInit( ctor.front(), dtor.front(), objDecl->get_init() ) );
                                         } else {
                                                 // array came with an initializer list: initialize each element