Changeset 637c139 for src/GenPoly

Timestamp:

Oct 31, 2022, 10:09:36 AM (3 years ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

ADT, ast-experimental, master

Children:

cd5b58f, e3bf4cf

Parents:

c7f12a4

Message:

Cleaning old box pass for easier translation. Simplify another loop, reducing flags and extra increments.

File:

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

src/GenPoly/Box.cc

@@ -354 +354 @@
                 addExpr( layoutDecl->get_statements(), makeOp( "?=?", derefVar( sizeParam ), new ConstantExpr( Constant::from_ulong( 0 ) ) ) );
                 addExpr( layoutDecl->get_statements(), makeOp( "?=?", derefVar( alignParam ), new ConstantExpr( Constant::from_ulong( 1 ) ) ) );
-                unsigned long n_members = 0;
-                bool firstMember = true;
-                for ( Declaration* member : structDecl->get_members() ) {
-                        DeclarationWithType *dwt = dynamic_cast< DeclarationWithType * >( member );
+                for ( auto index_member : enumerate( structDecl->members ) ) {
+                        DeclarationWithType *dwt = dynamic_cast< DeclarationWithType * >( index_member.val );
                         assert( dwt );
                         Type *memberType = dwt->get_type();
 
-                        if ( firstMember ) {
-                                firstMember = false;
-                        } else {
+                        if ( 0 < index_member.idx ) {
                                 // make sure all members after the first (automatically aligned at 0) are properly padded for alignment
                                 addStmt( layoutDecl->get_statements(), makeAlignTo( derefVar( sizeParam ), new AlignofExpr( memberType->clone() ) ) );
@@ -369 +365 @@
 
                         // place current size in the current offset index
-                        addExpr( layoutDecl->get_statements(), makeOp( "?=?", makeOp( "?[?]", new VariableExpr( offsetParam ), new ConstantExpr( Constant::from_ulong( n_members ) ) ),
+                        addExpr( layoutDecl->get_statements(), makeOp( "?=?", makeOp( "?[?]", new VariableExpr( offsetParam ), new ConstantExpr( Constant::from_ulong( index_member.idx ) ) ),
                                                                               derefVar( sizeParam ) ) );
-                        ++n_members;
 
                         // add member size to current size