Changeset a5de33e for src/SymTab/Indexer.cc

Timestamp:

Jul 5, 2017, 5:00:46 PM (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:

55a68c3, 5805d15

Parents:

f7cb0bc (diff), 1ce2189 (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:/u/cforall/software/cfa/cfa-cc

File:

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

src/SymTab/Indexer.cc

@@ -652 +652 @@
                         for ( MangleTable::const_iterator decl = mangleTable.begin(); decl != mangleTable.end(); ++decl ) {
                                 // check for C decls with the same name, skipping those with a compatible type (by mangleName)
-                                if ( decl->second->get_linkage() == LinkageSpec::C && decl->first != mangleName ) return true;
+                                if ( ! LinkageSpec::isMangled( decl->second->get_linkage() ) && decl->first != mangleName ) return true;
                         }
                 }
@@ -669 +669 @@
                                 // check for C decls with the same name, skipping
                                 // those with an incompatible type (by mangleName)
-                                if ( decl->second->get_linkage() == LinkageSpec::C && decl->first == mangleName ) return true;
+                                if ( ! LinkageSpec::isMangled( decl->second->get_linkage() ) && decl->first == mangleName ) return true;
                         }
                 }
@@ -724 +724 @@
                         // new definition shadows the autogenerated one, even at the same scope
                         return false;
-                } else if ( added->get_linkage() != LinkageSpec::C || ResolvExpr::typesCompatible( added->get_type(), existing->get_type(), Indexer() ) ) {
+                } else if ( LinkageSpec::isMangled( added->get_linkage() ) || ResolvExpr::typesCompatible( added->get_type(), existing->get_type(), Indexer() ) ) {
                         // typesCompatible doesn't really do the right thing here. When checking compatibility of function types,
                         // we should ignore outermost pointer qualifiers, except _Atomic?
@@ -765 +765 @@
 
                 // this ensures that no two declarations with the same unmangled name at the same scope both have C linkage
-                if ( decl->get_linkage() == LinkageSpec::C ) {
+                if ( ! LinkageSpec::isMangled( decl->get_linkage() ) ) {
                         // NOTE this is broken in Richard's original code in such a way that it never triggers (it
                         // doesn't check decls that have the same manglename, and all C-linkage decls are defined to