Changeset ca946a4

Timestamp:

May 3, 2017, 5:03:29 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, resolv-new, with_gc

Children:

bdd0755

Parents:

dba6db9

Message:

fix anonymous member conversions on function calls

File:

• src/ResolvExpr/AlternativeFinder.cc (modified) (1 diff)

src/ResolvExpr/AlternativeFinder.cc

@@ -766 +766 @@
                         } // if
                 } // for
-                // function may return struct or union value, in which case we need to add alternatives for implicit conversions to each of the anonymous members
+
+                candidates.clear();
+                candidates.splice( candidates.end(), alternatives );
+
+                findMinCost( candidates.begin(), candidates.end(), std::back_inserter( alternatives ) );
+
+                // 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 ) {
                         addAnonConversions( alt );
                 }
-
-                candidates.clear();
-                candidates.splice( candidates.end(), alternatives );
-
-                findMinCost( candidates.begin(), candidates.end(), std::back_inserter( alternatives ) );
 
                 if ( alternatives.empty() && targetType && ! targetType->isVoid() ) {