Changeset 41e16b1 for src/ResolvExpr

Timestamp:

May 31, 2018, 10:22:19 PM (8 years ago)

Author:

Alan Kennedy <afakenne@…>

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:

00ac42e, 2a08c25, 7de7b52

Parents:

597c34a3 (diff), 518e97d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

changes

Location:

src/ResolvExpr

Files:

• Alternative.cc (modified) (3 diffs)
• AlternativeFinder.cc (modified) (5 diffs)
• TypeEnvironment.cc (modified) (2 diffs)

src/ResolvExpr/Alternative.cc

@@ -27 +27 @@
 
 namespace ResolvExpr {
-        Alternative::Alternative() : cost( Cost::zero ), cvtCost( Cost::zero ), expr( 0 ) {}
+        Alternative::Alternative() : cost( Cost::zero ), cvtCost( Cost::zero ), expr( nullptr ) {}
 
         Alternative::Alternative( Expression *expr, const TypeEnvironment &env, const Cost& cost )
@@ -48 +48 @@
         }
 
-        Alternative::Alternative( Alternative && other ) : cost( other.cost ), cvtCost( other.cvtCost ), expr( other.expr ), env( other.env ) {
+        Alternative::Alternative( Alternative && other ) : cost( other.cost ), cvtCost( other.cvtCost ), expr( other.expr ), env( std::move( other.env ) ) {
                 other.expr = nullptr;
         }
@@ -58 +58 @@
                 cvtCost = other.cvtCost;
                 expr = other.expr;
-                env = other.env;
+                env = std::move( other.env );
                 other.expr = nullptr;
                 return *this;

src/ResolvExpr/AlternativeFinder.cc

@@ -299 +299 @@
                 // it's okay for the aggregate expression to have reference type -- cast it to the base type to treat the aggregate as the referenced value
                 std::unique_ptr<Expression> aggrExpr( alt.expr->clone() );
-                alt.env.apply( aggrExpr->get_result() );
-                Type * aggrType = aggrExpr->get_result();
+                alt.env.apply( aggrExpr->result );
+                Type * aggrType = aggrExpr->result;
                 if ( dynamic_cast< ReferenceType * >( aggrType ) ) {
                         aggrType = aggrType->stripReferences();
@@ -306 +306 @@
                 }
 
-                if ( StructInstType *structInst = dynamic_cast< StructInstType* >( aggrExpr->get_result() ) ) {
+                if ( StructInstType *structInst = dynamic_cast< StructInstType* >( aggrExpr->result ) ) {
                         NameExpr nameExpr( "" );
                         addAggMembers( structInst, aggrExpr.get(), alt.cost+Cost::safe, alt.env, &nameExpr );
-                } else if ( UnionInstType *unionInst = dynamic_cast< UnionInstType* >( aggrExpr->get_result() ) ) {
+                } else if ( UnionInstType *unionInst = dynamic_cast< UnionInstType* >( aggrExpr->result ) ) {
                         NameExpr nameExpr( "" );
                         addAggMembers( unionInst, aggrExpr.get(), alt.cost+Cost::safe, alt.env, &nameExpr );
@@ -320 +320 @@
                 NameExpr * nameExpr = dynamic_cast< NameExpr * >( member );
                 if ( ! nameExpr ) return;
-                const std::string & name = nameExpr->get_name();
+                const std::string & name = nameExpr->name;
                 std::list< Declaration* > members;
                 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
         }

src/ResolvExpr/TypeEnvironment.cc

@@ -50 +50 @@
         }
 
-        EqvClass::EqvClass() : type( 0 ), allowWidening( true ) {
+        EqvClass::EqvClass() : type( nullptr ), allowWidening( true ) {
         }
 
@@ -159 +159 @@
 
         void TypeEnvironment::print( std::ostream &os, Indenter indent ) const {
-                for ( std::list< EqvClass >::const_iterator i = env.begin(); i != env.end(); ++i ) {
-                        i->print( os, indent );
+                for ( const EqvClass & theClass : env ) {
+                        theClass.print( os, indent );
                 } // for
         }