Changeset d75038c

Timestamp:

Apr 5, 2016, 4:54:48 PM (10 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:

ae7014e

Parents:

afc1045

Message:

Fix segfault bug introduced in layout function code

File:

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

src/GenPoly/Box.cc

@@ -754 +754 @@
                                                 // zero-length arrays are forbidden by C, so don't pass offset for empty struct
                                                 if ( ! argBaseStructType->get_baseStruct()->get_members().empty() ) {
-                                                        arg = appExpr->get_args().insert( arg, new OffsetPackExpr( argBaseStructType ) );
+                                                        arg = appExpr->get_args().insert( arg, new OffsetPackExpr( argBaseStructType->clone() ) );
                                                         arg++;
                                                 }
@@ -1641 +1641 @@
                                         layoutCall->get_args().push_back( new NameExpr( alignofName( *param ) ) );
                                 } else {
-                                        layoutCall->get_args().push_back( new SizeofExpr( *param ) );
-                                        layoutCall->get_args().push_back( new AlignofExpr( *param ) );
+                                        layoutCall->get_args().push_back( new SizeofExpr( (*param)->clone() ) );
+                                        layoutCall->get_args().push_back( new AlignofExpr( (*param)->clone() ) );
                                 }
                         }