Changeset 2bfc6b2 for src/InitTweak/FixInit.cc

Timestamp:

Aug 30, 2018, 1:00:41 PM (5 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:

bcc0946

Parents:

a715b5c

Message:

Refactor FindSpecialDeclarations? and associated special declarations

File:

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

src/InitTweak/FixInit.cc

@@ -56 +56 @@
 #include "SynTree/DeclReplacer.h"      // for DeclReplacer
 #include "SynTree/Visitor.h"           // for acceptAll, maybeAccept
+#include "Validate/FindSpecialDecls.h" // for dtorStmt, dtorStructDestroy
 
 bool ctordtorp = false; // print all debug
@@ -204 +205 @@
                         static void generate( std::list< Declaration * > & translationUnit );
 
-                        void premutate( StructDecl * structDecl );
-
                         void premutate( FunctionDecl * funcDecl );
                         DeclarationWithType * postmutate( FunctionDecl * funcDecl );
@@ -227 +226 @@
                         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;
                 };
 
@@ -1019 +1014 @@
                 }
 
-                void GenStructMemberCalls::premutate( StructDecl * structDecl ) {
-                        if ( ! dtorStruct && structDecl->name == "__Destructor" ) {
-                                dtorStruct = structDecl;
-                        }
-                }
-
                 void GenStructMemberCalls::premutate( FunctionDecl * funcDecl ) {
                         GuardValue( function );
@@ -1037 +1026 @@
                         unhandled.clear();
                         usedUninit.clear();
-
-                        if ( ! dtorStructDestroy && funcDecl->name == "__destroy_Destructor" ) {
-                                dtorStructDestroy = funcDecl;
-                                return;
-                        }
 
                         function = funcDecl;
@@ -1053 +1037 @@
                                 if ( structType ) {
                                         structDecl = structType->get_baseStruct();
-                                        if ( structDecl == dtorStruct ) return;
                                         for ( Declaration * member : structDecl->get_members() ) {
                                                 if ( ObjectDecl * field = dynamic_cast< ObjectDecl * >( member ) ) {
@@ -1127 +1110 @@
                                                                 // function->get_statements()->push_back( callStmt );
 
+                                                                // Optimization: do not need to call intrinsic destructors on members
+                                                                if ( isIntrinsicSingleArgCallStmt( callStmt ) ) continue;;
+
                                                                 // __Destructor _dtor0 = { (void *)&b.a1, (void (*)(void *)_destroy_A };
                                                                 std::list< Statement * > stmtsToAdd;
 
                                                                 static UniqueName memberDtorNamer = { "__memberDtor" };
-                                                                assertf( dtorStruct, "builtin __Destructor not found." );
-                                                                assertf( dtorStructDestroy, "builtin __destroy_Destructor not found." );
+                                                                assertf( Validate::dtorStruct, "builtin __Destructor not found." );
+                                                                assertf( Validate::dtorStructDestroy, "builtin __destroy_Destructor not found." );
 
                                                                 Expression * thisExpr = new CastExpr( new AddressExpr( new VariableExpr( thisParam ) ), new PointerType( Type::Qualifiers(), new VoidType( Type::Qualifiers() ) ) );
@@ -1142 +1128 @@
                                                                 Type * dtorType = new PointerType( Type::Qualifiers(), dtorFtype );
 
-                                                                ObjectDecl * destructor = ObjectDecl::newObject( memberDtorNamer.newName(), new StructInstType( Type::Qualifiers(), dtorStruct ), new ListInit( { new SingleInit( thisExpr ), new SingleInit( new CastExpr( dtorExpr, dtorType ) ) } ) );
+                                                                ObjectDecl * destructor = ObjectDecl::newObject( memberDtorNamer.newName(), new StructInstType( Type::Qualifiers(), Validate::dtorStruct ), new ListInit( { new SingleInit( thisExpr ), new SingleInit( new CastExpr( dtorExpr, dtorType ) ) } ) );
                                                                 function->statements->push_front( new DeclStmt( destructor ) );
-                                                                destructor->attributes.push_back( new Attribute( "cleanup", { new VariableExpr( dtorStructDestroy ) } ) );
+                                                                destructor->attributes.push_back( new Attribute( "cleanup", { new VariableExpr( Validate::dtorStructDestroy ) } ) );
 
                                                                 function->statements->kids.splice( function->statements->kids.begin(), stmtsToAdd );