Changeset c51b5a3 for src/GenPoly/Box.cc

Timestamp:

Apr 7, 2017, 6:20:58 PM (7 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:

f92aa32

Parents:

af68f0a (diff), d919f47 (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:/u/cforall/software/cfa/cfa-cc

File:

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

src/GenPoly/Box.cc

@@ -34 +34 @@
 #include "Parser/ParseNode.h"
 
+#include "SynTree/Attribute.h"
 #include "SynTree/Constant.h"
 #include "SynTree/Declaration.h"
@@ -165 +166 @@
                         using Parent::mutate;
 
+                        PolyGenericCalculator();
+
                         template< typename DeclClass >
                         DeclClass *handleDecl( DeclClass *decl, Type *type );
@@ -198 +201 @@
                         ScopedSet< std::string > knownLayouts;          ///< Set of generic type layouts known in the current scope, indexed by sizeofName
                         ScopedSet< std::string > knownOffsets;          ///< Set of non-generic types for which the offset array exists in the current scope, indexed by offsetofName
+                        UniqueName bufNamer;                           ///< Namer for VLA buffers
                 };
 
@@ -1452 +1456 @@
 ////////////////////////////////////////// PolyGenericCalculator ////////////////////////////////////////////////////
 
+                PolyGenericCalculator::PolyGenericCalculator()
+                        : Parent(), knownLayouts(), knownOffsets(), bufNamer( "_buf" ) {}
+
                 void PolyGenericCalculator::beginTypeScope( Type *ty ) {
                         scopeTyVars.beginScope();
@@ -1528 +1535 @@
                         if ( ObjectDecl *objectDecl = dynamic_cast< ObjectDecl *>( declStmt->get_decl() ) ) {
                                 if ( findGeneric( objectDecl->get_type() ) ) {
-                                        // change initialization of a polymorphic value object
-                                        // to allocate storage with alloca
+                                        // change initialization of a polymorphic value object to allocate via a VLA
+                                        // (alloca was previously used, but can't be safely used in loops)
                                         Type *declType = objectDecl->get_type();
-                                        UntypedExpr *alloc = new UntypedExpr( new NameExpr( "__builtin_alloca" ) );
-                                        alloc->get_args().push_back( new NameExpr( sizeofName( mangleType( declType ) ) ) );
+                                        std::string bufName = bufNamer.newName();
+                                        ObjectDecl *newBuf = new ObjectDecl( bufName, Type::StorageClasses(), LinkageSpec::C, 0, 
+                                                new ArrayType( Type::Qualifiers(), new BasicType( Type::Qualifiers(), BasicType::Kind::Char), new NameExpr( sizeofName( mangleType(declType) ) ), 
+                                                true, false, std::list<Attribute*>{ new Attribute( std::string{"aligned"}, std::list<Expression*>{ new ConstantExpr( Constant::from_int(8) ) } ) } ), 0 );
+                                        stmtsToAdd.push_back( new DeclStmt( noLabels, newBuf ) );
 
                                         delete objectDecl->get_init();
 
-                                        std::list<Expression*> designators;
-                                        objectDecl->set_init( new SingleInit( alloc, designators, false ) ); // not constructed
+                                        objectDecl->set_init( new SingleInit( new NameExpr( bufName ) ) );
                                 }
                         }