Changeset e6512c8 for src

Timestamp:

Feb 15, 2017, 8:42:12 AM (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:

32b8144

Parents:

97f65d5

Message:

generate tuples by arity to reduce the number of generated structs

Location:

src

Files:

• CodeGen/Generate.cc (modified) (2 diffs)
• Tuples/TupleExpansion.cc (modified) (2 diffs)

src/CodeGen/Generate.cc

@@ -22 +22 @@
 #include "SynTree/Declaration.h"
 #include "CodeGenerator.h"
+#include "Tuples/Tuples.h"
 
 using namespace std;
@@ -28 +29 @@
         void generate( std::list< Declaration* > translationUnit, std::ostream &os, bool doIntrinsics, bool pretty ) {
                 CodeGen::CodeGenerator cgv( os, pretty );
-
-                for ( std::list<Declaration *>::iterator i = translationUnit.begin(); i != translationUnit.end();  i++ ) {
-                        if ( LinkageSpec::isGeneratable( (*i)->get_linkage() ) && (doIntrinsics || ! LinkageSpec::isBuiltin( (*i)->get_linkage() ) ) ) {
-                                (*i)->accept(cgv);
-                                if ( doSemicolon( *i ) ) {
+                for ( auto & dcl : translationUnit ) {
+                        if ( LinkageSpec::isGeneratable( dcl->get_linkage() ) && (doIntrinsics || ! LinkageSpec::isBuiltin( dcl->get_linkage() ) ) ) {
+                                dcl->accept(cgv);
+                                if ( doSemicolon( dcl ) ) {
                                         os << ";";
                                 } // if

src/Tuples/TupleExpansion.cc

@@ -79 +79 @@
                         }
                   private:
-                        ScopedMap< std::string, StructDecl * > typeMap;
+                        ScopedMap< int, StructDecl * > typeMap;
                 };
 
@@ -214 +214 @@
 
         Type * TupleTypeReplacer::mutate( TupleType * tupleType ) {
-                std::string mangleName = SymTab::Mangler::mangleType( tupleType );
                 tupleType = safe_dynamic_cast< TupleType * > ( Parent::mutate( tupleType ) );
-                if ( ! typeMap.count( mangleName ) ) {
-                        // generate struct type to replace tuple type
-                        // xxx - should fix this to only generate one tuple struct for each number of type parameters
-                        StructDecl * decl = new StructDecl( "_tuple_type_" + mangleName );
+                unsigned tupleSize = tupleType->size();
+                if ( ! typeMap.count( tupleSize ) ) {
+                        // generate struct type to replace tuple type based on the number of components in the tuple
+                        StructDecl * decl = new StructDecl( toString( "_tuple_type_", tupleSize  ) );
                         decl->set_body( true );
-                        for ( size_t i = 0; i < tupleType->size(); ++i ) {
+                        for ( size_t i = 0; i < tupleSize; ++i ) {
                                 TypeDecl * tyParam = new TypeDecl( toString("tuple_param_", i), DeclarationNode::NoStorageClass, nullptr, TypeDecl::Any );
                                 decl->get_members().push_back( new ObjectDecl( toString("field_", i), DeclarationNode::NoStorageClass, LinkageSpec::C, nullptr, new TypeInstType( Type::Qualifiers(), tyParam->get_name(), tyParam ), nullptr ) );
                                 decl->get_parameters().push_back( tyParam );
                         }
-                        if ( tupleType->size() == 0 ) {
+                        if ( tupleSize == 0 ) {
                                 // empty structs are not standard C. Add a dummy field to empty tuples to silence warnings when a compound literal Tuple0 is created.
                                 decl->get_members().push_back( new ObjectDecl( "dummy", DeclarationNode::NoStorageClass, LinkageSpec::C, nullptr, new BasicType( Type::Qualifiers(), BasicType::SignedInt ), nullptr ) );
                         }
-                        typeMap[mangleName] = decl;
+                        typeMap[tupleSize] = decl;
                         addDeclaration( decl );
                 }
                 Type::Qualifiers qualifiers = tupleType->get_qualifiers();
 
-                StructDecl * decl = typeMap[mangleName];
+                StructDecl * decl = typeMap[tupleSize];
                 StructInstType * newType = new StructInstType( qualifiers, decl );
                 for ( Type * t : *tupleType ) {