Changeset cac8a6e for src/SymTab/Mangler.cc

Timestamp:

May 22, 2018, 11:08:22 AM (6 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, with_gc

Children:

639991a

Parents:

4a333d35 (diff), 2f0a0678 (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

File:

• src/SymTab/Mangler.cc (modified) (9 diffs)

src/SymTab/Mangler.cc

@@ -35 +35 @@
                 namespace {
                         /// Mangles names to a unique C identifier
-                        struct Mangler : public WithShortCircuiting, public WithVisitorRef<Mangler> {
+                        struct Mangler : public WithShortCircuiting, public WithVisitorRef<Mangler>, public WithGuards {
                                 Mangler( bool mangleOverridable, bool typeMode, bool mangleGenericParams );
                                 Mangler( const Mangler & ) = delete;
@@ -55 +55 @@
                                 void postvisit( EnumInstType * aggregateUseType );
                                 void postvisit( TypeInstType * aggregateUseType );
+                                void postvisit( TraitInstType * inst );
                                 void postvisit( TupleType * tupleType );
                                 void postvisit( VarArgsType * varArgsType );
@@ -70 +71 @@
                                 bool typeMode;                  ///< Produce a unique mangled name for a type
                                 bool mangleGenericParams;       ///< Include generic parameters in name mangling if true
+                                bool inFunctionType = false;    ///< Include type qualifiers if false.
 
                                 void mangleDecl( DeclarationWithType *declaration );
@@ -177 +179 @@
                         void Mangler::postvisit( PointerType * pointerType ) {
                                 printQualifiers( pointerType );
-                                mangleName << "P";
+                                // mangle void (*f)() and void f() to the same name to prevent overloading on functions and function pointers
+                                if ( ! dynamic_cast<FunctionType *>( pointerType->base ) ) mangleName << "P";
                                 maybeAccept( pointerType->base, *visitor );
                         }
@@ -189 +192 @@
 
                         void Mangler::postvisit( ReferenceType * refType ) {
+                                // don't print prefix (e.g. 'R') for reference types so that references and non-references do not overload.
+                                // Further, do not print the qualifiers for a reference type (but do run printQualifers because of TypeDecls, etc.),
+                                // by pretending every reference type is a function parameter.
+                                GuardValue( inFunctionType );
+                                inFunctionType = true;
                                 printQualifiers( refType );
-                                mangleName << "R";
                                 maybeAccept( refType->base, *visitor );
                         }
@@ -206 +213 @@
                                 printQualifiers( functionType );
                                 mangleName << "F";
+                                // turn on inFunctionType so that printQualifiers does not print most qualifiers for function parameters,
+                                // since qualifiers on outermost parameter type do not differentiate function types, e.g.,
+                                // void (*)(const int) and void (*)(int) are the same type, but void (*)(const int *) and void (*)(int *) are different
+                                GuardValue( inFunctionType );
+                                inFunctionType = true;
                                 std::list< Type* > returnTypes = getTypes( functionType->get_returnVals() );
                                 acceptAll( returnTypes, *visitor );
@@ -270 +282 @@
                         }
 
+                        void Mangler::postvisit( TraitInstType * inst ) {
+                                printQualifiers( inst );
+                                mangleName << "_Y" << inst->name << "_";
+                        }
+
                         void Mangler::postvisit( TupleType * tupleType ) {
                                 printQualifiers( tupleType );
@@ -304 +321 @@
                                 // skip if not including qualifiers
                                 if ( typeMode ) return;
-
                                 if ( ! type->get_forall().empty() ) {
                                         std::list< std::string > assertionNames;
@@ -337 +353 @@
                                         mangleName << "_";
                                 } // if
-                                if ( type->get_const() ) {
-                                        mangleName << "C";
-                                } // if
-                                if ( type->get_volatile() ) {
-                                        mangleName << "V";
-                                } // if
+                                if ( ! inFunctionType ) {
+                                        // these qualifiers do not distinguish the outermost type of a function parameter
+                                        if ( type->get_const() ) {
+                                                mangleName << "C";
+                                        } // if
+                                        if ( type->get_volatile() ) {
+                                                mangleName << "V";
+                                        } // if
+                                        // Removed due to restrict not affecting function compatibility in GCC
+                                        // if ( type->get_isRestrict() ) {
+                                        //      mangleName << "E";
+                                        // } // if
+                                        if ( type->get_atomic() ) {
+                                                mangleName << "A";
+                                        } // if
+                                }
                                 if ( type->get_mutex() ) {
                                         mangleName << "M";
                                 } // if
-                                // Removed due to restrict not affecting function compatibility in GCC
-                //              if ( type->get_isRestrict() ) {
-                //                      mangleName << "E";
-                //              } // if
                                 if ( type->get_lvalue() ) {
                                         // mangle based on whether the type is lvalue, so that the resolver can differentiate lvalues and rvalues
                                         mangleName << "L";
                                 }
-                                if ( type->get_atomic() ) {
-                                        mangleName << "A";
-                                } // if
+
+                                if ( inFunctionType ) {
+                                        // turn off inFunctionType so that types can be differentiated for nested qualifiers
+                                        GuardValue( inFunctionType );
+                                        inFunctionType = false;
+                                }
                         }
                 }       // namespace