Changeset 96fc67b

Timestamp:

Nov 9, 2017, 1:02:01 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:

20eacb7

Parents:

7543dec

Message:

Replace variable in array destructor with dereference

File:

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

src/InitTweak/FixInit.cc

@@ -676 +676 @@
                         // the original code contains uses of objDecl - replace them with the newly generated 'this' parameter.
                         ObjectDecl * thisParam = getParamThis( dtorFunc->type );
-                        VarExprReplacer::replace( dtor, { std::make_pair( objDecl, new VariableExpr( thisParam ) ) } );
+                        Expression * replacement = new VariableExpr( thisParam );
+                        if ( ArrayType * at = dynamic_cast< ArrayType * >( replacement->result->stripReferences() ) ) {
+                                // need to cast away reference for array types, since the destructor is generated without the reference type
+                                replacement = new CastExpr( replacement, at->clone() );
+                        }
+                        VarExprReplacer::replace( dtor, { std::make_pair( objDecl, replacement ) } );
                         dtorFunc->statements->push_back( dtor );