Changes in src/ResolvExpr/Resolver.cpp [10c1770:64f3b9f]

File:

• src/ResolvExpr/Resolver.cpp (modified) (2 diffs)

src/ResolvExpr/Resolver.cpp

@@ -703 +703 @@
         } else {
                 if ( !objectDecl->isTypeFixed ) {
-                        objectDecl = fixObjectType(objectDecl, context);
+                        auto newDecl = fixObjectType(objectDecl, context);
+                        auto mutDecl = mutate(newDecl);
 
                         // generate CtorInit wrapper when necessary.
@@ -709 +710 @@
                         // this object in visitor pass, thus disabling CtorInit codegen.
                         // this happens on aggregate members and function parameters.
-                        if ( shouldGenCtorInit( objectDecl ) ) {
+                        if ( shouldGenCtorInit( mutDecl ) ) {
                                 // constructed objects cannot be designated
-                                if ( InitTweak::isDesignated( objectDecl->init )
-                                                && !ast::Pass<ResolveDesignators>::read(
-                                                        objectDecl->init.get(), context ) ) {
-                                        SemanticError( objectDecl, "Cannot include designations in the initializer for a managed Object.\n"
-                                                        "If this is really what you want, initialize with @=." );
+                                if ( InitTweak::isDesignated( mutDecl->init ) ) {
+                                        ast::Pass<ResolveDesignators> res( context );
+                                        maybe_accept( mutDecl->init.get(), res );
+                                        if ( !res.core.result ) {
+                                                SemanticError( mutDecl, "Cannot include designations in the initializer for a managed Object.\n"
+                                                                           "If this is really what you want, initialize with @=." );
+                                        }
                                 }
                                 // constructed objects should not have initializers nested too deeply
-                                if ( !InitTweak::checkInitDepth( objectDecl ) ) SemanticError( objectDecl, "Managed object's initializer is too deep " );
-
-                                objectDecl = ast::mutate_field( objectDecl, &ast::ObjectDecl::init,
-                                        InitTweak::genCtorInit( objectDecl->location, objectDecl ) );
+                                if ( ! InitTweak::checkInitDepth( mutDecl ) ) SemanticError( mutDecl, "Managed object's initializer is too deep " );
+
+                                mutDecl->init = InitTweak::genCtorInit( mutDecl->location, mutDecl );
                         }
+
+                        objectDecl = mutDecl;
                 }
                 currentObject = ast::CurrentObject{ objectDecl->location, objectDecl->get_type() };