Changeset 6a57da5

Timestamp:

Mar 24, 2016, 11:21:44 AM (9 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, string, with_gc

Children:

3cfe27f

Parents:

0438091

Message:

Fix Cdecl overloading bug in indexer

File:

• src/SymTab/Indexer.cc (modified) (2 diffs)

src/SymTab/Indexer.cc

@@ -602 +602 @@
                 const std::string &name = decl->get_name();
                 std::string mangleName;
-                // TODO the first branch of this if is a bug-for-bug replication of Richard's code;
-                // it can allow C decls to hide CFA decls when they shouldn't, but the current prelude 
-                // depends on this bug to build ... <stdlib>'s random() should be fixed to *not* hide 
-                // <stdlib.h>'s random() before this first branch is taken out again
-                if ( decl->get_linkage() == LinkageSpec::C ) {
-                        mangleName = name;
-                } else if ( LinkageSpec::isOverridable( decl->get_linkage() ) ) {
+                if ( LinkageSpec::isOverridable( decl->get_linkage() ) ) {
                         // mangle the name without including the appropriate suffix, so overridable routines are placed into the
                         // same "bucket" as their user defined versions.
@@ -624 +618 @@
                           // doesn't check decls that have the same manglename, and all C-linkage decls are defined to 
                           // have their name as their manglename, hence the error can never trigger).
-                          // The elided code here is closer to correct, but name mangling would have to be completely 
+                          // The code here is closer to correct, but name mangling would have to be completely 
                           // isomorphic to C type-compatibility, which it may not be.