Changeset 083cf31 for src/CodeGen

Timestamp:

Jan 7, 2016, 11:28:48 AM (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, gc_noraii, 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:

1e9d87b

Parents:

267cb3d (diff), de91427b (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 with master

Location:

src/CodeGen

Files:

• CodeGenerator.cc (modified) (1 diff)
• CodeGenerator.h (modified) (1 diff)

src/CodeGen/CodeGenerator.cc

@@ -446 +446 @@
                 output << ")";
         }
+
+        void CodeGenerator::visit( AlignofExpr *sizeofExpr ) {
+                // use GCC extension to avoid bumping std to C11
+                output << "__alignof__(";
+                if ( sizeofExpr->get_isType() ) {
+                        output << genType( sizeofExpr->get_type(), "" );
+                } else {
+                        sizeofExpr->get_expr()->accept( *this );
+                } // if
+                output << ")";
+        }
   
         void CodeGenerator::visit( LogicalExpr *logicalExpr ) {

src/CodeGen/CodeGenerator.h

@@ -60 +60 @@
                 virtual void visit( ConstantExpr *constantExpr ); 
                 virtual void visit( SizeofExpr *sizeofExpr );
+                virtual void visit( AlignofExpr *alignofExpr );
                 virtual void visit( LogicalExpr *logicalExpr );
                 virtual void visit( ConditionalExpr *conditionalExpr );