Changeset bd91e2a

Timestamp:

Mar 3, 2016, 3:59:25 PM (8 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, string, with_gc

Children:

2e60a1a

Parents:

3627356

Message:

Properly clone types in layout function generation

File:

• src/GenPoly/Box.cc (modified) (4 diffs)

src/GenPoly/Box.cc

@@ -337 +337 @@
                         DeclarationWithType *dwt = dynamic_cast< DeclarationWithType * >( *member );
                         assert( dwt );
+                        Type *memberType = dwt->get_type();
 
                         if ( firstMember ) {
@@ -342 +343 @@
                         } else {
                                 // make sure all members after the first (automatically aligned at 0) are properly padded for alignment
-                                addStmt( layoutDecl->get_statements(), makeAlignTo( derefVar( sizeParam ), new AlignofExpr( dwt->get_type() ) ) );
+                                addStmt( layoutDecl->get_statements(), makeAlignTo( derefVar( sizeParam ), new AlignofExpr( memberType->clone() ) ) );
                         }
                         
@@ -351 +352 @@
 
                         // add member size to current size
-                        addExpr( layoutDecl->get_statements(), makeOp( "?+=?", derefVar( sizeParam ), new SizeofExpr( dwt->get_type() ) ) );
+                        addExpr( layoutDecl->get_statements(), makeOp( "?+=?", derefVar( sizeParam ), new SizeofExpr( memberType->clone() ) ) );
                         
                         // take max of member alignment and global alignment
-                        addStmt( layoutDecl->get_statements(), makeAssignMax( derefVar( alignParam ), new AlignofExpr( dwt->get_type() ) ) );
+                        addStmt( layoutDecl->get_statements(), makeAssignMax( derefVar( alignParam ), new AlignofExpr( memberType->clone() ) ) );
                 }
                 // make sure the type is end-padded to a multiple of its alignment
@@ -391 +392 @@
                         DeclarationWithType *dwt = dynamic_cast< DeclarationWithType * >( *member );
                         assert( dwt );
+                        Type *memberType = dwt->get_type();
                         
                         // take max member size and global size
-                        addStmt( layoutDecl->get_statements(), makeAssignMax( derefVar( sizeParam ), new SizeofExpr( dwt->get_type() ) ) );
+                        addStmt( layoutDecl->get_statements(), makeAssignMax( derefVar( sizeParam ), new SizeofExpr( memberType->clone() ) ) );
                         
                         // take max of member alignment and global alignment
-                        addStmt( layoutDecl->get_statements(), makeAssignMax( derefVar( alignParam ), new AlignofExpr( dwt->get_type() ) ) );
+                        addStmt( layoutDecl->get_statements(), makeAssignMax( derefVar( alignParam ), new AlignofExpr( memberType->clone() ) ) );
                 }
                 // make sure the type is end-padded to a multiple of its alignment