Changeset cd14861

Timestamp:

Sep 8, 2016, 11:31:50 AM (8 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:

f5e81d1

Parents:

3b58d91 (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' into tuples

File:

• src/SymTab/Indexer.cc (modified) (1 diff)

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 );