Changeset f1b1e4c for src/InitTweak/GenInit.cc

Timestamp:

Jun 1, 2016, 11:54:23 AM (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, gc_noraii, 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:

be945ac

Parents:

70f89d00

Message:

can construct global const objects, except with intrinsic constructors

File:

• src/InitTweak/GenInit.cc (modified) (3 diffs)

src/InitTweak/GenInit.cc

@@ -143 +143 @@
                 if ( tryConstruct( objDecl ) ) {
                         if ( inFunction ) {
-                                // remove qualifiers so that const objects can be initialized, and attach the
-                                // qualifiers to ConstructorInit so that they can be replaced after resolving
-                                Type * type = objDecl->get_type();
-                                Type::Qualifiers qualifiers = type->get_qualifiers();
-                                type->get_qualifiers() = Type::Qualifiers();
-
                                 if ( ArrayType * at = dynamic_cast< ArrayType * >( objDecl->get_type() ) ) {
                                         // call into makeArrayFunction from validate.cc to generate calls to ctor/dtor for each element of array
@@ -170 +164 @@
                                                 assert( ctor.size() == 1 );
                                                 assert( dtor.size() == 1 );
-
-                                                objDecl->set_init( new ConstructorInit( ctor.front(), dtor.front(), objDecl->get_init(), objDecl, qualifiers ) );
+                                                objDecl->set_init( new ConstructorInit( new ImplicitCtorDtorStmt( ctor.front() ), new ImplicitCtorDtorStmt( dtor.front() ), objDecl->get_init() ) );
                                         } else {
                                                 // array came with an initializer list: initialize each element
@@ -191 +184 @@
                                         ExprStmt * ctorStmt = new ExprStmt( noLabels, ctor );
                                         ExprStmt * dtorStmt = new ExprStmt( noLabels, dtor );
-                                        objDecl->set_init( new ConstructorInit( ctorStmt, dtorStmt, objDecl->get_init(), objDecl, qualifiers ) );
+                                        objDecl->set_init( new ConstructorInit( new ImplicitCtorDtorStmt( ctorStmt ), new ImplicitCtorDtorStmt( dtorStmt ), objDecl->get_init() ) );
                                 }
                         }