Changeset 119745e for src

Timestamp:

Sep 8, 2016, 4:01:42 PM (9 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:

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:

• ResolvExpr/AlternativeFinder.cc (modified) (1 diff)
• SymTab/Indexer.cc (modified) (1 diff)

src/ResolvExpr/AlternativeFinder.cc ¶

@@ -336 +336 @@
                                 std::cerr << std::endl << " to ";
                                 assert->second.formalType->print( std::cerr, 8 );
-                                )
-                                Cost newCost = conversionCost( assert->second.actualType, assert->second.formalType, indexer, alt.env );
+                        )
+                        Cost newCost = conversionCost( assert->second.actualType, assert->second.formalType, indexer, alt.env );
                         PRINT(
                                 std::cerr << std::endl << "cost of conversion is " << newCost << std::endl;
-                                )
-                                if ( newCost == Cost::infinity ) {
-                                        return newCost;
-                                }
+                        )
+                        if ( newCost == Cost::infinity ) {
+                                return newCost;
+                        }
                         convCost += newCost;
 

src/SymTab/Indexer.cc ¶

@@ -145 +145 @@
                                 std::list< DeclarationWithType * > params = function->get_functionType()->get_parameters();
                                 assert( ! params.empty() );
-                                funcMap[ Mangler::mangle( params.front()->get_type() ) ] += function;
+                                // use base type of pointer, so that qualifiers on the pointer type aren't considered.
+                                Type * base = safe_dynamic_cast< PointerType * >( params.front()->get_type() )->get_base();
+                                funcMap[ Mangler::mangle( base ) ] += function;
                         } else {
                                 out.push_back( decl );