Changes in src/ResolvExpr/Resolver.cc [bc61563:14755e5]

File:

• src/ResolvExpr/Resolver.cc (modified) (3 diffs)

src/ResolvExpr/Resolver.cc

@@ -412 +412 @@
 
         void resolveWithExprs(std::vector<ast::ptr<ast::Expr>> & exprs, std::list<ast::ptr<ast::Stmt>> & stmtsToAdd);
-        bool shouldGenCtorInit( const ast::ObjectDecl * ) const;
 
         void beginScope() { managedTypes.beginScope(); }
@@ -582 +581 @@
 }
 
-bool Resolver::shouldGenCtorInit( ast::ObjectDecl const * decl ) const {
-        // If we shouldn't try to construct it, then don't.
-        if ( !InitTweak::tryConstruct( decl ) ) return false;
-        // Otherwise, if it is a managed type, we may construct it.
-        if ( managedTypes.isManaged( decl ) ) return true;
-        // Skip construction if it is trivial at compile-time.
-        if ( InitTweak::isConstExpr( decl->init ) ) return false;
-        // Skip construction for local declarations.
-        return ( !isInFunction() || decl->storage.is_static );
-}
-
 const ast::ObjectDecl * Resolver::previsit( const ast::ObjectDecl * objectDecl ) {
         // To handle initialization of routine pointers [e.g. int (*fp)(int) = foo()],
@@ -627 +615 @@
                         // this object in visitor pass, thus disabling CtorInit codegen.
                         // this happens on aggregate members and function parameters.
-                        if ( shouldGenCtorInit( mutDecl ) ) {
+                        if ( InitTweak::tryConstruct( mutDecl ) && ( managedTypes.isManaged( mutDecl ) || ((! isInFunction() || mutDecl->storage.is_static ) && ! InitTweak::isConstExpr( mutDecl->init ) ) ) ) {
                                 // constructed objects cannot be designated
                                 if ( InitTweak::isDesignated( mutDecl->init ) ) {