Changeset c6e2c18 for src/GenPoly/Box.cc


Ignore:
Timestamp:
Nov 28, 2017, 10:21:50 AM (4 years ago)
Author:
Rob Schluntz <rschlunt@…>
Branches:
arm-eh, cleanup-dtors, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr
Children:
9c35431
Parents:
c0d00b6 (diff), c029f4d (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 cleanup-dtors

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/GenPoly/Box.cc

    rc0d00b6 rc6e2c18  
    855855                        DeclarationWithType *adapteeDecl = adapterType->get_parameters().front();
    856856                        adapteeDecl->set_name( "_adaptee" );
     857                        // do not carry over attributes to real type parameters/return values
     858                        for ( DeclarationWithType * dwt : realType->parameters ) {
     859                                deleteAll( dwt->get_type()->attributes );
     860                                dwt->get_type()->attributes.clear();
     861                        }
     862                        for ( DeclarationWithType * dwt : realType->returnVals ) {
     863                                deleteAll( dwt->get_type()->attributes );
     864                                dwt->get_type()->attributes.clear();
     865                        }
    857866                        ApplicationExpr *adapteeApp = new ApplicationExpr( new CastExpr( new VariableExpr( adapteeDecl ), new PointerType( Type::Qualifiers(), realType ) ) );
    858867                        Statement *bodyStmt;
Note: See TracChangeset for help on using the changeset viewer.