Changeset a94b829 for src/ResolvExpr

Timestamp:

Nov 20, 2017, 2:20:10 PM (8 years ago)

Author:

Aaron Moss <a3moss@…>

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, resolv-new, with_gc

Children:

0872c42

Parents:

403b388 (diff), c0b23644 (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:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

src/ResolvExpr

Files:

• AlternativeFinder.cc (modified) (8 diffs)
• RenameVars.cc (modified) (3 diffs)
• RenameVars.h (modified) (1 diff)

src/ResolvExpr/AlternativeFinder.cc

@@ -779 +779 @@
                         return ! finalResults.empty();
                 }
-                
+
                 // iterate each current subresult
                 std::size_t genEnd = results.size();
@@ -913 +913 @@
 
         template<typename OutputIterator>
-        void AlternativeFinder::makeFunctionAlternatives( const Alternative &func, 
-                        FunctionType *funcType, const std::vector< AlternativeFinder > &args, 
+        void AlternativeFinder::makeFunctionAlternatives( const Alternative &func,
+                        FunctionType *funcType, const std::vector< AlternativeFinder > &args,
                         OutputIterator out ) {
                 OpenVarSet funcOpenVars;
@@ -920 +920 @@
                 TypeEnvironment funcEnv( func.env );
                 makeUnifiableVars( funcType, funcOpenVars, funcNeed );
-                // add all type variables as open variables now so that those not used in the parameter 
+                // add all type variables as open variables now so that those not used in the parameter
                 // list are still considered open.
                 funcEnv.add( funcType->get_forall() );
-                
+
                 if ( targetType && ! targetType->isVoid() && ! funcType->get_returnVals().empty() ) {
                         // attempt to narrow based on expected target type
                         Type * returnType = funcType->get_returnVals().front()->get_type();
-                        if ( ! unify( returnType, targetType, funcEnv, funcNeed, funcHave, funcOpenVars, 
+                        if ( ! unify( returnType, targetType, funcEnv, funcNeed, funcHave, funcOpenVars,
                                         indexer ) ) {
                                 // unification failed, don't pursue this function alternative
@@ -1035 +1035 @@
 
                 std::vector< AlternativeFinder > argAlternatives;
-                findSubExprs( untypedExpr->begin_args(), untypedExpr->end_args(), 
+                findSubExprs( untypedExpr->begin_args(), untypedExpr->end_args(),
                         back_inserter( argAlternatives ) );
 
@@ -1065 +1065 @@
                                                 Alternative newFunc( *func );
                                                 referenceToRvalueConversion( newFunc.expr );
-                                                makeFunctionAlternatives( newFunc, function, argAlternatives, 
+                                                makeFunctionAlternatives( newFunc, function, argAlternatives,
                                                         std::back_inserter( candidates ) );
                                         }
@@ -1074 +1074 @@
                                                         Alternative newFunc( *func );
                                                         referenceToRvalueConversion( newFunc.expr );
-                                                        makeFunctionAlternatives( newFunc, function, argAlternatives, 
+                                                        makeFunctionAlternatives( newFunc, function, argAlternatives,
                                                                 std::back_inserter( candidates ) );
                                                 } // if
                                         } // if
-                                }                       
+                                }
                         } catch ( SemanticError &e ) {
                                 errors.append( e );
@@ -1093 +1093 @@
                                 try {
                                         // check if type is a pointer to function
-                                        if ( PointerType* pointer = dynamic_cast<PointerType*>( 
+                                        if ( PointerType* pointer = dynamic_cast<PointerType*>(
                                                         funcOp->expr->get_result()->stripReferences() ) ) {
-                                                if ( FunctionType* function = 
+                                                if ( FunctionType* function =
                                                                 dynamic_cast<FunctionType*>( pointer->get_base() ) ) {
                                                         Alternative newFunc( *funcOp );
                                                         referenceToRvalueConversion( newFunc.expr );
-                                                        makeFunctionAlternatives( newFunc, function, argAlternatives, 
+                                                        makeFunctionAlternatives( newFunc, function, argAlternatives,
                                                                 std::back_inserter( candidates ) );
                                                 }
@@ -1138 +1138 @@
                 candidates.splice( candidates.end(), alternatives );
 
-                findMinCost( candidates.begin(), candidates.end(), std::back_inserter( alternatives ) );
+                // use a new list so that alternatives are not examined by addAnonConversions twice.
+                AltList winners;
+                findMinCost( candidates.begin(), candidates.end(), std::back_inserter( winners ) );
 
                 // function may return struct or union value, in which case we need to add alternatives for implicit
                 // conversions to each of the anonymous members, must happen after findMinCost since anon conversions
                 // are never the cheapest expression
-                for ( const Alternative & alt : alternatives ) {
+                for ( const Alternative & alt : winners ) {
                         addAnonConversions( alt );
                 }
+                alternatives.splice( alternatives.begin(), winners );
 
                 if ( alternatives.empty() && targetType && ! targetType->isVoid() ) {

src/ResolvExpr/RenameVars.cc

@@ -29 +29 @@
         RenameVars global_renamer;
 
-        RenameVars::RenameVars() : level( 0 ) {
+        RenameVars::RenameVars() : level( 0 ), resetCount( 0 ) {
                 mapStack.push_front( std::map< std::string, std::string >() );
         }
@@ -35 +35 @@
         void RenameVars::reset() {
                 level = 0;
+                resetCount++;
         }
 
@@ -130 +131 @@
                         for ( Type::ForallList::iterator i = type->get_forall().begin(); i != type->get_forall().end(); ++i ) {
                                 std::ostringstream output;
-                                output << "_" << level << "_" << (*i)->get_name();
+                                output << "_" << resetCount << "_" << level << "_" << (*i)->get_name();
                                 std::string newname( output.str() );
                                 mapStack.front()[ (*i)->get_name() ] = newname;

src/ResolvExpr/RenameVars.h

@@ -48 +48 @@
                 void typeBefore( Type *type );
                 void typeAfter( Type *type );
-                int level;
+                int level, resetCount;
                 std::list< std::map< std::string, std::string > > mapStack;
         };