Changeset 189243c


Ignore:
Timestamp:
May 13, 2016, 2:55:44 PM (6 years ago)
Author:
Rob Schluntz <rschlunt@…>
Branches:
aaron-thesis, arm-eh, 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, resolv-new, with_gc
Children:
2b46a13, a8616147
Parents:
102b0cd (diff), cc3528f (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' into ctor

Conflicts:

src/GenPoly/Box.cc

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/GenPoly/Box.cc

    r102b0cd r189243c  
    1010// Created On       : Mon May 18 07:44:20 2015
    1111// Last Modified By : Rob Schluntz
    12 // Last Modified On : Tue May 03 16:44:47 2016
     12// Last Modified On : Fri May 13 14:51:21 2016
    1313// Update Count     : 295
    1414//
     
    10371037                        std::list< DeclarationWithType *>::iterator param = adapterType->get_parameters().begin();
    10381038                        std::list< DeclarationWithType *>::iterator realParam = adaptee->get_parameters().begin();
    1039                         param++;                // skip adaptee parameter
     1039                        param++;                // skip adaptee parameter in the adapter type
    10401040                        if ( realType->get_returnVals().empty() ) {
     1041                                // void return
    10411042                                addAdapterParams( adapteeApp, arg, param, adapterType->get_parameters().end(), realParam, tyVars );
    10421043                                bodyStmt = new ExprStmt( noLabels, adapteeApp );
    10431044                        } else if ( isPolyType( adaptee->get_returnVals().front()->get_type(), tyVars ) ) {
     1045                                // return type T
    10441046                                if ( (*param)->get_name() == "" ) {
    10451047                                        (*param)->set_name( "_ret" );
     
    20692071                                if ( n_members == 0 ) {
    20702072                                        // all empty structs have the same layout - size 1, align 1
    2071                                         makeVar( sizeofName( typeName ), layoutType, new SingleInit( new ConstantExpr( Constant::from_ulong( 1 ) ) ) );
    2072                                         makeVar( alignofName( typeName ), layoutType->clone(), new SingleInit( new ConstantExpr( Constant::from_ulong( 1 ) ) ) );
     2073                                        makeVar( sizeofName( typeName ), layoutType, new SingleInit( new ConstantExpr( Constant::from_ulong( (unsigned long)1 ) ) ) );
     2074                                        makeVar( alignofName( typeName ), layoutType->clone(), new SingleInit( new ConstantExpr( Constant::from_ulong( (unsigned long)1 ) ) ) );
    20732075                                        // NOTE zero-length arrays are forbidden in C, so empty structs have no offsetof array
    20742076                                } else {
Note: See TracChangeset for help on using the changeset viewer.