Changeset de8a0a4 for src/InitTweak/GenInit.cpp

Timestamp:

Jan 26, 2025, 6:37:05 PM (3 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

a950021

Parents:

0f070a4 (diff), 11f92fac (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:software/cfa/cfa-cc

File:

• src/InitTweak/GenInit.cpp (modified) (1 diff)

src/InitTweak/GenInit.cpp ¶

@@ -162 +162 @@
                                 // FROM USER:  float a[ rand() ];
                                 // TO GCC:     const size_t __len_of_a = rand(); float a[ __len_of_a ];
-
-                                ast::ObjectDecl * arrayDimension = new ast::ObjectDecl(
-                                        arrayType->dimension->location,
-                                        dimensionName.newName(),
-                                        dimType,
-                                        new ast::SingleInit(
+                                ast::ObjectDecl * arrayDimension = nullptr;
+
+                                const ast::TypeExpr * ty = dynamic_cast< const ast::TypeExpr * >( arrayType->dimension.get() );
+                                if ( ty ) {
+                                        auto inst = ty->type.as<ast::EnumInstType>();
+                                        if ( inst ) {
+                                                if ( inst->base->isCfa ) {
+                                                        arrayDimension = new ast::ObjectDecl(
+                                                                arrayType->dimension->location,
+                                                                dimensionName.newName(),
+                                                                new ast::BasicType( ast::BasicKind::UnsignedChar ),
+                                                                new ast::SingleInit(
+                                                                        arrayType->dimension->location,
+                                                                        ast::ConstantExpr::from_int( arrayType->dimension->location, inst->base->members.size() )
+                                                                )
+                                                        );
+                                                        // return arrayType;
+                                                }
+                                        }
+                                }
+                                if ( arrayDimension == nullptr ) {
+                                        arrayDimension = new ast::ObjectDecl(
                                                 arrayType->dimension->location,
-                                                arrayType->dimension
-                                        )
-                                );
+                                                dimensionName.newName(),
+                                                dimType,
+                                                new ast::SingleInit(
+                                                        arrayType->dimension->location,
+                                                        arrayType->dimension
+                                                )
+                                        );
+                                }
 
                                 ast::ArrayType * mutType = ast::mutate( arrayType );