Changeset 20eacb7

Timestamp:

Nov 9, 2017, 5:42:35 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:

10dc6908

Parents:

96fc67b

Message:

Replace variable in tuple destructor with dereference, fix assertion failure from multiple destructor calls (e.g., from a statement expression)

Location:

src/InitTweak

Files:

• FixInit.cc (modified) (4 diffs)
• InitTweak.cc (modified) (1 diff)

src/InitTweak/FixInit.cc

@@ -653 +653 @@
                 }
 
-                DeclarationWithType * getDtorFunc( ObjectDecl * objDecl, Statement * dtor, std::list< Statement * > & stmtsToAdd ) {
+                DeclarationWithType * getDtorFunc( ObjectDecl * objDecl, Statement * input, std::list< Statement * > & stmtsToAdd ) {
+                        // unwrap implicit statement wrapper
+                        assert( dtor );
+                        std::list< Expression * > matches;
+                        collectCtorDtorCalls( dtor, matches );
+
                         if ( dynamic_cast< ExprStmt * >( dtor ) ) {
-                                if ( DeclarationWithType * func = getFunction( getCtorDtorCall( dtor ) ) ) {
+                                // only one destructor call in the expression
+                                if ( matches.size() == 1 ) {
+                                        DeclarationWithType * func = getFunction( matches.front() );
+                                        assertf( func, "getFunction failed to find function in %s", toString( matches.front() ).c_str() );
+
                                         // cleanup argument must be a function, not an object (including function pointer)
                                         if ( FunctionDecl * dtorFunc = dynamic_cast< FunctionDecl * > ( func ) ) {
@@ -677 +686 @@
                         ObjectDecl * thisParam = getParamThis( dtorFunc->type );
                         Expression * replacement = new VariableExpr( thisParam );
-                        if ( ArrayType * at = dynamic_cast< ArrayType * >( replacement->result->stripReferences() ) ) {
+
+                        Type * base = replacement->result->stripReferences();
+                        if ( dynamic_cast< ArrayType * >( base ) || dynamic_cast< TupleType * > ( base ) ) {
                                 // need to cast away reference for array types, since the destructor is generated without the reference type
-                                replacement = new CastExpr( replacement, at->clone() );
+                                replacement = new CastExpr( replacement, base->clone() );
                         }
                         VarExprReplacer::replace( dtor, { std::make_pair( objDecl, replacement ) } );
@@ -804 +815 @@
                                                         ImplicitCtorDtorStmt * implicit = strict_dynamic_cast< ImplicitCtorDtorStmt * >( dtor );
                                                         Statement * dtorStmt = implicit->callStmt;
+
                                                         // don't need to call intrinsic dtor, because it does nothing, but
                                                         // non-intrinsic dtors must be called
@@ -810 +822 @@
                                                                 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 ) } ) );
                                                                 ctorInit->dtor = nullptr;
                                                         } // if

src/InitTweak/InitTweak.cc

@@ -343 +343 @@
                 std::list< Expression * > matches;
                 collectCtorDtorCalls( stmt, matches );
-                assert( matches.size() <= 1 );
+                assertf( matches.size() <= 1, "%zd constructor/destructors found in %s", matches.size(), toString( stmt ).c_str() );
                 return matches.size() == 1 ? matches.front() : nullptr;
         }