Changeset 6cf27a07 for src/SymTab

Timestamp:

Jul 21, 2016, 2:07:01 PM (9 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

ccb447e

Parents:

b81adcc4

Message:

reorganize global init so that it is simpler and generates less unnecessary code

File:

• src/SymTab/Autogen.h (modified) (1 diff)

src/SymTab/Autogen.h

@@ -144 +144 @@
                 genCall( srcParam, dstParam, fname, back_inserter( stmts ), obj->get_type(), forward );
 
-                // currently genCall should produce only one element, but if that changes then the next line needs to be updated to grab the statement which contains the call
-                assert( stmts.size() == 1 );
-                Statement * callStmt = stmts.front();
-                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;
+                // currently genCall should produce at most one element, but if that changes then the next line needs to be updated to grab the statement which contains the call
+                assert( stmts.size() <= 1 );
+    if ( stmts.size() == 1 ) {
+                Statement * callStmt = stmts.front();
+                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;
+    }
         }
 } // namespace SymTab