Changeset b54ad9c for src

Timestamp:

Aug 28, 2018, 6:28:08 PM (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:

a42a654

Parents:

d5916ce

Message:

Fix initializer of generated Destructor to use a cast to void *

File:

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

src/InitTweak/FixInit.cc

@@ -1123 +1123 @@
                                                         if ( isCtor ) {
                                                                 function->statements->push_front( callStmt );
-                                                        } else {
+                                                        } else { // TODO: don't generate destructor function/object for intrinsic calls
                                                                 // destructor statements should be added at the end
                                                                 // function->get_statements()->push_back( callStmt );
 
-                                                                // Destructor _dtor0 = { &b.a1, (void (*)(void *)_destroy_A };
+                                                                // __Destructor _dtor0 = { (void *)&b.a1, (void (*)(void *)_destroy_A };
                                                                 std::list< Statement * > stmtsToAdd;
 
@@ -1134 +1134 @@
                                                                 assertf( dtorStructDestroy, "builtin __destroy_Destructor not found." );
 
-                                                                Expression * thisExpr = new AddressExpr( new VariableExpr( thisParam ) );
+                                                                Expression * thisExpr = new CastExpr( new AddressExpr( new VariableExpr( thisParam ) ), new PointerType( Type::Qualifiers(), new VoidType( Type::Qualifiers() ) ) );
                                                                 Expression * dtorExpr = new VariableExpr( getDtorFunc( thisParam, callStmt, stmtsToAdd ) );