Changeset e16294d for src

Timestamp:

Apr 19, 2018, 3:40:22 PM (6 years ago)

Author:

Aaron Moss <a3moss@…>

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, with_gc

Children:

b03eed6

Parents:

f38e7d7

Message:

Fix sizeof expressions for generic types

File:

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

src/GenPoly/Box.cc

@@ -184 +184 @@
                         /// change the type of generic aggregate members to char[]
                         void mutateMembers( AggregateDecl * aggrDecl );
+                        /// returns the calculated sizeof expression for ty, or nullptr for use C sizeof()
+                        Expression* genSizeof( Type* ty );
 
                         /// Enters a new scope for type-variables, adding the type variables from ty
@@ -382 +384 @@
                 unsigned long n_members = 0;
                 bool firstMember = true;
-                for ( std::list< Declaration* >::const_iterator member = structDecl->get_members().begin(); member != structDecl->get_members().end(); ++member ) {
-                        DeclarationWithType *dwt = dynamic_cast< DeclarationWithType * >( *member );
+                for ( Declaration* member : structDecl->get_members() ) {
+                        DeclarationWithType *dwt = dynamic_cast< DeclarationWithType * >( member );
                         assert( dwt );
                         Type *memberType = dwt->get_type();
@@ -1747 +1749 @@
                 }
 
+                Expression * PolyGenericCalculator::genSizeof( Type* ty ) {
+                        if ( ArrayType * aty = dynamic_cast<ArrayType *>(ty) ) {
+                                // generate calculated size for possibly generic array
+                                Expression * sizeofBase = genSizeof( aty->get_base() );
+                                if ( ! sizeofBase ) return nullptr;
+                                Expression * dim = aty->get_dimension();
+                                aty->set_dimension( nullptr );
+                                return makeOp( "?*?", sizeofBase, dim );
+                        } else if ( findGeneric( ty ) ) {
+                                // generate calculated size for generic type
+                                return new NameExpr( sizeofName( mangleType( ty ) ) );
+                        } else return nullptr;
+                }
+
                 Expression *PolyGenericCalculator::postmutate( SizeofExpr *sizeofExpr ) {
-                        Type *ty = sizeofExpr->get_isType() ? sizeofExpr->get_type() : sizeofExpr->get_expr()->get_result();
-                        if ( findGeneric( ty ) ) {
-                                Expression *ret = new NameExpr( sizeofName( mangleType( ty ) ) );
+                        Type *ty = sizeofExpr->get_isType() ? 
+                                sizeofExpr->get_type() : sizeofExpr->get_expr()->get_result();
+                        
+                        Expression * gen = genSizeof( ty );
+                        if ( gen ) {
                                 delete sizeofExpr;
-                                return ret;
-                        }
-                        return sizeofExpr;
+                                return gen;
+                        } else return sizeofExpr;
                 }