Changeset bfc7811 for src/GenPoly

Timestamp:

Apr 10, 2018, 2:43:50 PM (6 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

new-env, with_gc

Children:

9f2012f

Parents:

dbc2c2c

Message:

Fix some GC bugs

File:

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

src/GenPoly/Box.cc

@@ -279 +279 @@
         /// Adds parameters for otype layout to a function type
         void addOtypeParams( FunctionType *layoutFnType, std::list< TypeDecl* > &otypeParams ) {
-                BasicType sizeAlignType( Type::Qualifiers(), BasicType::LongUnsignedInt );
-
-                for ( std::list< TypeDecl* >::const_iterator param = otypeParams.begin(); param != otypeParams.end(); ++param ) {
+                auto sizeAlignType = new BasicType( Type::Qualifiers(), BasicType::LongUnsignedInt );
+
+                for ( std::list< TypeDecl* >::const_iterator param = otypeParams.begin(); 
+                                param != otypeParams.end(); ++param ) {
                         TypeInstType paramType( Type::Qualifiers(), (*param)->get_name(), *param );
                         std::string paramName = mangleType( &paramType );
-                        layoutFnType->get_parameters().push_back( new ObjectDecl( sizeofName( paramName ), Type::StorageClasses(), LinkageSpec::Cforall, 0, sizeAlignType.clone(), 0 ) );
-                        layoutFnType->get_parameters().push_back( new ObjectDecl( alignofName( paramName ), Type::StorageClasses(), LinkageSpec::Cforall, 0, sizeAlignType.clone(), 0 ) );
+                        layoutFnType->get_parameters().push_back( new ObjectDecl( sizeofName( paramName ), Type::StorageClasses(), LinkageSpec::Cforall, 0, sizeAlignType->clone(), 0 ) );
+                        layoutFnType->get_parameters().push_back( new ObjectDecl( alignofName( paramName ), Type::StorageClasses(), LinkageSpec::Cforall, 0, sizeAlignType->clone(), 0 ) );
                 }
         }
@@ -740 +741 @@
                                 Type * newType = param->clone();
                                 if ( env ) env->apply( newType );
-                                ObjectDecl *newObj = ObjectDecl::newObject( tempNamer.newName(), newType, nullptr );
+                                ObjectDecl *newObj = ObjectDecl::newObject( 
+                                        tempNamer.newName(), newType, nullptr );
                                 newObj->get_type()->get_qualifiers() = Type::Qualifiers(); // TODO: is this right???
                                 stmtsToAddBefore.push_back( new DeclStmt( newObj ) );
@@ -1325 +1327 @@
                         std::list< DeclarationWithType *> inferredParams;
                         // size/align/offset parameters may not be used in body, pass along with unused attribute.
-                        ObjectDecl newObj( "", Type::StorageClasses(), LinkageSpec::C, 0, new BasicType( Type::Qualifiers(), BasicType::LongUnsignedInt ), 0,
-                                           { new Attribute( "unused" ) } );
-                        ObjectDecl newPtr( "", Type::StorageClasses(), LinkageSpec::C, 0,
-                                           new PointerType( Type::Qualifiers(), new BasicType( Type::Qualifiers(), BasicType::LongUnsignedInt ) ), 0 );
-                        for ( Type::ForallList::const_iterator tyParm = funcType->get_forall().begin(); tyParm != funcType->get_forall().end(); ++tyParm ) {
+                        auto newObj = new ObjectDecl(
+                                "", Type::StorageClasses(), LinkageSpec::C, 0, 
+                                new BasicType( Type::Qualifiers(), BasicType::LongUnsignedInt ), 0,
+                            { new Attribute( "unused" ) } );
+                        auto newPtr = new ObjectDecl(
+                                "", Type::StorageClasses(), LinkageSpec::C, 0,
+                            new PointerType( Type::Qualifiers(), 
+                                        new BasicType( Type::Qualifiers(), BasicType::LongUnsignedInt ) ), 0 );
+                        for ( Type::ForallList::const_iterator tyParm = funcType->get_forall().begin(); 
+                                        tyParm != funcType->get_forall().end(); ++tyParm ) {
                                 ObjectDecl *sizeParm, *alignParm;
                                 // add all size and alignment parameters to parameter list
@@ -1336 +1343 @@
                                         std::string parmName = mangleType( &parmType );
 
-                                        sizeParm = newObj.clone();
+                                        sizeParm = newObj->clone();
                                         sizeParm->set_name( sizeofName( parmName ) );
                                         last = funcType->get_parameters().insert( last, sizeParm );
                                         ++last;
 
-                                        alignParm = newObj.clone();
+                                        alignParm = newObj->clone();
                                         alignParm->set_name( alignofName( parmName ) );
                                         last = funcType->get_parameters().insert( last, alignParm );
@@ -1364 +1371 @@
 
                                         ObjectDecl *sizeParm, *alignParm, *offsetParm;
-                                        sizeParm = newObj.clone();
+                                        sizeParm = newObj->clone();
                                         sizeParm->set_name( sizeofName( typeName ) );
                                         last = funcType->get_parameters().insert( last, sizeParm );
                                         ++last;
 
-                                        alignParm = newObj.clone();
+                                        alignParm = newObj->clone();
                                         alignParm->set_name( alignofName( typeName ) );
                                         last = funcType->get_parameters().insert( last, alignParm );
@@ -1377 +1384 @@
                                                 // NOTE zero-length arrays are illegal in C, so empty structs have no offset array
                                                 if ( ! polyBaseStruct->get_baseStruct()->get_members().empty() ) {
-                                                        offsetParm = newPtr.clone();
+                                                        offsetParm = newPtr->clone();
                                                         offsetParm->set_name( offsetofName( typeName ) );
                                                         last = funcType->get_parameters().insert( last, offsetParm );
@@ -1614 +1621 @@
 
                 ObjectDecl *PolyGenericCalculator::makeVar( const std::string &name, Type *type, Initializer *init ) {
-                        ObjectDecl *newObj = new ObjectDecl( name, Type::StorageClasses(), LinkageSpec::C, nullptr, type, init );
+                        ObjectDecl *newObj = new ObjectDecl( 
+                                name, Type::StorageClasses(), LinkageSpec::C, nullptr, type, init );
                         stmtsToAddBefore.push_back( new DeclStmt( newObj ) );
                         return newObj;