Changes in src/SymTab/Autogen.cc [4e06c1e:cad355a]

File:

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

src/SymTab/Autogen.cc

@@ -9 +9 @@
 // Author           : Rob Schluntz
 // Created On       : Thu Mar 03 15:45:56 2016
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Jul 12 17:47:17 2016
-// Update Count     : 2
+// Last Modified By : Rob Schluntz
+// Last Modified On : Thu May 26 14:14:09 2016
+// Update Count     : 1
 //
 
@@ -42 +42 @@
                 virtual void visit( CompoundStmt *compoundStmt );
                 virtual void visit( SwitchStmt *switchStmt );
+                virtual void visit( ChooseStmt *chooseStmt );
+                // virtual void visit( CaseStmt *caseStmt );
 
                 AutogenerateRoutines() : functionNesting( 0 ) {}
@@ -82 +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;
         }
 
@@ -242 +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;
                                 }
@@ -549 +559 @@
                 visitStatement( switchStmt );
         }
+
+        void AutogenerateRoutines::visit( ChooseStmt *switchStmt ) {
+                visitStatement( switchStmt );
+        }
+
+        // void AutogenerateRoutines::visit( CaseStmt *caseStmt ) {
+        //      visitStatement( caseStmt );
+        // }
 } // SymTab