Changeset 837ce06 for src/InitTweak/FixInit.cc

Timestamp:

Oct 19, 2017, 2:20:53 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:

72f85de

Parents:

6840e7c

Message:

Fix cleanup function generation to always generate monomorphic functions

File:

• src/InitTweak/FixInit.cc (modified) (1 diff)

src/InitTweak/FixInit.cc

@@ -653 +653 @@
                         // wraps the more complicated code.
                         static UniqueName dtorNamer( "__cleanup_dtor" );
-                        FunctionDecl * dtorFunc = FunctionDecl::newFunction( dtorNamer.newName(), SymTab::genDefaultType( objDecl->type ), new CompoundStmt( noLabels ) );
+                        FunctionDecl * dtorFunc = FunctionDecl::newFunction( dtorNamer.newName(), SymTab::genDefaultType( objDecl->type, false ), new CompoundStmt( noLabels ) );
                         stmtsToAddBefore.push_back( new DeclStmt( noLabels, dtorFunc ) );
 
                         // the original code contains uses of objDecl - replace them with the newly generated 'this' parameter.
-                        ObjectDecl * thisParam = getThisParam( dtorFunc->type );
+                        ObjectDecl * thisParam = getParamThis( dtorFunc->type );
                         VarExprReplacer::replace( dtor, { std::make_pair( objDecl, thisParam ) } );
                         dtorFunc->statements->push_back( dtor );