Changeset 78dd0da for src/GenPoly/ScrubTyVars.cc

Timestamp:

Dec 15, 2015, 2:56:43 PM (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:

4389966, ffad73a

Parents:

5e92fee

Message:

Switched size/align parameters over to use SymTab::Mangler in preparation for addition of generic types

File:

• src/GenPoly/ScrubTyVars.cc (modified) (4 diffs)

src/GenPoly/ScrubTyVars.cc

@@ -14 +14 @@
 //
 
+#include <sstream>
 #include <string>
 
 #include "GenPoly.h"
 #include "ScrubTyVars.h"
+
+#include "SymTab/Mangler.h"
 
 #include "SynTree/Mutator.h"
@@ -46 +49 @@
                 // sizeof( T ) => _sizeof_T parameter, which is the size of T
                 if ( TypeInstType *typeInst = dynamic_cast< TypeInstType * >( szeof->get_type() ) ) {
-                        Expression *expr = new NameExpr( std::string("_sizeof_") + typeInst->get_name() );
+                        Expression *expr = new NameExpr( sizeofName( typeInst ) );
                         return expr;
                 } else {
@@ -56 +59 @@
                 // alignof( T ) => _alignof_T parameter, which is the alignment of T
                 if ( TypeInstType *typeInst = dynamic_cast< TypeInstType * >( algnof->get_type() ) ) {
-                        Expression *expr = new NameExpr( std::string("_alignof_") + typeInst->get_name() );
+                        Expression *expr = new NameExpr( alignofName( typeInst ) );
                         return expr;
                 } else {
@@ -75 +78 @@
                 return Mutator::mutate( pointer );
         }
+        
+        std::string sizeofName( Type *ty ) {
+                return std::string( "_sizeof_" ) + SymTab::Mangler::mangle( ty, false, false );
+        }
+
+        std::string alignofName( Type *ty ) {
+                return std::string( "_alignof_" ) + SymTab::Mangler::mangle( ty, false, false );
+        }
 } // namespace GenPoly