Changeset 10dc6908

Timestamp:

Nov 13, 2017, 10:38:12 AM (6 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:

9d06142

Parents:

20eacb7

git-author:

Rob Schluntz <rschlunt@…> (11/13/17 10:38:05)

git-committer:

Rob Schluntz <rschlunt@…> (11/13/17 10:38:12)

Message:

Add cast to _Destructor's dtor initializer to silence warnings

File:

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

src/InitTweak/FixInit.cc

@@ -1055 +1055 @@
                                                                 // function->get_statements()->push_back( callStmt );
 
-                                                                // Destructor _dtor0 = { &b.a1, _destroy_A };
+                                                                // Destructor _dtor0 = { &b.a1, (void (*)(void *)_destroy_A };
                                                                 std::list< Statement * > stmtsToAdd;
 
@@ -1065 +1065 @@
                                                                 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 ) } ) );
+                                                                // cast destructor pointer to void (*)(void *), to silence GCC incompatible pointer warnings
+                                                                FunctionType * dtorFtype = new FunctionType( Type::Qualifiers(), false );
+                                                                dtorFtype->parameters.push_back( ObjectDecl::newObject( "", new PointerType( Type::Qualifiers(), new VoidType( Type::Qualifiers() ) ), nullptr ) );
+                                                                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 ) ) } ) );
                                                                 function->statements->push_front( new DeclStmt( noLabels, destructor ) );
                                                                 destructor->attributes.push_back( new Attribute( "cleanup", { new VariableExpr( dtorStructDestroy ) } ) );