Changeset 88e79ad for src/InitTweak/FixInit.cc

Timestamp:

Oct 20, 2017, 2:00:55 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

0b9be4d

Parents:

72f85de

Message:

Add Destructor type and updated handling for member destructor calls

File:

• src/InitTweak/FixInit.cc (modified) (10 diffs)

src/InitTweak/FixInit.cc

@@ -177 +177 @@
                         DeclarationWithType * postmutate( ObjectDecl *objDecl );
 
-                        DeclarationWithType * getDtorFunc( ObjectDecl * objDecl, Statement * dtor );
-
                         std::list< Declaration * > staticDtorDecls;
                 };
@@ -202 +200 @@
                         static void generate( std::list< Declaration * > & translationUnit );
 
+                        void previsit( StructDecl * structDecl );
+
                         void previsit( FunctionDecl * funcDecl );
                         void postvisit( FunctionDecl * funcDecl );
@@ -219 +219 @@
                         bool isCtor = false; // true if current function is a constructor
                         StructDecl * structDecl = nullptr;
+
+                        // special built-in functions necessary for this to work
+                        StructDecl * dtorStruct = nullptr;
+                        FunctionDecl * dtorStructDestroy = nullptr;
                 };
 
@@ -635 +639 @@
                 }
 
-                DeclarationWithType * FixInit::getDtorFunc( ObjectDecl * objDecl, Statement * dtor ) {
+                DeclarationWithType * getDtorFunc( ObjectDecl * objDecl, Statement * dtor, std::list< Statement * > & stmtsToAdd ) {
                         if ( dynamic_cast< ExprStmt * >( dtor ) ) {
                                 if ( DeclarationWithType * func = getFunction( getCtorDtorCall( dtor ) ) ) {
@@ -653 +657 @@
                         // wraps the more complicated code.
                         static UniqueName dtorNamer( "__cleanup_dtor" );
-                        FunctionDecl * dtorFunc = FunctionDecl::newFunction( dtorNamer.newName(), SymTab::genDefaultType( objDecl->type, false ), new CompoundStmt( noLabels ) );
-                        stmtsToAddBefore.push_back( new DeclStmt( noLabels, dtorFunc ) );
+                        FunctionDecl * dtorFunc = FunctionDecl::newFunction( dtorNamer.newName(), SymTab::genDefaultType( objDecl->type->stripReferences(), false ), new CompoundStmt( noLabels ) );
+                        stmtsToAdd.push_back( new DeclStmt( noLabels, dtorFunc ) );
 
                         // the original code contains uses of objDecl - replace them with the newly generated 'this' parameter.
@@ -785 +789 @@
                                                         if ( ! isIntrinsicSingleArgCallStmt( dtorStmt ) ) {
                                                                 // set dtor location to the object's location for error messages
-                                                                DeclarationWithType * dtorFunc = getDtorFunc( objDecl, dtorStmt );
+                                                                DeclarationWithType * dtorFunc = getDtorFunc( objDecl, dtorStmt, stmtsToAddBefore );
                                                                 objDecl->attributes.push_back( new Attribute( "cleanup", { new VariableExpr( dtorFunc ) } ) );
                                                                 // objDecl->attributes.push_back( new Attribute( "cleanup", { new NameExpr( dtorFunc->name ) } ) );
@@ -910 +914 @@
                 }
 
+                void GenStructMemberCalls::previsit( StructDecl * structDecl ) {
+                        if ( ! dtorStruct && structDecl->name == "__Destructor" ) {
+                                dtorStruct = structDecl;
+                        }
+                }
+
                 void GenStructMemberCalls::previsit( FunctionDecl * funcDecl ) {
                         GuardValue( function );
@@ -922 +932 @@
                         unhandled.clear();
                         usedUninit.clear();
+
+                        if ( ! dtorStructDestroy && funcDecl->name == "__destroy_Destructor" ) {
+                                dtorStructDestroy = funcDecl;
+                                return;
+                        }
 
                         function = funcDecl;
@@ -933 +948 @@
                                 if ( structType ) {
                                         structDecl = structType->get_baseStruct();
+                                        if ( structDecl == dtorStruct ) return;
                                         for ( Declaration * member : structDecl->get_members() ) {
                                                 if ( ObjectDecl * field = dynamic_cast< ObjectDecl * >( member ) ) {
@@ -1004 +1020 @@
                                                         callStmt->acceptMutator( resolver );
                                                         if ( isCtor ) {
-                                                                function->get_statements()->push_front( callStmt );
+                                                                function->statements->push_front( callStmt );
                                                         } else {
                                                                 // destructor statements should be added at the end
-                                                                function->get_statements()->push_back( callStmt );
+                                                                // function->get_statements()->push_back( callStmt );
+
+                                                                // Destructor _dtor0 = { &b.a1, _destroy_A };
+                                                                std::list< Statement * > stmtsToAdd;
+
+                                                                static UniqueName memberDtorNamer = { "__memberDtor" };
+                                                                assertf( dtorStruct, "builtin __Destructor not found." );
+                                                                assertf( dtorStructDestroy, "builtin __destroy_Destructor not found." );
+
+                                                                Expression * thisExpr = new AddressExpr( new VariableExpr( thisParam ) );
+                                                                Expression * dtorExpr = new VariableExpr( getDtorFunc( thisParam, callStmt, stmtsToAdd ) );
+
+                                                                ObjectDecl * destructor = ObjectDecl::newObject( memberDtorNamer.newName(), new StructInstType( Type::Qualifiers(), dtorStruct ), new ListInit( { new SingleInit( thisExpr ), new SingleInit( dtorExpr ) } ) );
+                                                                function->statements->push_front( new DeclStmt( noLabels, destructor ) );
+                                                                destructor->attributes.push_back( new Attribute( "cleanup", { new VariableExpr( dtorStructDestroy ) } ) );
+
+                                                                function->statements->kids.splice( function->statements->kids.begin(), stmtsToAdd );
                                                         }
                                                 } catch ( SemanticError & error ) {