Changes in src/ResolvExpr/AlternativeFinder.cc [ca946a4:4b0f997]

File:

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

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
+                for ( const Alternative & alt : alternatives ) {
+                        addAnonConversions( alt );
+                }
 
                 candidates.clear();
@@ -771 +775 @@
 
                 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 );
-                }
 
                 if ( alternatives.empty() && targetType && ! targetType->isVoid() ) {