Changeset dcd73d1

Timestamp:

Sep 5, 2016, 9:49:53 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, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

621701d

Parents:

b16898e

Message:

add error checking for managed object's initializer depth

Location:

src

Files:

• GenPoly/PolyMutator.cc (modified) (2 diffs)
• InitTweak/GenInit.cc (modified) (1 diff)
• InitTweak/InitTweak.cc (modified) (2 diffs)
• InitTweak/InitTweak.h (modified) (1 diff)

src/GenPoly/PolyMutator.cc

@@ -30 +30 @@
 
         void PolyMutator::mutateStatementList( std::list< Statement* > &statements ) {
+                SemanticError errors;
+
                 for ( std::list< Statement* >::iterator i = statements.begin(); i != statements.end(); ++i ) {
                         if ( ! stmtsToAddAfter.empty() ) {
                                 statements.splice( i, stmtsToAddAfter );
                         } // if
-                        *i = (*i)->acceptMutator( *this );
+                        try {
+                                *i = (*i)->acceptMutator( *this );
+                        } catch ( SemanticError &e ) {
+                                errors.append( e );
+                        } // try
                         if ( ! stmtsToAdd.empty() ) {
                                 statements.splice( i, stmtsToAdd );
@@ -42 +48 @@
                         statements.splice( statements.end(), stmtsToAddAfter );
                 } // if
+                if ( ! errors.isEmpty() ) {
+                        throw errors;
+                }
         }
 

src/InitTweak/GenInit.cc

@@ -245 +245 @@
                         // constructed objects cannot be designated
                         if ( isDesignated( objDecl->get_init() ) ) throw SemanticError( "Cannot include designations in the initializer for a managed Object. If this is really what you want, then initialize with @=.", objDecl );
-                        // xxx - constructed objects should not have initializers nested too deeply
+                        // constructed objects should not have initializers nested too deeply
+                        if ( ! checkInitDepth( objDecl ) ) throw SemanticError( "Managed object's initializer is too deep ", objDecl );
 
                         // call into genImplicitCall from Autogen.h to generate calls to ctor/dtor

src/InitTweak/InitTweak.cc

@@ -23 +23 @@
                 };
 
+                class InitDepthChecker : public Visitor {
+                public:
+                        bool depthOkay = true;
+                        Type * type;
+                        int curDepth = 0, maxDepth = 0;
+                        InitDepthChecker( Type * type ) : type( type ) {
+                                Type * t = type;
+                                while ( ArrayType * at = dynamic_cast< ArrayType * >( t ) ) {
+                                        maxDepth++;
+                                        t = at->get_base();
+                                }
+                                maxDepth++;
+                        }
+                        virtual void visit( ListInit * listInit ) {
+                                curDepth++;
+                                if ( curDepth > maxDepth ) depthOkay = false;
+                                Visitor::visit( listInit );
+                                curDepth--;
+                        }
+                };
+
                 class InitFlattener : public Visitor {
                         public:
@@ -53 +74 @@
                 maybeAccept( init, finder );
                 return finder.hasDesignations;
+        }
+
+        bool checkInitDepth( ObjectDecl * objDecl ) {
+                InitDepthChecker checker( objDecl->get_type() );
+                maybeAccept( objDecl->get_init(), checker );
+                return checker.depthOkay;
         }
 

src/InitTweak/InitTweak.h

@@ -40 +40 @@
         /// True if the Initializer contains designations
         bool isDesignated( Initializer * init );
+
+        /// True if the ObjectDecl's Initializer nesting level is not deeper than the depth of its
+        /// type, where the depth of its type is the number of nested ArrayTypes + 1
+        bool checkInitDepth( ObjectDecl * objDecl );
 
   /// Non-Null if expr is a call expression whose target function is intrinsic