Changes in / [598f50e:4ee1efb]
- Location:
- src
- Files:
-
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
src/InitTweak/FixInit.cc
r598f50e r4ee1efb 54 54 #include "SynTree/Type.h" // for Type, Type::StorageClasses 55 55 #include "SynTree/TypeSubstitution.h" // for TypeSubstitution, operator<< 56 #include "SynTree/VarExprReplacer.h" // for VarExprReplacer 56 57 #include "SynTree/Visitor.h" // for acceptAll, maybeAccept 57 58 … … 158 159 using Parent::previsit; 159 160 160 void previsit( ObjectDecl * objDecl );161 161 void previsit( FunctionDecl * funcDecl ); 162 162 163 void previsit( CompoundStmt * compoundStmt );164 void postvisit( CompoundStmt * compoundStmt );165 void previsit( ReturnStmt * returnStmt );166 163 void previsit( BranchStmt * stmt ); 167 164 private: … … 203 200 static void generate( std::list< Declaration * > & translationUnit ); 204 201 202 void previsit( StructDecl * structDecl ); 203 205 204 void previsit( FunctionDecl * funcDecl ); 206 205 void postvisit( FunctionDecl * funcDecl ); … … 220 219 bool isCtor = false; // true if current function is a constructor 221 220 StructDecl * structDecl = nullptr; 221 222 // special built-in functions necessary for this to work 223 StructDecl * dtorStruct = nullptr; 224 FunctionDecl * dtorStructDestroy = nullptr; 222 225 }; 223 226 … … 636 639 } 637 640 641 DeclarationWithType * getDtorFunc( ObjectDecl * objDecl, Statement * dtor, std::list< Statement * > & stmtsToAdd ) { 642 if ( dynamic_cast< ExprStmt * >( dtor ) ) { 643 if ( DeclarationWithType * func = getFunction( getCtorDtorCall( dtor ) ) ) { 644 // cleanup argument must be a function, not an object (including function pointer) 645 if ( FunctionDecl * dtorFunc = dynamic_cast< FunctionDecl * > ( func ) ) { 646 if ( dtorFunc->type->forall.empty() ) { 647 // simple case where the destructor is a monomorphic function call - can simply 648 // use that function as the cleanup function. 649 delete dtor; 650 return func; 651 } 652 } 653 } 654 } 655 656 // otherwise the cleanup is more complicated - need to build a single argument cleanup function that 657 // wraps the more complicated code. 658 static UniqueName dtorNamer( "__cleanup_dtor" ); 659 FunctionDecl * dtorFunc = FunctionDecl::newFunction( dtorNamer.newName(), SymTab::genDefaultType( objDecl->type->stripReferences(), false ), new CompoundStmt( noLabels ) ); 660 stmtsToAdd.push_back( new DeclStmt( noLabels, dtorFunc ) ); 661 662 // the original code contains uses of objDecl - replace them with the newly generated 'this' parameter. 663 ObjectDecl * thisParam = getParamThis( dtorFunc->type ); 664 VarExprReplacer::replace( dtor, { std::make_pair( objDecl, thisParam ) } ); 665 dtorFunc->statements->push_back( dtor ); 666 667 return dtorFunc; 668 } 669 638 670 DeclarationWithType * FixInit::postmutate( ObjectDecl *objDecl ) { 639 671 // since this removes the init field from objDecl, it must occur after children are mutated (i.e. postmutate) … … 748 780 ctorInit->ctor = nullptr; 749 781 } 782 783 Statement * dtor = ctorInit->dtor; 784 if ( dtor ) { 785 ImplicitCtorDtorStmt * implicit = strict_dynamic_cast< ImplicitCtorDtorStmt * >( dtor ); 786 Statement * dtorStmt = implicit->callStmt; 787 // don't need to call intrinsic dtor, because it does nothing, but 788 // non-intrinsic dtors must be called 789 if ( ! isIntrinsicSingleArgCallStmt( dtorStmt ) ) { 790 // set dtor location to the object's location for error messages 791 DeclarationWithType * dtorFunc = getDtorFunc( objDecl, dtorStmt, stmtsToAddBefore ); 792 objDecl->attributes.push_back( new Attribute( "cleanup", { new VariableExpr( dtorFunc ) } ) ); 793 // objDecl->attributes.push_back( new Attribute( "cleanup", { new NameExpr( dtorFunc->name ) } ) ); 794 ctorInit->dtor = nullptr; 795 } // if 796 } 750 797 } // if 751 798 } else if ( Initializer * init = ctorInit->init ) { … … 790 837 791 838 792 template<typename Iterator, typename OutputIterator>793 void insertDtors( Iterator begin, Iterator end, OutputIterator out ) {794 for ( Iterator it = begin ; it != end ; ++it ) {795 // extract destructor statement from the object decl and insert it into the output. Note that this is796 // only called on lists of non-static objects with implicit non-intrinsic dtors, so if the user manually797 // calls an intrinsic dtor then the call must (and will) still be generated since the argument may798 // contain side effects.799 ObjectDecl * objDecl = *it;800 ConstructorInit * ctorInit = dynamic_cast< ConstructorInit * >( objDecl->get_init() );801 assert( ctorInit && ctorInit->get_dtor() );802 *out++ = ctorInit->get_dtor()->clone();803 } // for804 }805 806 void InsertDtors::previsit( ObjectDecl * objDecl ) {807 // remember non-static destructed objects so that their destructors can be inserted later808 if ( ! objDecl->get_storageClasses().is_static ) {809 if ( ConstructorInit * ctorInit = dynamic_cast< ConstructorInit * >( objDecl->get_init() ) ) {810 // a decision should have been made by the resolver, so ctor and init are not both non-NULL811 assert( ! ctorInit->get_ctor() || ! ctorInit->get_init() );812 Statement * dtor = ctorInit->get_dtor();813 // don't need to call intrinsic dtor, because it does nothing, but814 // non-intrinsic dtors must be called815 if ( dtor && ! isIntrinsicSingleArgCallStmt( dtor ) ) {816 // set dtor location to the object's location for error messages817 ctorInit->dtor->location = objDecl->location;818 reverseDeclOrder.front().push_front( objDecl );819 } // if820 } // if821 } // if822 }823 824 839 void InsertDtors::previsit( FunctionDecl * funcDecl ) { 825 840 // each function needs to have its own set of labels … … 834 849 } 835 850 836 void InsertDtors::previsit( CompoundStmt * compoundStmt ) {837 // visit statements - this will also populate reverseDeclOrder list. don't want to dump all destructors838 // when block is left, just the destructors associated with variables defined in this block, so push a new839 // list to the top of the stack so that we can differentiate scopes840 reverseDeclOrder.push_front( OrderedDecls() );841 Parent::previsit( compoundStmt );842 }843 844 void InsertDtors::postvisit( CompoundStmt * compoundStmt ) {845 // add destructors for the current scope that we're exiting, unless the last statement is a return, which846 // causes unreachable code warnings847 std::list< Statement * > & statements = compoundStmt->get_kids();848 if ( ! statements.empty() && ! dynamic_cast< ReturnStmt * >( statements.back() ) ) {849 insertDtors( reverseDeclOrder.front().begin(), reverseDeclOrder.front().end(), back_inserter( statements ) );850 }851 reverseDeclOrder.pop_front();852 }853 854 void InsertDtors::previsit( ReturnStmt * ) {855 // return exits all scopes, so dump destructors for all scopes856 for ( OrderedDecls & od : reverseDeclOrder ) {857 insertDtors( od.begin(), od.end(), back_inserter( stmtsToAddBefore ) );858 } // for859 }860 861 851 // Handle break/continue/goto in the same manner as C++. Basic idea: any objects that are in scope at the 862 852 // BranchStmt but not at the labelled (target) statement must be destructed. If there are any objects in scope … … 886 876 if ( ! diff.empty() ) { 887 877 throw SemanticError( std::string("jump to label '") + stmt->get_target().get_name() + "' crosses initialization of " + (*diff.begin())->get_name() + " ", stmt ); 888 } // if889 // S_G-S_L results in set of objects that must be destructed890 diff.clear();891 std::set_difference( curVars.begin(), curVars.end(), lvars.begin(), lvars.end(), std::inserter( diff, diff.end() ) );892 DTOR_PRINT(893 std::cerr << "S_G-S_L = " << printSet( diff ) << std::endl;894 )895 if ( ! diff.empty() ) {896 // create an auxilliary set for fast lookup -- can't make diff a set, because diff ordering should be consistent for error messages.897 std::unordered_set<ObjectDecl *> needsDestructor( diff.begin(), diff.end() );898 899 // go through decl ordered list of objectdecl. for each element that occurs in diff, output destructor900 OrderedDecls ordered;901 for ( OrderedDecls & rdo : reverseDeclOrder ) {902 // add elements from reverseDeclOrder into ordered if they occur in diff - it is key that this happens in reverse declaration order.903 copy_if( rdo.begin(), rdo.end(), back_inserter( ordered ), [&]( ObjectDecl * objDecl ) { return needsDestructor.count( objDecl ); } );904 } // for905 insertDtors( ordered.begin(), ordered.end(), back_inserter( stmtsToAddBefore ) );906 878 } // if 907 879 } … … 942 914 } 943 915 916 void GenStructMemberCalls::previsit( StructDecl * structDecl ) { 917 if ( ! dtorStruct && structDecl->name == "__Destructor" ) { 918 dtorStruct = structDecl; 919 } 920 } 921 944 922 void GenStructMemberCalls::previsit( FunctionDecl * funcDecl ) { 945 923 GuardValue( function ); … … 954 932 unhandled.clear(); 955 933 usedUninit.clear(); 934 935 if ( ! dtorStructDestroy && funcDecl->name == "__destroy_Destructor" ) { 936 dtorStructDestroy = funcDecl; 937 return; 938 } 956 939 957 940 function = funcDecl; … … 965 948 if ( structType ) { 966 949 structDecl = structType->get_baseStruct(); 950 if ( structDecl == dtorStruct ) return; 967 951 for ( Declaration * member : structDecl->get_members() ) { 968 952 if ( ObjectDecl * field = dynamic_cast< ObjectDecl * >( member ) ) { … … 1036 1020 callStmt->acceptMutator( resolver ); 1037 1021 if ( isCtor ) { 1038 function-> get_statements()->push_front( callStmt );1022 function->statements->push_front( callStmt ); 1039 1023 } else { 1040 1024 // destructor statements should be added at the end 1041 function->get_statements()->push_back( callStmt ); 1025 // function->get_statements()->push_back( callStmt ); 1026 1027 // Destructor _dtor0 = { &b.a1, _destroy_A }; 1028 std::list< Statement * > stmtsToAdd; 1029 1030 static UniqueName memberDtorNamer = { "__memberDtor" }; 1031 assertf( dtorStruct, "builtin __Destructor not found." ); 1032 assertf( dtorStructDestroy, "builtin __destroy_Destructor not found." ); 1033 1034 Expression * thisExpr = new AddressExpr( new VariableExpr( thisParam ) ); 1035 Expression * dtorExpr = new VariableExpr( getDtorFunc( thisParam, callStmt, stmtsToAdd ) ); 1036 1037 ObjectDecl * destructor = ObjectDecl::newObject( memberDtorNamer.newName(), new StructInstType( Type::Qualifiers(), dtorStruct ), new ListInit( { new SingleInit( thisExpr ), new SingleInit( dtorExpr ) } ) ); 1038 function->statements->push_front( new DeclStmt( noLabels, destructor ) ); 1039 destructor->attributes.push_back( new Attribute( "cleanup", { new VariableExpr( dtorStructDestroy ) } ) ); 1040 1041 function->statements->kids.splice( function->statements->kids.begin(), stmtsToAdd ); 1042 1042 } 1043 1043 } catch ( SemanticError & error ) { -
src/SymTab/Autogen.cc
r598f50e r4ee1efb 46 46 /// Data used to generate functions generically. Specifically, the name of the generated function and a function which generates the routine protoype 47 47 struct FuncData { 48 typedef FunctionType * (*TypeGen)( Type * );48 typedef FunctionType * (*TypeGen)( Type *, bool ); 49 49 FuncData( const std::string & fname, const TypeGen & genType ) : fname( fname ), genType( genType ) {} 50 50 std::string fname; … … 236 236 237 237 /// given type T, generate type of default ctor/dtor, i.e. function type void (*) (T *) 238 FunctionType * genDefaultType( Type * paramType ) { 239 const auto & typeParams = getGenericParams( paramType ); 238 FunctionType * genDefaultType( Type * paramType, bool maybePolymorphic ) { 240 239 FunctionType *ftype = new FunctionType( Type::Qualifiers(), false ); 241 cloneAll( typeParams, ftype->forall ); 240 if ( maybePolymorphic ) { 241 // only copy in 242 const auto & typeParams = getGenericParams( paramType ); 243 cloneAll( typeParams, ftype->forall ); 244 } 242 245 ObjectDecl *dstParam = new ObjectDecl( "_dst", Type::StorageClasses(), LinkageSpec::Cforall, nullptr, new ReferenceType( Type::Qualifiers(), paramType->clone() ), nullptr ); 243 246 ftype->parameters.push_back( dstParam ); … … 246 249 247 250 /// given type T, generate type of copy ctor, i.e. function type void (*) (T *, T) 248 FunctionType * genCopyType( Type * paramType ) {249 FunctionType *ftype = genDefaultType( paramType );251 FunctionType * genCopyType( Type * paramType, bool maybePolymorphic ) { 252 FunctionType *ftype = genDefaultType( paramType, maybePolymorphic ); 250 253 ObjectDecl *srcParam = new ObjectDecl( "_src", Type::StorageClasses(), LinkageSpec::Cforall, nullptr, paramType->clone(), nullptr ); 251 254 ftype->parameters.push_back( srcParam ); … … 254 257 255 258 /// given type T, generate type of assignment, i.e. function type T (*) (T *, T) 256 FunctionType * genAssignType( Type * paramType ) {257 FunctionType *ftype = genCopyType( paramType );259 FunctionType * genAssignType( Type * paramType, bool maybePolymorphic ) { 260 FunctionType *ftype = genCopyType( paramType, maybePolymorphic ); 258 261 ObjectDecl *returnVal = new ObjectDecl( "_ret", Type::StorageClasses(), LinkageSpec::Cforall, nullptr, paramType->clone(), nullptr ); 259 262 ftype->returnVals.push_back( returnVal ); … … 313 316 for ( const FuncData & d : data ) { 314 317 // generate a function (?{}, ?=?, ^?{}) based on the current FuncData. 315 FunctionType * ftype = d.genType( type );318 FunctionType * ftype = d.genType( type, true ); 316 319 317 320 // destructor for concurrent type must be mutex -
src/SymTab/Autogen.h
r598f50e r4ee1efb 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/SynTree/Mutator.h
r598f50e r4ee1efb 119 119 120 120 virtual TypeSubstitution * mutate( TypeSubstitution * sub ); 121 121 122 private: 122 123 virtual Declaration * handleAggregateDecl(AggregateDecl * aggregateDecl ); -
src/prelude/builtins.c
r598f50e r4ee1efb 91 91 static inline unsigned int ?\=?( unsigned int & x, unsigned long int y ) { x = x \ y; return x; } 92 92 93 // type that wraps a pointer and a destructor-like function - used in generating implicit destructor calls for struct members in user-defined functions 94 forall(dtype T) 95 struct __Destructor { 96 T * object; 97 void (*dtor)(T *); 98 }; 99 100 // defined destructor in the case that non-generated code wants to use __Destructor 101 forall(dtype T) 102 static inline void ^?{}(__Destructor(T) & x) { 103 x.dtor(x.object); 104 } 105 106 // easy interface into __Destructor's destructor for easy codegen purposes 107 extern "C" { 108 forall(dtype T) 109 static inline void __destroy_Destructor(__Destructor(T) * dtor) { 110 ^(*dtor){}; 111 } 112 } 113 93 114 // Local Variables: // 94 115 // mode: c // -
src/tests/.expect/memberCtors-ERR1.txt
r598f50e r4ee1efb 1 memberCtors.c:7 1:1 error: in void ?{}(B &b), field a2 used before being constructed1 memberCtors.c:78:1 error: in void ?{}(B &b), field a2 used before being constructed -
src/tests/.expect/memberCtors.txt
r598f50e r4ee1efb 98 98 end copy construct A 99 99 End of main 100 begin destruct B 100 101 constructing int 101 102 constructing int … … 146 147 destructing int: 0 147 148 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 149 end destruct B 150 destructing int: 0 151 destructing int: 0 152 destructing int: 999 153 destructing int: 0 154 destructing int: 0 155 destructing int: 0 156 destructing int: 0 157 destructing int: 0 158 destructing int: 999 159 begin destruct B 157 160 constructing int 158 161 constructing int … … 203 206 destructing int: 0 204 207 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 208 end destruct B 209 destructing int: 0 210 destructing int: 0 211 destructing int: 999 212 destructing int: 0 213 destructing int: 0 214 destructing int: 0 215 destructing int: 0 216 destructing int: 0 217 destructing int: 999 -
src/tests/memberCtors.c
r598f50e r4ee1efb 22 22 } 23 23 24 void ?=?(WrappedInt & this, int x) {24 /* WrappedInt */ void ?=?(WrappedInt & this, int x) { 25 25 printf("assigning int: %d %d\n", this.x, x); 26 26 this.x = x; 27 // return this; 27 28 } 29 30 // WrappedInt ?=?(WrappedInt & this, WrappedInt other) { 31 // printf("assigning int: %d %d\n", this.x, other.x); 32 // this.x = other.x; 33 // return this; 34 // } 28 35 29 36 struct A { … … 79 86 80 87 void ^?{}(B & b) { 88 printf("begin destruct B\n"); 81 89 b.a2 = (A) { 0 }; 82 90 ^(b.a1){}; 91 printf("end destruct B\n"); 83 92 } // a2, a3 never destructed - will be automatically destructed 84 93 85 94 int main() { 86 95 printf("Before declaration of b1\n"); 87 B b1; 96 B b1; // b1 = { { 1000, 0, 0 }, { 1001, 0, 0 }, { 0, 0, 0 } } 88 97 printf("Before declaration of b2\n"); 89 98 B b2 = b1; -
src/tests/multiDimension.c
r598f50e r4ee1efb 32 32 } 33 33 34 X global[10][10] = {35 { 1, { 2 }, { 3 }, { 4 }, 5, 6, 7, 8, 9, 10, 11, 12 },36 { 1, 2, 3, 4 },37 { { 1234567 } }38 };34 // X global[10][10] = { 35 // { 1, { 2 }, { 3 }, { 4 }, 5, 6, 7, 8, 9, 10, 11, 12 }, 36 // { 1, 2, 3, 4 }, 37 // { { 1234567 } } 38 // }; 39 39 40 X global2[3][3][3] = {41 {42 { 1, 2, 3 },43 { 4, 5, 6 },44 { 7, 8, 9 },45 { 10, 11, 12 }46 },47 {48 { 0, 0, 0 }49 }50 };40 // X global2[3][3][3] = { 41 // { 42 // { 1, 2, 3 }, 43 // { 4, 5, 6 }, 44 // { 7, 8, 9 }, 45 // { 10, 11, 12 } 46 // }, 47 // { 48 // { 0, 0, 0 } 49 // } 50 // }; 51 51 52 int foo() {53 static X abc[3][3] = {54 { 11, 22, 33, 44 },55 { 55, 66 },56 { 77 },57 { 88, 99, 1010 }58 };59 }52 // int foo() { 53 // static X abc[3][3] = { 54 // { 11, 22, 33, 44 }, 55 // { 55, 66 }, 56 // { 77 }, 57 // { 88, 99, 1010 } 58 // }; 59 // } 60 60 61 61 // ensure constructed const arrays continue to compile 62 const int global[1] = { -2 };62 // const int global[1] = { -2 }; 63 63 64 64 int main() { 65 X abc[4][4] = { 66 { 999, 1111 }, 67 { 1, 2, 3, 4, 5 }, 68 {}, 69 { 0 }, 70 { 88 } 71 }; 65 X a; 66 X abc[2]; 67 // X abc[4]/*[4]*/ = { 68 // /*{*/ 999, 1111 /*}*/, 69 // // { 1, 2, 3, 4, 5 }, 70 // // {}, 71 // // { 0 }, 72 // // { 88 } 73 // }; 72 74 73 foo();74 foo();75 // foo(); 76 // foo(); 75 77 }
Note: See TracChangeset
for help on using the changeset viewer.