Changeset 5de1e2c for src

Timestamp:

May 31, 2018, 3:51:00 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

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

Children:

518e97d

Parents:

4e7cc5ce

git-author:

Rob Schluntz <rschlunt@…> (05/31/18 15:48:09)

git-committer:

Rob Schluntz <rschlunt@…> (05/31/18 15:51:00)

Message:

Fix memory error from caused by vector::push_back [fixes #90]

File:

• src/ResolvExpr/AlternativeFinder.cc (modified) (3 diffs)

src/ResolvExpr/AlternativeFinder.cc

@@ -324 +324 @@
                 aggInst->lookup( name, members );
 
-                for ( std::list< Declaration* >::const_iterator i = members.begin(); i != members.end(); ++i ) {
-                        if ( DeclarationWithType *dwt = dynamic_cast< DeclarationWithType* >( *i ) ) {
-                                alternatives.push_back( Alternative( new MemberExpr( dwt, expr->clone() ), env, newCost ) );
-                                renameTypes( alternatives.back().expr );
-                                addAnonConversions( alternatives.back() ); // add anonymous member interpretations whenever an aggregate value type is seen as a member expression.
+                for ( Declaration * decl : members ) {
+                        if ( DeclarationWithType *dwt = dynamic_cast< DeclarationWithType* >( decl ) ) {
+                                // addAnonAlternatives uses vector::push_back, which invalidates references to existing elements, so
+                                // can't construct in place and use vector::back
+                                Alternative newAlt( new MemberExpr( dwt, expr->clone() ), env, newCost );
+                                renameTypes( newAlt.expr );
+                                addAnonConversions( newAlt ); // add anonymous member interpretations whenever an aggregate value type is seen as a member expression.
+                                alternatives.push_back( std::move(newAlt) );
                         } else {
                                 assert( false );
@@ -1379 +1382 @@
                         Cost cost = Cost::zero;
                         Expression * newExpr = data.combine( cost );
-                        alternatives.push_back( Alternative( newExpr, env, Cost::zero, cost ) );
+
+                        // addAnonAlternatives uses vector::push_back, which invalidates references to existing elements, so
+                        // can't construct in place and use vector::back
+                        Alternative newAlt( newExpr, env, Cost::zero, cost );
                         PRINT(
                                 std::cerr << "decl is ";
@@ -1388 +1394 @@
                                 std::cerr << std::endl;
                         )
-                        renameTypes( alternatives.back().expr );
-                        addAnonConversions( alternatives.back() ); // add anonymous member interpretations whenever an aggregate value type is seen as a name expression.
+                        renameTypes( newAlt.expr );
+                        addAnonConversions( newAlt ); // add anonymous member interpretations whenever an aggregate value type is seen as a name expression.
+                        alternatives.push_back( std::move(newAlt) );
                 } // for
         }