Changeset acd7c5dd for src/GenPoly/Box.cc
- Timestamp:
- Aug 8, 2017, 2:49:47 PM (7 years ago)
- Branches:
- ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc
- Children:
- c92c09c
- Parents:
- 56e49b0
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
src/GenPoly/Box.cc
r56e49b0 racd7c5dd 27 27 #include "Box.h" 28 28 #include "DeclMutator.h" 29 #include "Lvalue.h" 30 #include "FindFunction.h" 29 31 #include "PolyMutator.h" 30 #include "FindFunction.h"31 32 #include "ScopedSet.h" 32 33 #include "ScrubTyVars.h" … … 755 756 756 757 void Pass1::boxParam( Type *param, Expression *&arg, const TyVarMap &exprTyVars ) { 757 assert ( arg->has_result() );758 assertf( arg->has_result(), "arg does not have result: %s", toString( arg ).c_str() ); 758 759 if ( isPolyType( param, exprTyVars ) ) { 759 if ( isPolyType( arg->get_result() ) ) { 760 Type * newType = arg->get_result()->clone(); 761 if ( env ) env->apply( newType ); 762 std::auto_ptr<Type> manager( newType ); 763 if ( isPolyType( newType ) ) { 760 764 // if the argument's type is polymorphic, we don't need to box again! 761 765 return; 762 766 } else if ( arg->get_result()->get_lvalue() ) { 763 // VariableExpr and MemberExpr are lvalues; need to check this isn't coming from the second arg of a comma expression though (not an lvalue) 764 // xxx - need to test that this code is still reachable 765 if ( CommaExpr *commaArg = dynamic_cast< CommaExpr* >( arg ) ) { 766 commaArg->set_arg2( new AddressExpr( commaArg->get_arg2() ) ); 767 } else { 768 arg = new AddressExpr( arg ); 769 } 767 // argument expression may be CFA lvalue, but not C lvalue -- apply generalizedLvalue transformations. 768 arg = generalizedLvalue( new AddressExpr( arg ) ); 770 769 if ( ! ResolvExpr::typesCompatible( param, arg->get_result(), SymTab::Indexer() ) ) { 771 770 // silence warnings by casting boxed parameters when the actual type does not match up with the formal type. … … 1879 1878 return structDecl; 1880 1879 } 1881 1880 1882 1881 Declaration *Pass3::mutate( UnionDecl *unionDecl ) { 1883 1882 stripGenericMembers( unionDecl );
Note: See TracChangeset
for help on using the changeset viewer.