Changes in / [42655e8:a715b5c]
- Files:
-
- 14 edited
Legend:
- Unmodified
- Added
- Removed
-
libcfa/prelude/builtins.c
r42655e8 ra715b5c 111 111 static inline unsigned int ?\=?( unsigned int & x, unsigned long int y ) { x = x \ y; return x; } 112 112 113 // type that wraps a pointer and a destructor-like function - used in generating implicit destructor calls for struct members in user-defined functions 114 forall(dtype T) 115 struct __Destructor { 116 T * object; 117 void (*dtor)(T *); 118 }; 119 120 // defined destructor in the case that non-generated code wants to use __Destructor 121 forall(dtype T) 122 static inline void ^?{}(__Destructor(T) & x) { 123 if (x.object && x.dtor) { 124 x.dtor(x.object); 125 } 126 } 127 128 // easy interface into __Destructor's destructor for easy codegen purposes 129 extern "C" { 130 forall(dtype T) 131 static inline void __destroy_Destructor(__Destructor(T) * dtor) { 132 ^(*dtor){}; 133 } 134 } 135 113 136 // Local Variables: // 114 137 // mode: c // -
src/ControlStruct/ExceptTranslate.cc
r42655e8 ra715b5c 319 319 } 320 320 321 block->push_back( handler-> get_body());322 handler-> set_body( nullptr );321 block->push_back( handler->body ); 322 handler->body = nullptr; 323 323 324 324 std::list<Statement *> caseBody -
src/InitTweak/FixInit.cc
r42655e8 ra715b5c 54 54 #include "SynTree/Type.h" // for Type, Type::StorageClasses 55 55 #include "SynTree/TypeSubstitution.h" // for TypeSubstitution, operator<< 56 #include "SynTree/DeclReplacer.h" // for DeclReplacer 56 57 #include "SynTree/Visitor.h" // for acceptAll, maybeAccept 57 58 … … 162 163 using Parent::previsit; 163 164 164 void previsit( ObjectDecl * objDecl );165 165 void previsit( FunctionDecl * funcDecl ); 166 166 167 void previsit( CompoundStmt * compoundStmt );168 void postvisit( CompoundStmt * compoundStmt );169 void previsit( ReturnStmt * returnStmt );170 167 void previsit( BranchStmt * stmt ); 171 168 private: … … 207 204 static void generate( std::list< Declaration * > & translationUnit ); 208 205 206 void premutate( StructDecl * structDecl ); 207 209 208 void premutate( FunctionDecl * funcDecl ); 210 209 DeclarationWithType * postmutate( FunctionDecl * funcDecl ); … … 228 227 bool isCtor = false; // true if current function is a constructor 229 228 StructDecl * structDecl = nullptr; 229 230 // special built-in functions necessary for this to work 231 StructDecl * dtorStruct = nullptr; 232 FunctionDecl * dtorStructDestroy = nullptr; 230 233 }; 231 234 … … 732 735 } 733 736 737 DeclarationWithType * getDtorFunc( ObjectDecl * objDecl, Statement * input, std::list< Statement * > & stmtsToAdd ) { 738 // unwrap implicit statement wrapper 739 Statement * dtor = input; 740 if ( ImplicitCtorDtorStmt * implicit = dynamic_cast< ImplicitCtorDtorStmt * >( input ) ) { 741 // dtor = implicit->callStmt; 742 // implicit->callStmt = nullptr; 743 } 744 assert( dtor ); 745 std::list< Expression * > matches; 746 collectCtorDtorCalls( dtor, matches ); 747 748 if ( dynamic_cast< ExprStmt * >( dtor ) ) { 749 // only one destructor call in the expression 750 if ( matches.size() == 1 ) { 751 DeclarationWithType * func = getFunction( matches.front() ); 752 assertf( func, "getFunction failed to find function in %s", toString( matches.front() ).c_str() ); 753 754 // cleanup argument must be a function, not an object (including function pointer) 755 if ( FunctionDecl * dtorFunc = dynamic_cast< FunctionDecl * > ( func ) ) { 756 if ( dtorFunc->type->forall.empty() ) { 757 // simple case where the destructor is a monomorphic function call - can simply 758 // use that function as the cleanup function. 759 delete dtor; 760 return func; 761 } 762 } 763 } 764 } 765 766 // otherwise the cleanup is more complicated - need to build a single argument cleanup function that 767 // wraps the more complicated code. 768 static UniqueName dtorNamer( "__cleanup_dtor" ); 769 FunctionDecl * dtorFunc = FunctionDecl::newFunction( dtorNamer.newName(), SymTab::genDefaultType( objDecl->type->stripReferences(), false ), new CompoundStmt() ); 770 stmtsToAdd.push_back( new DeclStmt( dtorFunc ) ); 771 772 // the original code contains uses of objDecl - replace them with the newly generated 'this' parameter. 773 ObjectDecl * thisParam = getParamThis( dtorFunc->type ); 774 Expression * replacement = new VariableExpr( thisParam ); 775 776 Type * base = replacement->result->stripReferences(); 777 if ( dynamic_cast< ArrayType * >( base ) || dynamic_cast< TupleType * > ( base ) ) { 778 // need to cast away reference for array types, since the destructor is generated without the reference type, 779 // and for tuple types since tuple indexing does not work directly on a reference 780 replacement = new CastExpr( replacement, base->clone() ); 781 } 782 DeclReplacer::replace( dtor, { std::make_pair( objDecl, replacement ) } ); 783 dtorFunc->statements->push_back( strict_dynamic_cast<Statement *>( dtor ) ); 784 785 return dtorFunc; 786 } 787 734 788 DeclarationWithType * FixInit::postmutate( ObjectDecl *objDecl ) { 735 789 // since this removes the init field from objDecl, it must occur after children are mutated (i.e. postmutate) … … 844 898 ctorInit->ctor = nullptr; 845 899 } 900 901 Statement * dtor = ctorInit->dtor; 902 if ( dtor ) { 903 ImplicitCtorDtorStmt * implicit = strict_dynamic_cast< ImplicitCtorDtorStmt * >( dtor ); 904 Statement * dtorStmt = implicit->callStmt; 905 906 // don't need to call intrinsic dtor, because it does nothing, but 907 // non-intrinsic dtors must be called 908 if ( ! isIntrinsicSingleArgCallStmt( dtorStmt ) ) { 909 // set dtor location to the object's location for error messages 910 DeclarationWithType * dtorFunc = getDtorFunc( objDecl, dtorStmt, stmtsToAddBefore ); 911 objDecl->attributes.push_back( new Attribute( "cleanup", { new VariableExpr( dtorFunc ) } ) ); 912 ctorInit->dtor = nullptr; 913 } // if 914 } 846 915 } // if 847 916 } else if ( Initializer * init = ctorInit->init ) { … … 886 955 887 956 888 template<typename Iterator, typename OutputIterator>889 void insertDtors( Iterator begin, Iterator end, OutputIterator out ) {890 for ( Iterator it = begin ; it != end ; ++it ) {891 // extract destructor statement from the object decl and insert it into the output. Note that this is892 // only called on lists of non-static objects with implicit non-intrinsic dtors, so if the user manually893 // calls an intrinsic dtor then the call must (and will) still be generated since the argument may894 // contain side effects.895 ObjectDecl * objDecl = *it;896 ConstructorInit * ctorInit = dynamic_cast< ConstructorInit * >( objDecl->get_init() );897 assert( ctorInit && ctorInit->get_dtor() );898 *out++ = ctorInit->get_dtor()->clone();899 } // for900 }901 902 void InsertDtors::previsit( ObjectDecl * objDecl ) {903 // remember non-static destructed objects so that their destructors can be inserted later904 if ( ! objDecl->get_storageClasses().is_static ) {905 if ( ConstructorInit * ctorInit = dynamic_cast< ConstructorInit * >( objDecl->get_init() ) ) {906 // a decision should have been made by the resolver, so ctor and init are not both non-NULL907 assert( ! ctorInit->get_ctor() || ! ctorInit->get_init() );908 Statement * dtor = ctorInit->get_dtor();909 // don't need to call intrinsic dtor, because it does nothing, but910 // non-intrinsic dtors must be called911 if ( dtor && ! isIntrinsicSingleArgCallStmt( dtor ) ) {912 // set dtor location to the object's location for error messages913 ctorInit->dtor->location = objDecl->location;914 reverseDeclOrder.front().push_front( objDecl );915 } // if916 } // if917 } // if918 }919 920 957 void InsertDtors::previsit( FunctionDecl * funcDecl ) { 921 958 // each function needs to have its own set of labels … … 930 967 } 931 968 932 void InsertDtors::previsit( CompoundStmt * compoundStmt ) {933 // visit statements - this will also populate reverseDeclOrder list. don't want to dump all destructors934 // when block is left, just the destructors associated with variables defined in this block, so push a new935 // list to the top of the stack so that we can differentiate scopes936 reverseDeclOrder.push_front( OrderedDecls() );937 Parent::previsit( compoundStmt );938 }939 940 void InsertDtors::postvisit( CompoundStmt * compoundStmt ) {941 // add destructors for the current scope that we're exiting, unless the last statement is a return, which942 // causes unreachable code warnings943 std::list< Statement * > & statements = compoundStmt->get_kids();944 if ( ! statements.empty() && ! dynamic_cast< ReturnStmt * >( statements.back() ) ) {945 insertDtors( reverseDeclOrder.front().begin(), reverseDeclOrder.front().end(), back_inserter( statements ) );946 }947 reverseDeclOrder.pop_front();948 }949 950 void InsertDtors::previsit( ReturnStmt * ) {951 // return exits all scopes, so dump destructors for all scopes952 for ( OrderedDecls & od : reverseDeclOrder ) {953 insertDtors( od.begin(), od.end(), back_inserter( stmtsToAddBefore ) );954 } // for955 }956 957 969 // Handle break/continue/goto in the same manner as C++. Basic idea: any objects that are in scope at the 958 970 // BranchStmt but not at the labelled (target) statement must be destructed. If there are any objects in scope … … 982 994 if ( ! diff.empty() ) { 983 995 SemanticError( stmt, std::string("jump to label '") + stmt->get_target().get_name() + "' crosses initialization of " + (*diff.begin())->get_name() + " " ); 984 } // if985 // S_G-S_L results in set of objects that must be destructed986 diff.clear();987 std::set_difference( curVars.begin(), curVars.end(), lvars.begin(), lvars.end(), std::inserter( diff, diff.end() ) );988 DTOR_PRINT(989 std::cerr << "S_G-S_L = " << printSet( diff ) << std::endl;990 )991 if ( ! diff.empty() ) {992 // create an auxilliary set for fast lookup -- can't make diff a set, because diff ordering should be consistent for error messages.993 std::unordered_set<ObjectDecl *> needsDestructor( diff.begin(), diff.end() );994 995 // go through decl ordered list of objectdecl. for each element that occurs in diff, output destructor996 OrderedDecls ordered;997 for ( OrderedDecls & rdo : reverseDeclOrder ) {998 // add elements from reverseDeclOrder into ordered if they occur in diff - it is key that this happens in reverse declaration order.999 copy_if( rdo.begin(), rdo.end(), back_inserter( ordered ), [&]( ObjectDecl * objDecl ) { return needsDestructor.count( objDecl ); } );1000 } // for1001 insertDtors( ordered.begin(), ordered.end(), back_inserter( stmtsToAddBefore ) );1002 996 } // if 1003 997 } … … 1025 1019 } 1026 1020 1021 void GenStructMemberCalls::premutate( StructDecl * structDecl ) { 1022 if ( ! dtorStruct && structDecl->name == "__Destructor" ) { 1023 dtorStruct = structDecl; 1024 } 1025 } 1026 1027 1027 void GenStructMemberCalls::premutate( FunctionDecl * funcDecl ) { 1028 1028 GuardValue( function ); … … 1037 1037 unhandled.clear(); 1038 1038 usedUninit.clear(); 1039 1040 if ( ! dtorStructDestroy && funcDecl->name == "__destroy_Destructor" ) { 1041 dtorStructDestroy = funcDecl; 1042 return; 1043 } 1039 1044 1040 1045 function = funcDecl; … … 1048 1053 if ( structType ) { 1049 1054 structDecl = structType->get_baseStruct(); 1055 if ( structDecl == dtorStruct ) return; 1050 1056 for ( Declaration * member : structDecl->get_members() ) { 1051 1057 if ( ObjectDecl * field = dynamic_cast< ObjectDecl * >( member ) ) { … … 1116 1122 callStmt->acceptMutator( *visitor ); 1117 1123 if ( isCtor ) { 1118 function-> get_statements()->push_front( callStmt );1119 } else { 1124 function->statements->push_front( callStmt ); 1125 } else { // TODO: don't generate destructor function/object for intrinsic calls 1120 1126 // destructor statements should be added at the end 1121 function->get_statements()->push_back( callStmt ); 1127 // function->get_statements()->push_back( callStmt ); 1128 1129 // __Destructor _dtor0 = { (void *)&b.a1, (void (*)(void *)_destroy_A }; 1130 std::list< Statement * > stmtsToAdd; 1131 1132 static UniqueName memberDtorNamer = { "__memberDtor" }; 1133 assertf( dtorStruct, "builtin __Destructor not found." ); 1134 assertf( dtorStructDestroy, "builtin __destroy_Destructor not found." ); 1135 1136 Expression * thisExpr = new CastExpr( new AddressExpr( new VariableExpr( thisParam ) ), new PointerType( Type::Qualifiers(), new VoidType( Type::Qualifiers() ) ) ); 1137 Expression * dtorExpr = new VariableExpr( getDtorFunc( thisParam, callStmt, stmtsToAdd ) ); 1138 1139 // cast destructor pointer to void (*)(void *), to silence GCC incompatible pointer warnings 1140 FunctionType * dtorFtype = new FunctionType( Type::Qualifiers(), false ); 1141 dtorFtype->parameters.push_back( ObjectDecl::newObject( "", new PointerType( Type::Qualifiers(), new VoidType( Type::Qualifiers() ) ), nullptr ) ); 1142 Type * dtorType = new PointerType( Type::Qualifiers(), dtorFtype ); 1143 1144 ObjectDecl * destructor = ObjectDecl::newObject( memberDtorNamer.newName(), new StructInstType( Type::Qualifiers(), dtorStruct ), new ListInit( { new SingleInit( thisExpr ), new SingleInit( new CastExpr( dtorExpr, dtorType ) ) } ) ); 1145 function->statements->push_front( new DeclStmt( destructor ) ); 1146 destructor->attributes.push_back( new Attribute( "cleanup", { new VariableExpr( dtorStructDestroy ) } ) ); 1147 1148 function->statements->kids.splice( function->statements->kids.begin(), stmtsToAdd ); 1122 1149 } 1123 1150 } catch ( SemanticErrorException & error ) { -
src/InitTweak/InitTweak.cc
r42655e8 ra715b5c 339 339 std::list< Expression * > matches; 340 340 collectCtorDtorCalls( stmt, matches ); 341 assert ( matches.size() <= 1);341 assertf( matches.size() <= 1, "%zd constructor/destructors found in %s", matches.size(), toString( stmt ).c_str() ); 342 342 return matches.size() == 1 ? matches.front() : nullptr; 343 343 } -
src/Makefile.am
r42655e8 ra715b5c 94 94 CodeGen/CodeGenerator.cc \ 95 95 CodeGen/FixMain.cc \ 96 CodeGen/Generate.cc \ 96 97 CodeGen/GenType.cc \ 97 98 CodeGen/OperatorTable.cc \ -
src/Makefile.in
r42655e8 ra715b5c 182 182 SynTree/DeclReplacer.$(OBJEXT) CompilationState.$(OBJEXT) \ 183 183 CodeGen/CodeGenerator.$(OBJEXT) CodeGen/FixMain.$(OBJEXT) \ 184 CodeGen/Gen Type.$(OBJEXT) CodeGen/OperatorTable.$(OBJEXT) \185 Co mmon/Assert.$(OBJEXT) Common/Eval.$(OBJEXT) \186 Common/ SemanticError.$(OBJEXT) Common/UniqueName.$(OBJEXT) \187 Co ncurrency/Keywords.$(OBJEXT) \184 CodeGen/Generate.$(OBJEXT) CodeGen/GenType.$(OBJEXT) \ 185 CodeGen/OperatorTable.$(OBJEXT) Common/Assert.$(OBJEXT) \ 186 Common/Eval.$(OBJEXT) Common/SemanticError.$(OBJEXT) \ 187 Common/UniqueName.$(OBJEXT) Concurrency/Keywords.$(OBJEXT) \ 188 188 ControlStruct/ForExprMutator.$(OBJEXT) \ 189 189 ControlStruct/LabelFixer.$(OBJEXT) \ … … 621 621 CodeGen/CodeGenerator.cc \ 622 622 CodeGen/FixMain.cc \ 623 CodeGen/Generate.cc \ 623 624 CodeGen/GenType.cc \ 624 625 CodeGen/OperatorTable.cc \ … … 797 798 CodeGen/$(DEPDIR)/$(am__dirstamp) 798 799 CodeGen/FixMain.$(OBJEXT): CodeGen/$(am__dirstamp) \ 800 CodeGen/$(DEPDIR)/$(am__dirstamp) 801 CodeGen/Generate.$(OBJEXT): CodeGen/$(am__dirstamp) \ 799 802 CodeGen/$(DEPDIR)/$(am__dirstamp) 800 803 CodeGen/GenType.$(OBJEXT): CodeGen/$(am__dirstamp) \ … … 987 990 clean-cfa_cpplibPROGRAMS: 988 991 -test -z "$(cfa_cpplib_PROGRAMS)" || rm -f $(cfa_cpplib_PROGRAMS) 989 CodeGen/Generate.$(OBJEXT): CodeGen/$(am__dirstamp) \990 CodeGen/$(DEPDIR)/$(am__dirstamp)991 992 CodeGen/FixNames.$(OBJEXT): CodeGen/$(am__dirstamp) \ 992 993 CodeGen/$(DEPDIR)/$(am__dirstamp) -
src/SymTab/Autogen.cc
r42655e8 ra715b5c 45 45 /// Data used to generate functions generically. Specifically, the name of the generated function and a function which generates the routine protoype 46 46 struct FuncData { 47 typedef FunctionType * (*TypeGen)( Type * );47 typedef FunctionType * (*TypeGen)( Type *, bool ); 48 48 FuncData( const std::string & fname, const TypeGen & genType ) : fname( fname ), genType( genType ) {} 49 49 std::string fname; … … 231 231 232 232 /// given type T, generate type of default ctor/dtor, i.e. function type void (*) (T *) 233 FunctionType * genDefaultType( Type * paramType ) { 234 const auto & typeParams = getGenericParams( paramType ); 233 FunctionType * genDefaultType( Type * paramType, bool maybePolymorphic ) { 235 234 FunctionType *ftype = new FunctionType( Type::Qualifiers(), false ); 236 cloneAll( typeParams, ftype->forall ); 235 if ( maybePolymorphic ) { 236 // only copy in 237 const auto & typeParams = getGenericParams( paramType ); 238 cloneAll( typeParams, ftype->forall ); 239 } 237 240 ObjectDecl *dstParam = new ObjectDecl( "_dst", Type::StorageClasses(), LinkageSpec::Cforall, nullptr, new ReferenceType( Type::Qualifiers(), paramType->clone() ), nullptr ); 238 241 ftype->parameters.push_back( dstParam ); … … 241 244 242 245 /// given type T, generate type of copy ctor, i.e. function type void (*) (T *, T) 243 FunctionType * genCopyType( Type * paramType ) {244 FunctionType *ftype = genDefaultType( paramType );246 FunctionType * genCopyType( Type * paramType, bool maybePolymorphic ) { 247 FunctionType *ftype = genDefaultType( paramType, maybePolymorphic ); 245 248 ObjectDecl *srcParam = new ObjectDecl( "_src", Type::StorageClasses(), LinkageSpec::Cforall, nullptr, paramType->clone(), nullptr ); 246 249 ftype->parameters.push_back( srcParam ); … … 249 252 250 253 /// given type T, generate type of assignment, i.e. function type T (*) (T *, T) 251 FunctionType * genAssignType( Type * paramType ) {252 FunctionType *ftype = genCopyType( paramType );254 FunctionType * genAssignType( Type * paramType, bool maybePolymorphic ) { 255 FunctionType *ftype = genCopyType( paramType, maybePolymorphic ); 253 256 ObjectDecl *returnVal = new ObjectDecl( "_ret", Type::StorageClasses(), LinkageSpec::Cforall, nullptr, paramType->clone(), nullptr ); 254 257 ftype->returnVals.push_back( returnVal ); … … 308 311 for ( const FuncData & d : data ) { 309 312 // generate a function (?{}, ?=?, ^?{}) based on the current FuncData. 310 FunctionType * ftype = d.genType( type );313 FunctionType * ftype = d.genType( type, true ); 311 314 312 315 // destructor for concurrent type must be mutex -
src/SymTab/Autogen.h
r42655e8 ra715b5c 45 45 extern FunctionDecl * dereferenceOperator; 46 46 47 // generate the type of an assignment function for paramType 48 FunctionType * genAssignType( Type * paramType ); 49 50 // generate the type of a default constructor or destructor for paramType 51 FunctionType * genDefaultType( Type * paramType ); 52 53 // generate the type of a copy constructor for paramType 54 FunctionType * genCopyType( Type * paramType ); 47 /// generate the type of an assignment function for paramType. 48 /// maybePolymorphic is true if the resulting FunctionType is allowed to be polymorphic 49 FunctionType * genAssignType( Type * paramType, bool maybePolymorphic = true ); 50 51 /// generate the type of a default constructor or destructor for paramType. 52 /// maybePolymorphic is true if the resulting FunctionType is allowed to be polymorphic 53 FunctionType * genDefaultType( Type * paramType, bool maybePolymorphic = true ); 54 55 /// generate the type of a copy constructor for paramType. 56 /// maybePolymorphic is true if the resulting FunctionType is allowed to be polymorphic 57 FunctionType * genCopyType( Type * paramType, bool maybePolymorphic = true ); 55 58 56 59 /// inserts into out a generated call expression to function fname with arguments dstParam and srcParam. Intended to be used with generated ?=?, ?{}, and ^?{} calls. -
src/SymTab/Validate.cc
r42655e8 ra715b5c 1333 1333 void FindSpecialDeclarations::previsit( FunctionDecl * funcDecl ) { 1334 1334 if ( ! dereferenceOperator ) { 1335 if ( funcDecl->get_name() == "*?" && funcDecl->get_linkage() == LinkageSpec::Intrinsic ) { 1336 FunctionType * ftype = funcDecl->get_functionType(); 1337 if ( ftype->get_parameters().size() == 1 && ftype->get_parameters().front()->get_type()->get_qualifiers() == Type::Qualifiers() ) { 1338 dereferenceOperator = funcDecl; 1335 // find and remember the intrinsic dereference operator for object pointers 1336 if ( funcDecl->name == "*?" && funcDecl->linkage == LinkageSpec::Intrinsic ) { 1337 FunctionType * ftype = funcDecl->type; 1338 if ( ftype->parameters.size() == 1 ) { 1339 PointerType * ptrType = strict_dynamic_cast<PointerType *>( ftype->parameters.front()->get_type() ); 1340 if ( ptrType->base->get_qualifiers() == Type::Qualifiers() ) { 1341 TypeInstType * inst = dynamic_cast<TypeInstType *>( ptrType->base ); 1342 if ( inst && ! inst->get_isFtype() ) { 1343 dereferenceOperator = funcDecl; 1344 } 1345 } 1339 1346 } 1340 1347 } -
src/SynTree/DeclReplacer.cc
r42655e8 ra715b5c 38 38 void previsit( TypeInstType * inst ); 39 39 }; 40 41 /// Mutator that replaces uses of declarations with arbitrary expressions, according to the supplied mapping 42 struct ExprDeclReplacer { 43 private: 44 const ExprMap & exprMap; 45 bool debug; 46 public: 47 ExprDeclReplacer( const ExprMap & exprMap, bool debug = false ); 48 49 // replace variable with new node from expr map 50 Expression * postmutate( VariableExpr * varExpr ); 51 }; 40 52 } 41 53 … … 53 65 DeclMap declMap; 54 66 replace( node, declMap, typeMap, debug ); 67 } 68 69 void replace( BaseSyntaxNode *& node, const ExprMap & exprMap, bool debug ) { 70 PassVisitor<ExprDeclReplacer> replacer( exprMap, debug ); 71 node = maybeMutate( node, replacer ); 55 72 } 56 73 … … 79 96 } 80 97 } 98 99 ExprDeclReplacer::ExprDeclReplacer( const ExprMap & exprMap, bool debug ) : exprMap( exprMap ), debug( debug ) {} 100 101 Expression * ExprDeclReplacer::postmutate( VariableExpr * varExpr ) { 102 if ( exprMap.count( varExpr->var ) ) { 103 Expression * replacement = exprMap.at( varExpr->var )->clone(); 104 if ( debug ) { 105 std::cerr << "replacing variable reference: " << (void*)varExpr->var << " " << varExpr->var << " with " << (void*)replacement << " " << replacement << std::endl; 106 } 107 std::swap( varExpr->env, replacement->env ); 108 delete varExpr; 109 return replacement; 110 } 111 return varExpr; 112 } 81 113 } 82 114 } // namespace VarExprReplacer -
src/SynTree/DeclReplacer.h
r42655e8 ra715b5c 26 26 typedef std::map< DeclarationWithType *, DeclarationWithType * > DeclMap; 27 27 typedef std::map< TypeDecl *, TypeDecl * > TypeMap; 28 typedef std::map< DeclarationWithType *, Expression * > ExprMap; 28 29 29 30 void replace( BaseSyntaxNode * node, const DeclMap & declMap, bool debug = false ); 30 31 void replace( BaseSyntaxNode * node, const TypeMap & typeMap, bool debug = false ); 31 32 void replace( BaseSyntaxNode * node, const DeclMap & declMap, const TypeMap & typeMap, bool debug = false ); 33 34 void replace( BaseSyntaxNode *& node, const ExprMap & exprMap, bool debug = false); 35 template<typename T> 36 void replace( T *& node, const ExprMap & exprMap, bool debug = false ) { 37 if ( ! node ) return; 38 BaseSyntaxNode * arg = node; 39 replace( arg, exprMap, debug ); 40 node = dynamic_cast<T *>( arg ); 41 assertf( node, "DeclReplacer fundamentally changed the type of its argument." ); 42 } 32 43 } 33 44 -
tests/raii/.expect/memberCtors-ERR1.txt
r42655e8 ra715b5c 1 raii/memberCtors.c: 71:1 error: in void ?{}(B &b), field a2 used before being constructed1 raii/memberCtors.c:92:1 error: in void ?{}(B &b), field a2 used before being constructed -
tests/raii/.expect/memberCtors.txt
r42655e8 ra715b5c 1 1 Before declaration of b1 2 constructing int 3 constructing int 4 constructing int 5 constructing int 6 constructing int 7 constructing int 8 begin construct B 2 constructing int id: 0 3 constructing int id: 1 4 constructing int id: 2 5 default construct A 0 6 constructing int id: 3 7 constructing int id: 4 8 constructing int id: 5 9 default construct A 1 10 begin construct B id: 0 9 11 assign b.a2 10 constructing int 11 constructing int 12 begin construct A 13 construct a.x 14 constructing int: 1001 15 assign a.y 16 assigning int: 0 0 17 end construct A 18 copy constructing int: 0 19 copy constructing int: 0 20 begin copy construct A 21 copy construct this.x 22 copy constructing int: 1001 23 assign this.y 24 copy constructing int: 0 25 destructing int: 0 26 destructing int: 0 27 end copy construct A 28 begin ?=? A 29 copy constructing int: 1001 30 destructing int: 1001 31 destructing int: 1001 32 copy constructing int: 0 33 destructing int: 0 34 destructing int: 0 35 copy constructing int: 0 36 destructing int: 0 37 destructing int: 0 12 constructing int id: 6 13 constructing int id: 7 14 begin construct A id: 2 15 construct a.x 16 constructing int: 1001 id: 8 17 assign a.y 18 assigning int: 0 0 id: 6 19 end construct A 20 copy constructing int: 0 id: 9 21 copy constructing int: 0 id: 10 22 begin copy construct A id: 3 23 copy construct this.x 24 copy constructing int: 1001 id: 11 25 assign this.y 26 copy constructing int: 0 id: 12 27 destructing int: 0 id: 12 28 destructing int: 0 id: 12 29 end copy construct A 30 begin ?=? A id: 0 31 copy constructing int: 1001 id: 13 32 destructing int: 1001 id: 13 33 destructing int: 1001 id: 13 34 copy constructing int: 0 id: 14 35 destructing int: 0 id: 14 36 destructing int: 0 id: 14 37 copy constructing int: 0 id: 15 38 destructing int: 0 id: 15 39 destructing int: 0 id: 15 38 40 end ?=? A 39 copy constructing int: 0 40 copy constructing int: 0 41 begin copy construct A 42 copy construct this.x 43 copy constructing int: 1001 44 assign this.y 45 copy constructing int: 0 46 destructing int: 0 47 destructing int: 0 48 end copy construct A 49 destructing int: 0 50 destructing int: 0 51 destructing int: 1001 52 destructing int: 0 53 destructing int: 0 54 destructing int: 1001 41 copy constructing int: 0 id: 16 42 copy constructing int: 0 id: 17 43 begin copy construct A id: 4 44 copy construct this.x 45 copy constructing int: 1001 id: 18 46 assign this.y 47 copy constructing int: 0 id: 19 48 destructing int: 0 id: 19 49 destructing int: 0 id: 19 50 end copy construct A 51 destructing int: 0 id: 17 52 destructing int: 0 id: 19 53 destructing int: 1001 id: 18 54 destructing int: 0 id: 10 55 destructing int: 0 id: 12 56 destructing int: 1001 id: 11 55 57 construct b.a1 56 constructing int 57 constructing int 58 begin construct A 59 construct a.x 60 constructing int: 1000 61 assign a.y 62 assigning int: 0 0 58 constructing int id: 20 59 constructing int id: 21 60 begin construct A id: 5 61 construct a.x 62 constructing int: 1000 id: 22 63 assign a.y 64 assigning int: 0 0 id: 20 63 65 end construct A 64 66 end construct B 65 destructing int: 0 66 destructing int: 0 67 destructing int: 1001 67 destructing int: 0 id: 7 68 destructing int: 0 id: 6 69 destructing int: 1001 id: 8 68 70 Before declaration of b2 69 copy constructing int: 0 70 copy constructing int: 0 71 begin copy construct A 72 copy construct this.x 73 copy constructing int: 1000 74 assign this.y 75 copy constructing int: 0 76 destructing int: 0 77 destructing int: 0 78 end copy construct A 79 copy constructing int: 0 80 copy constructing int: 0 81 begin copy construct A 82 copy construct this.x 83 copy constructing int: 1001 84 assign this.y 85 copy constructing int: 0 86 destructing int: 0 87 destructing int: 0 88 end copy construct A 89 copy constructing int: 0 90 copy constructing int: 0 91 begin copy construct A 92 copy construct this.x 93 copy constructing int: 0 94 assign this.y 95 copy constructing int: 0 96 destructing int: 0 97 destructing int: 0 71 copy constructing int: 0 id: 23 72 copy constructing int: 0 id: 24 73 begin copy construct A id: 6 74 copy construct this.x 75 copy constructing int: 1000 id: 25 76 assign this.y 77 copy constructing int: 0 id: 26 78 destructing int: 0 id: 26 79 destructing int: 0 id: 26 80 end copy construct A 81 copy constructing int: 0 id: 27 82 copy constructing int: 0 id: 28 83 begin copy construct A id: 7 84 copy construct this.x 85 copy constructing int: 1001 id: 29 86 assign this.y 87 copy constructing int: 0 id: 30 88 destructing int: 0 id: 30 89 destructing int: 0 id: 30 90 end copy construct A 91 copy constructing int: 0 id: 31 92 copy constructing int: 0 id: 32 93 begin copy construct A id: 8 94 copy construct this.x 95 copy constructing int: 0 id: 33 96 assign this.y 97 copy constructing int: 0 id: 34 98 destructing int: 0 id: 34 99 destructing int: 0 id: 34 98 100 end copy construct A 99 101 End of main 100 constructing int 101 constructing int 102 begin construct A 103 construct a.x 104 constructing int: 999 105 assign a.y 106 assigning int: 0 0 107 end construct A 108 copy constructing int: 0 109 copy constructing int: 0 110 begin copy construct A 111 copy construct this.x 112 copy constructing int: 999 113 assign this.y 114 copy constructing int: 0 115 destructing int: 0 116 destructing int: 0 117 end copy construct A 118 begin ?=? A 119 copy constructing int: 999 120 destructing int: 999 121 destructing int: 999 122 copy constructing int: 0 123 destructing int: 0 124 destructing int: 0 125 copy constructing int: 0 126 destructing int: 0 127 destructing int: 0 102 begin destruct B id: 1 103 constructing int id: 35 104 constructing int id: 36 105 begin construct A id: 9 106 construct a.x 107 constructing int: 999 id: 37 108 assign a.y 109 assigning int: 0 0 id: 35 110 end construct A 111 copy constructing int: 0 id: 38 112 copy constructing int: 0 id: 39 113 begin copy construct A id: 10 114 copy construct this.x 115 copy constructing int: 999 id: 40 116 assign this.y 117 copy constructing int: 0 id: 41 118 destructing int: 0 id: 41 119 destructing int: 0 id: 41 120 end copy construct A 121 begin ?=? A id: 7 122 copy constructing int: 999 id: 42 123 destructing int: 999 id: 42 124 destructing int: 999 id: 42 125 copy constructing int: 0 id: 43 126 destructing int: 0 id: 43 127 destructing int: 0 id: 43 128 copy constructing int: 0 id: 44 129 destructing int: 0 id: 44 130 destructing int: 0 id: 44 128 131 end ?=? A 129 copy constructing int: 0 130 copy constructing int: 0 131 begin copy construct A 132 copy construct this.x 133 copy constructing int: 999 134 assign this.y 135 copy constructing int: 0 136 destructing int: 0 137 destructing int: 0 138 end copy construct A 139 destructing int: 0 140 destructing int: 0 141 destructing int: 999 142 destructing int: 0 143 destructing int: 0 144 destructing int: 999 145 destructing int: 0 146 destructing int: 0 147 destructing int: 1000 148 destructing int: 0 149 destructing int: 0 150 destructing int: 999 151 destructing int: 0 152 destructing int: 0 153 destructing int: 0 154 destructing int: 0 155 destructing int: 0 156 destructing int: 999 157 constructing int 158 constructing int 159 begin construct A 160 construct a.x 161 constructing int: 999 162 assign a.y 163 assigning int: 0 0 164 end construct A 165 copy constructing int: 0 166 copy constructing int: 0 167 begin copy construct A 168 copy construct this.x 169 copy constructing int: 999 170 assign this.y 171 copy constructing int: 0 172 destructing int: 0 173 destructing int: 0 174 end copy construct A 175 begin ?=? A 176 copy constructing int: 999 177 destructing int: 999 178 destructing int: 999 179 copy constructing int: 0 180 destructing int: 0 181 destructing int: 0 182 copy constructing int: 0 183 destructing int: 0 184 destructing int: 0 132 copy constructing int: 0 id: 45 133 copy constructing int: 0 id: 46 134 begin copy construct A id: 11 135 copy construct this.x 136 copy constructing int: 999 id: 47 137 assign this.y 138 copy constructing int: 0 id: 48 139 destructing int: 0 id: 48 140 destructing int: 0 id: 48 141 end copy construct A 142 destructing int: 0 id: 46 143 destructing int: 0 id: 48 144 destructing int: 999 id: 47 145 destructing int: 0 id: 39 146 destructing int: 0 id: 41 147 destructing int: 999 id: 40 148 destructing int: 0 id: 24 149 destructing int: 0 id: 26 150 destructing int: 1000 id: 25 151 end destruct B 152 destructing int: 0 id: 36 153 destructing int: 0 id: 35 154 destructing int: 999 id: 37 155 destructing int: 0 id: 32 156 destructing int: 0 id: 34 157 destructing int: 0 id: 33 158 destructing int: 0 id: 44 159 destructing int: 0 id: 43 160 destructing int: 999 id: 42 161 begin destruct B id: 2 162 constructing int id: 49 163 constructing int id: 50 164 begin construct A id: 12 165 construct a.x 166 constructing int: 999 id: 51 167 assign a.y 168 assigning int: 0 0 id: 49 169 end construct A 170 copy constructing int: 0 id: 52 171 copy constructing int: 0 id: 53 172 begin copy construct A id: 13 173 copy construct this.x 174 copy constructing int: 999 id: 54 175 assign this.y 176 copy constructing int: 0 id: 55 177 destructing int: 0 id: 55 178 destructing int: 0 id: 55 179 end copy construct A 180 begin ?=? A id: 0 181 copy constructing int: 999 id: 56 182 destructing int: 999 id: 56 183 destructing int: 999 id: 56 184 copy constructing int: 0 id: 57 185 destructing int: 0 id: 57 186 destructing int: 0 id: 57 187 copy constructing int: 0 id: 58 188 destructing int: 0 id: 58 189 destructing int: 0 id: 58 185 190 end ?=? A 186 copy constructing int: 0 187 copy constructing int: 0 188 begin copy construct A 189 copy construct this.x 190 copy constructing int: 999 191 assign this.y 192 copy constructing int: 0 193 destructing int: 0 194 destructing int: 0 195 end copy construct A 196 destructing int: 0 197 destructing int: 0 198 destructing int: 999 199 destructing int: 0 200 destructing int: 0 201 destructing int: 999 202 destructing int: 0 203 destructing int: 0 204 destructing int: 1000 205 destructing int: 0 206 destructing int: 0 207 destructing int: 999 208 destructing int: 0 209 destructing int: 0 210 destructing int: 0 211 destructing int: 0 212 destructing int: 0 213 destructing int: 999 191 copy constructing int: 0 id: 59 192 copy constructing int: 0 id: 60 193 begin copy construct A id: 14 194 copy construct this.x 195 copy constructing int: 999 id: 61 196 assign this.y 197 copy constructing int: 0 id: 62 198 destructing int: 0 id: 62 199 destructing int: 0 id: 62 200 end copy construct A 201 destructing int: 0 id: 60 202 destructing int: 0 id: 62 203 destructing int: 999 id: 61 204 destructing int: 0 id: 53 205 destructing int: 0 id: 55 206 destructing int: 999 id: 54 207 destructing int: 0 id: 21 208 destructing int: 0 id: 20 209 destructing int: 1000 id: 22 210 end destruct B 211 destructing int: 0 id: 50 212 destructing int: 0 id: 49 213 destructing int: 999 id: 51 214 destructing int: 0 id: 5 215 destructing int: 0 id: 4 216 destructing int: 0 id: 3 217 destructing int: 0 id: 58 218 destructing int: 0 id: 57 219 destructing int: 999 id: 56 -
tests/raii/memberCtors.c
r42655e8 ra715b5c 1 1 struct WrappedInt { 2 2 int x; 3 int id; 3 4 }; 5 int intID = 0; 4 6 5 7 void ?{}(WrappedInt & this) { 6 printf("constructing int\n"); 8 this.id = intID++; 9 printf("constructing int id: %d\n", this.id); 7 10 this.x = 0; 8 11 } 9 12 10 13 void ?{}(WrappedInt & this, WrappedInt other) { 11 printf("copy constructing int: %d\n", other.x); 14 this.id = intID++; 15 printf("copy constructing int: %d id: %d\n", other.x, this.id); 12 16 this.x = other.x; 13 17 } 14 18 15 19 void ?{}(WrappedInt & this, int x) { 16 printf("constructing int: %d\n", x); 20 this.id = intID++; 21 printf("constructing int: %d id: %d\n", x, this.id); 17 22 this.x = x; 18 23 } 19 24 20 25 void ^?{}(WrappedInt & this) { 21 printf("destructing int: %d \n", this.x);26 printf("destructing int: %d id: %d\n", this.x, this.id); 22 27 } 23 28 24 void ?=?(WrappedInt & this, int x) {25 printf("assigning int: %d %d \n", this.x, x);29 /* WrappedInt */ void ?=?(WrappedInt & this, int x) { 30 printf("assigning int: %d %d id: %d\n", this.x, x, this.id); 26 31 this.x = x; 32 // return this; 27 33 } 34 35 // WrappedInt ?=?(WrappedInt & this, WrappedInt other) { 36 // printf("assigning int: %d %d\n", this.x, other.x); 37 // this.x = other.x; 38 // return this; 39 // } 28 40 29 41 struct A { 30 42 WrappedInt x, y, z; 43 int id; 31 44 }; 45 int AID = 0; 32 46 33 47 void ?{}(A & a) { 34 48 // currently must define default ctor, since there's no "= default" syntax 49 a.id = AID++; 50 printf("default construct A %d\n", a.id); 35 51 } 36 52 37 53 void ?{}(A & a, int x) { 38 printf("begin construct A\n"); 54 a.id = AID++; 55 printf("begin construct A id: %d\n", a.id); 39 56 printf("construct a.x\n"); 40 57 (a.x){ x+999 }; … … 45 62 46 63 void ?{}(A & this, A other) { 47 printf("begin copy construct A\n"); 64 this.id = AID++; 65 printf("begin copy construct A id: %d\n", this.id); 48 66 printf("copy construct this.x\n"); 49 67 (this.x){ other.x }; … … 54 72 55 73 A ?=?(A & this, A other) { 56 printf("begin ?=? A \n");74 printf("begin ?=? A id: %d\n", this.id); 57 75 this.x = other.x; 58 76 this.y = other.y; … … 64 82 struct B { 65 83 A a1, a2, a3; 84 int id; 66 85 }; 86 int BID = 0; 67 87 68 88 void ?{}(B & b) { 69 printf("begin construct B\n"); 89 b.id = BID++; 90 printf("begin construct B id: %d\n", b.id); 70 91 printf("assign b.a2\n"); 71 92 b.a2 = (A) { 2 }; … … 79 100 80 101 void ^?{}(B & b) { 102 b.id = BID++; 103 printf("begin destruct B id: %d\n", b.id); 81 104 b.a2 = (A) { 0 }; 82 105 ^(b.a1){}; 106 printf("end destruct B\n"); 83 107 } // a2, a3 never destructed - will be automatically destructed 84 108 85 109 int main() { 86 110 printf("Before declaration of b1\n"); 87 B b1; 111 B b1; // b1 = { { 1000, 0, 0 }, { 1001, 0, 0 }, { 0, 0, 0 } } 88 112 printf("Before declaration of b2\n"); 89 113 B b2 = b1;
Note: See TracChangeset
for help on using the changeset viewer.