Changeset 119745e


Ignore:
Timestamp:
Sep 8, 2016, 4:01:42 PM (6 years ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
aaron-thesis, arm-eh, 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:
4563a95
Parents:
940bba3 (diff), 24670d2 (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
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • src/ResolvExpr/AlternativeFinder.cc

    r940bba3 r119745e  
    336336                                std::cerr << std::endl << " to ";
    337337                                assert->second.formalType->print( std::cerr, 8 );
    338                                 )
    339                                 Cost newCost = conversionCost( assert->second.actualType, assert->second.formalType, indexer, alt.env );
     338                        )
     339                        Cost newCost = conversionCost( assert->second.actualType, assert->second.formalType, indexer, alt.env );
    340340                        PRINT(
    341341                                std::cerr << std::endl << "cost of conversion is " << newCost << std::endl;
    342                                 )
    343                                 if ( newCost == Cost::infinity ) {
    344                                         return newCost;
    345                                 }
     342                        )
     343                        if ( newCost == Cost::infinity ) {
     344                                return newCost;
     345                        }
    346346                        convCost += newCost;
    347347
  • src/SymTab/Indexer.cc

    r940bba3 r119745e  
    145145                                std::list< DeclarationWithType * > params = function->get_functionType()->get_parameters();
    146146                                assert( ! params.empty() );
    147                                 funcMap[ Mangler::mangle( params.front()->get_type() ) ] += function;
     147                                // use base type of pointer, so that qualifiers on the pointer type aren't considered.
     148                                Type * base = safe_dynamic_cast< PointerType * >( params.front()->get_type() )->get_base();
     149                                funcMap[ Mangler::mangle( base ) ] += function;
    148150                        } else {
    149151                                out.push_back( decl );
Note: See TracChangeset for help on using the changeset viewer.