Changeset f674479 for src/SymTab

Timestamp:

Apr 11, 2017, 4:20:51 PM (9 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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:

da1c772

Parents:

a0fc78a (diff), 32bcef7 (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 plg2:software/cfa/cfa-cc

Location:

src/SymTab

Files:

• Autogen.cc (modified) (1 diff)
• Validate.cc (modified) (3 diffs)

src/SymTab/Autogen.cc

@@ -498 +498 @@
                 makeUnionFieldsAssignment( srcParam, dstParam, back_inserter( funcDecl->get_statements()->get_kids() ) );
                 if ( returnVal ) {
-                        if ( isDynamicLayout ) makeUnionFieldsAssignment( srcParam, returnVal, back_inserter( funcDecl->get_statements()->get_kids() ) );
-                        else funcDecl->get_statements()->get_kids().push_back( new ReturnStmt( noLabels, new VariableExpr( srcParam ) ) );
+                        funcDecl->get_statements()->get_kids().push_back( new ReturnStmt( noLabels, new VariableExpr( srcParam ) ) );
                 }
         }

src/SymTab/Validate.cc

@@ -208 +208 @@
         };
 
+        class ArrayLength : public Visitor {
+        public:
+                /// for array types without an explicit length, compute the length and store it so that it
+                /// is known to the rest of the phases. For example,
+                ///   int x[] = { 1, 2, 3 };
+                ///   int y[][2] = { { 1, 2, 3 }, { 1, 2, 3 } };
+                /// here x and y are known at compile-time to have length 3, so change this into
+                ///   int x[3] = { 1, 2, 3 };
+                ///   int y[3][2] = { { 1, 2, 3 }, { 1, 2, 3 } };
+                static void computeLength( std::list< Declaration * > & translationUnit );
+
+                virtual void visit( ObjectDecl * objDecl );
+        };
+
         class CompoundLiteral final : public GenPoly::DeclMutator {
                 Type::StorageClasses storageClasses;
@@ -235 +249 @@
                 acceptAll( translationUnit, pass3 );
                 VerifyCtorDtorAssign::verify( translationUnit );
+                ArrayLength::computeLength( translationUnit );
         }
 
@@ -869 +884 @@
                 }
         }
+
+        void ArrayLength::computeLength( std::list< Declaration * > & translationUnit ) {
+                ArrayLength len;
+                acceptAll( translationUnit, len );
+        }
+
+        void ArrayLength::visit( ObjectDecl * objDecl ) {
+                if ( ArrayType * at = dynamic_cast< ArrayType * >( objDecl->get_type() ) ) {
+                        if ( at->get_dimension() != nullptr ) return;
+                        if ( ListInit * init = dynamic_cast< ListInit * >( objDecl->get_init() ) ) {
+                                at->set_dimension( new ConstantExpr( Constant::from_ulong( init->get_initializers().size() ) ) );
+                        }
+                }
+        }
 } // namespace SymTab