Changeset 40e636a for src/InitTweak/GenInit.cc

Timestamp:

Jul 21, 2016, 11:19:24 AM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

b81adcc4

Parents:

5f98ce5

Message:

only generate array dimension constant inside of functions, recursively mutate array types into pointer types in function parameter lists, fix bug where global compound literal object is lost

File:

• src/InitTweak/GenInit.cc (modified) (5 diffs)

src/InitTweak/GenInit.cc

@@ -90 +90 @@
 
           private:
-                DeclarationWithType * mutate( ObjectDecl * objectDecl );
+                virtual DeclarationWithType * mutate( ObjectDecl * objectDecl );
+                virtual DeclarationWithType * mutate( FunctionDecl *functionDecl );
                 // should not traverse into any of these declarations to find objects
                 // that need to be constructed or destructed
@@ -105 +106 @@
 
                 DeclarationNode::StorageClass storageclass = DeclarationNode::NoStorageClass;
+                bool inFunction = false;
         };
 
@@ -157 +159 @@
         void HoistArrayDimension::hoistArrayDimension( std::list< Declaration * > & translationUnit ) {
                 HoistArrayDimension hoister;
-                mutateAll( translationUnit, hoister );
+                hoister.mutateDeclarationList( translationUnit );
         }
 
@@ -169 +171 @@
 
         void HoistArrayDimension::hoist( Type * type ) {
+                // if in function, generate const size_t var
                 static UniqueName dimensionName( "_array_dim" );
                 if ( ArrayType * arrayType = dynamic_cast< ArrayType * >( type ) ) {
+                        if ( ! inFunction ) return;
+
                         if ( ! arrayType->get_dimension() ) return; // xxx - recursive call to hoist?
 
@@ -186 +191 @@
                         return;
                 }
+        }
+
+        DeclarationWithType * HoistArrayDimension::mutate( FunctionDecl *functionDecl ) {
+                bool oldInFunc = inFunction;
+                inFunction = true;
+                DeclarationWithType * decl = Parent::mutate( functionDecl );
+                inFunction = oldInFunc;
+                return decl;
         }