Changeset f6e8c67 for src/ResolvExpr

Timestamp:

Mar 6, 2024, 6:06:43 AM (10 months ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

647d633

Parents:

bbf2cb1 (diff), af60383 (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/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(); }
@@ -581 +582 @@
 }
 
+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()],
@@ -615 +627 @@
                         // this object in visitor pass, thus disabling CtorInit codegen.
                         // this happens on aggregate members and function parameters.
-                        if ( InitTweak::tryConstruct( mutDecl ) && ( managedTypes.isManaged( mutDecl ) || ((! isInFunction() || mutDecl->storage.is_static ) && ! InitTweak::isConstExpr( mutDecl->init ) ) ) ) {
+                        if ( shouldGenCtorInit( mutDecl ) ) {
                                 // constructed objects cannot be designated
                                 if ( InitTweak::isDesignated( mutDecl->init ) ) {