Changeset 71a3593 for src/CodeGen/CodeGenerator.cc

Timestamp:

Aug 5, 2016, 12:06:29 PM (8 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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:

d9e2280

Parents:

9706554 (diff), a2f920f (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 plg2:software/cfa/cfa-cc

File:

• src/CodeGen/CodeGenerator.cc (modified) (2 diffs)

src/CodeGen/CodeGenerator.cc

@@ -148 +148 @@
         void CodeGenerator::visit( ObjectDecl * objectDecl ) {
                 extension( objectDecl );
+                genAttributes( objectDecl->get_attributes() );
+
                 handleStorageClass( objectDecl );
                 output << genType( objectDecl->get_type(), mangleName( objectDecl ) );
@@ -271 +273 @@
                 printDesignators( init->get_designators() );
                 output << "{ ";
-                if ( init->begin_initializers() == init->end_initializers() ) {
+                if ( init->begin() == init->end() ) {
                         // illegal to leave initializer list empty for scalar initializers, but always legal to have 0
                         output << "0";
                 } else {
-                        genCommaList( init->begin_initializers(), init->end_initializers() );
+                        genCommaList( init->begin(), init->end() );
                 } // if
                 output << " }";