Changeset b3f252a for src/ResolvExpr/AlternativeFinder.cc

Timestamp:

Sep 7, 2017, 10:36:35 AM (8 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

e0886db

Parents:

871cdb4 (diff), 416cc86 (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

File:

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

src/ResolvExpr/AlternativeFinder.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Sat May 16 23:52:08 2015
-// Last Modified By : Andrew Beach
-// Last Modified On : Wed Jul 26 11:33:00 2017
-// Update Count     : 31
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Mon Aug 28 13:47:24 2017
+// Update Count     : 32
 //
 
@@ -195 +195 @@
                                 AltList winners;
                                 findMinCost( alternatives.begin(), alternatives.end(), back_inserter( winners ) );
-                                stream << "Can't choose between " << winners.size() << " alternatives for expression ";
+                                stream << "Cannot choose between " << winners.size() << " alternatives for expression ";
                                 expr->print( stream );
                                 stream << "Alternatives are:";
@@ -698 +698 @@
 
         void AlternativeFinder::visit( UntypedExpr *untypedExpr ) {
-                {
-                        std::string fname = InitTweak::getFunctionName( untypedExpr );
-                        if ( fname == "&&" ) {
-                                VoidType v = Type::Qualifiers();                // resolve to type void *
-                                PointerType pt( Type::Qualifiers(), v.clone() );
-                                UntypedExpr *vexpr = untypedExpr->clone();
-                                vexpr->set_result( pt.clone() );
-                                alternatives.push_back( Alternative( vexpr, env, Cost::zero) );
-                                return;
-                        }
-                }
-
                 AlternativeFinder funcFinder( indexer, env );
                 funcFinder.findWithAdjustment( untypedExpr->get_function() );
@@ -749 +737 @@
                                 if ( PointerType *pointer = dynamic_cast< PointerType* >( func->expr->get_result()->stripReferences() ) ) {
                                         if ( FunctionType *function = dynamic_cast< FunctionType* >( pointer->get_base() ) ) {
-                                                referenceToRvalueConversion( func->expr );
+                                                Alternative newFunc( *func );
+                                                referenceToRvalueConversion( newFunc.expr );
                                                 for ( std::list< AltList >::iterator actualAlt = possibilities.begin(); actualAlt != possibilities.end(); ++actualAlt ) {
                                                         // XXX
                                                         //Designators::check_alternative( function, *actualAlt );
-                                                        makeFunctionAlternatives( *func, function, *actualAlt, std::back_inserter( candidates ) );
+                                                        makeFunctionAlternatives( newFunc, function, *actualAlt, std::back_inserter( candidates ) );
                                                 }
                                         }
                                 } else if ( TypeInstType *typeInst = dynamic_cast< TypeInstType* >( func->expr->get_result()->stripReferences() ) ) { // handle ftype (e.g. *? on function pointer)
-                                        referenceToRvalueConversion( func->expr );
                                         EqvClass eqvClass;
                                         if ( func->env.lookup( typeInst->get_name(), eqvClass ) && eqvClass.type ) {
                                                 if ( FunctionType *function = dynamic_cast< FunctionType* >( eqvClass.type ) ) {
+                                                        Alternative newFunc( *func );
+                                                        referenceToRvalueConversion( newFunc.expr );
                                                         for ( std::list< AltList >::iterator actualAlt = possibilities.begin(); actualAlt != possibilities.end(); ++actualAlt ) {
-                                                                makeFunctionAlternatives( *func, function, *actualAlt, std::back_inserter( candidates ) );
+                                                                makeFunctionAlternatives( newFunc, function, *actualAlt, std::back_inserter( candidates ) );
                                                         } // for
                                                 } // if
@@ -773 +763 @@
                                         if ( PointerType *pointer = dynamic_cast< PointerType* >( funcOp->expr->get_result()->stripReferences() ) ) {
                                                 if ( FunctionType *function = dynamic_cast< FunctionType* >( pointer->get_base() ) ) {
-                                                        referenceToRvalueConversion( funcOp->expr );
+                                                        Alternative newFunc( *funcOp );
+                                                        referenceToRvalueConversion( newFunc.expr );
                                                         for ( std::list< AltList >::iterator actualAlt = possibilities.begin(); actualAlt != possibilities.end(); ++actualAlt ) {
                                                                 AltList currentAlt;
                                                                 currentAlt.push_back( *func );
                                                                 currentAlt.insert( currentAlt.end(), actualAlt->begin(), actualAlt->end() );
-                                                                makeFunctionAlternatives( *funcOp, function, currentAlt, std::back_inserter( candidates ) );
+                                                                makeFunctionAlternatives( newFunc, function, currentAlt, std::back_inserter( candidates ) );
                                                         } // for
                                                 } // if
@@ -853 +844 @@
                         } // if
                 } // for
+        }
+
+        void AlternativeFinder::visit( LabelAddressExpr * expr ) {
+                alternatives.push_back( Alternative( expr->clone(), env, Cost::zero) );
         }