Changeset 083cf31 for src/CodeGen


Ignore:
Timestamp:
Jan 7, 2016, 11:28:48 AM (8 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:
2 edited

Legend:

Unmodified
Added
Removed
  • src/CodeGen/CodeGenerator.cc

    r267cb3d r083cf31  
    446446                output << ")";
    447447        }
     448
     449        void CodeGenerator::visit( AlignofExpr *sizeofExpr ) {
     450                // use GCC extension to avoid bumping std to C11
     451                output << "__alignof__(";
     452                if ( sizeofExpr->get_isType() ) {
     453                        output << genType( sizeofExpr->get_type(), "" );
     454                } else {
     455                        sizeofExpr->get_expr()->accept( *this );
     456                } // if
     457                output << ")";
     458        }
    448459 
    449460        void CodeGenerator::visit( LogicalExpr *logicalExpr ) {
  • src/CodeGen/CodeGenerator.h

    r267cb3d r083cf31  
    6060                virtual void visit( ConstantExpr *constantExpr );
    6161                virtual void visit( SizeofExpr *sizeofExpr );
     62                virtual void visit( AlignofExpr *alignofExpr );
    6263                virtual void visit( LogicalExpr *logicalExpr );
    6364                virtual void visit( ConditionalExpr *conditionalExpr );
Note: See TracChangeset for help on using the changeset viewer.