Changes in src/GenPoly/Box.cc [bdf1954:e56cfdb0]

File:

• src/GenPoly/Box.cc (modified) (7 diffs)

src/GenPoly/Box.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Tue Nov 24 15:59:33 2015
-// Update Count     : 169
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Thu Nov 19 17:40:51 2015
+// Update Count     : 133
 //
 
@@ -142 +142 @@
 
         namespace {
-                std::string makePolyMonoSuffix( FunctionType * function, const TyVarMap &tyVars ) {
-                        std::stringstream name;
-
-                        // if the return type or a parameter type involved polymorphic types, then the adapter will need 
-                        // to take those polymorphic types as pointers. Therefore, there can be two different functions 
-                        // with the same mangled name, so we need to further mangle the names.
-                        if ( isPolyRet( function, tyVars ) ) {
-                                name << "P";
-                        } else {
-                                name << "M";
-                        }
-                        name << "_";
-                        std::list< DeclarationWithType *> &paramList = function->get_parameters();
-                        for ( std::list< DeclarationWithType *>::iterator arg = paramList.begin(); arg != paramList.end(); ++arg ) {
-                                if ( isPolyObj( (*arg)->get_type(), tyVars ) ) {
-                                        name << "P";
-                                } else {
-                                        name << "M";                            
-                                }
-                        } // for
-                        return name.str();
-                }
-
-                std::string mangleAdapterName( FunctionType * function, const TyVarMap &tyVars ) {
-                        return SymTab::Mangler::mangle( function ) + makePolyMonoSuffix( function, tyVars );
-                }
-
                 std::string makeAdapterName( const std::string &mangleName ) {
                         return "_adapter" + mangleName;
@@ -244 +217 @@
                                 AdapterMap & adapters = Pass1::adapters.top();
                                 for ( std::list< FunctionType *>::iterator funType = functions.begin(); funType != functions.end(); ++funType ) {
-                                        std::string mangleName = mangleAdapterName( *funType, scopeTyVars );
+                                        std::string mangleName = SymTab::Mangler::mangle( *funType );
+                                        if ( isPolyRet( *funType, scopeTyVars ) ) {
+                                                // if the return type involved polymorphic types, then the adapter will need to take those
+                                                // polymorphic types as pointers. Therefore, there can be two different functions with the same
+                                                // mangled name, so we need the mangled names to be different.
+                                                mangleName += "polyret_";
+                                        } // if
                                         if ( adapters.find( mangleName ) == adapters.end() ) {
                                                 std::string adapterName = makeAdapterName( mangleName );
@@ -368 +347 @@
                                 ret = addRetParam( appExpr, function, function->get_returnVals().front()->get_type(), arg );
                         } // if
-                        std::string mangleName = mangleAdapterName( function, tyVars );
+                        std::string mangleName = SymTab::Mangler::mangle( function );
+                        if ( isPolyRet( function, tyVars ) ) {
+                                mangleName += "polyret_";
+                        } // if
                         std::string adapterName = makeAdapterName( mangleName );
 
@@ -583 +565 @@
                                         assert( env );
                                         env->apply( realFunction );
-                                        mangleName = SymTab::Mangler::mangle( realFunction ); 
-                                        mangleName += makePolyMonoSuffix( originalFunction, exprTyVars );
+                                        mangleName = SymTab::Mangler::mangle( realFunction );
+
+                                        if ( isPolyRet( originalFunction, exprTyVars ) ) {
+                                                mangleName += "polyret_";
+                                        } // if
 
                                         AdapterMap & adapters = Pass1::adapters.top();
@@ -915 +900 @@
 
                 void Pass1::doBeginScope() {
-                        // push a copy of the current map
+                        // actually, maybe this could (should?) push
+                        // a copy of the current map
                         adapters.push(adapters.top());
                 }
@@ -937 +923 @@
                         std::set< std::string > adaptersDone;
                         for ( std::list< FunctionType *>::iterator funType = functions.begin(); funType != functions.end(); ++funType ) {
-                                std::string mangleName = mangleAdapterName( *funType, scopeTyVars );
+                                std::string mangleName = SymTab::Mangler::mangle( *funType );
+                                if ( isPolyRet( *funType, scopeTyVars ) ) {
+                                        mangleName += "polyret_";
+                                } // if
                                 if ( adaptersDone.find( mangleName ) == adaptersDone.end() ) {
                                         std::string adapterName = makeAdapterName( mangleName );