Changes in src/SymTab/Autogen.cc [0b4d93ab:cad355a]

File:

• src/SymTab/Autogen.cc (modified) (2 diffs)

src/SymTab/Autogen.cc

@@ -84 +84 @@
                 }
 
-                *out++ = new ExprStmt( noLabels, fExpr );
+                Statement * callStmt = new ExprStmt( noLabels, fExpr );
+                if ( (fname == "?{}" || fname == "^?{}") && ( !obj || ( obj && obj->get_bitfieldWidth() == NULL ) ) ) {
+                        // implicitly generated ctor/dtor calls should be wrapped
+                        // so that later passes are aware they were generated.
+                        // xxx - don't mark as an implicit ctor/dtor if obj is a bitfield,
+                        // because this causes the address to be taken at codegen, which is illegal in C.
+                        callStmt = new ImplicitCtorDtorStmt( callStmt );
+                }
+                *out++ = callStmt;
         }
 
@@ -244 +252 @@
                                 }
 
-                                if ( type->get_qualifiers().isConst ) {
-                                        // don't assign const members
+                                if ( type->get_qualifiers().isConst && func->get_name() == "?=?" ) {
+                                        // don't assign const members, but do construct/destruct
                                         continue;
                                 }