Changeset 071a31a for src/InitTweak

Timestamp:

Mar 3, 2016, 2:45:51 PM (9 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:

620cb95

Parents:

c14cff1

Message:

removed array ctor/dtors from prelude, generalized struct routine generation, fix fall back on initializer if ctor not found, begin special casing array ctor/dtor

File:

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

src/InitTweak/RemoveInit.cc

@@ -192 +192 @@
                 if ( tryConstruct( objDecl ) ) {
                         if ( inFunction ) {
-                                Expression * ctor = makeCtorDtorExpr( "?{}", objDecl, makeInitList( objDecl->get_init() ) );
-                                Expression * dtor = makeCtorDtorExpr( "^?{}", objDecl, std::list< Expression * >() );
-
-                                // need to remember init expression, in case no ctors exist
-                                // if ctor does exist, want to use ctor expression instead of init
-                                // push this decision to the resolver
-                                objDecl->set_init( new ConstructorInit( ctor, objDecl->get_init() ) );
-                                destructorStmts.push_front( new ExprStmt( noLabels, dtor ) );
+                                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
+                                } else {
+                                        // it's sufficient to attempt to call the ctor/dtor for the given object and its initializer
+                                        Expression * ctor = makeCtorDtorExpr( "?{}", objDecl, makeInitList( objDecl->get_init() ) );
+                                        Expression * dtor = makeCtorDtorExpr( "^?{}", objDecl, std::list< Expression * >() );
+
+                                        // need to remember init expression, in case no ctors exist
+                                        // if ctor does exist, want to use ctor expression instead of init
+                                        // push this decision to the resolver
+                                        objDecl->set_init( new ConstructorInit( ctor, objDecl->get_init() ) );
+                                        destructorStmts.push_front( new ExprStmt( noLabels, dtor ) );
+                                }
                         } else {
                                 // xxx - find a way to construct/destruct globals
                                 // hack: implicit "static" initialization routine for each struct type? or something similar?
                                 // --ties into module system
+                                // this can be done by mangling main and replacing it with our own main which calls each
+                                // module initialization routine in some decided order (order given in link command?)
+                                // and finally calls mangled main
                         }
                 }