Changes in / [3403534:f04a8b81]

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)
• tests/.expect/32/declarationSpecifier.txt (modified) (1 diff)
• tests/.expect/32/extension.txt (modified) (1 diff)
• tests/.expect/32/gccExtensions.txt (modified) (5 diffs)

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

src/tests/.expect/32/declarationSpecifier.txt

@@ -530 +530 @@
     return ((int )_retVal0);
 }
-__attribute__ ((constructor(),)) static void _init_declarationSpecifier(void){
-    ((void)___constructor__F_P13s__anonymous0_autogen___1(((struct __anonymous0 *)(&__x10__CV13s__anonymous0_1))));
-    ((void)___constructor__F_P13s__anonymous1_autogen___1(((struct __anonymous1 *)(&__x11__CV13s__anonymous1_1))));
-    ((void)___constructor__F_P13s__anonymous2_autogen___1(((struct __anonymous2 *)(&__x12__CV13s__anonymous2_1))));
-    ((void)___constructor__F_P13s__anonymous3_autogen___1(((struct __anonymous3 *)(&__x13__CV13s__anonymous3_1))));
-    ((void)___constructor__F_P13s__anonymous4_autogen___1(((struct __anonymous4 *)(&__x14__CV13s__anonymous4_1))));
-    ((void)___constructor__F_P13s__anonymous5_autogen___1(((struct __anonymous5 *)(&__x15__CV13s__anonymous5_1))));
-    ((void)___constructor__F_P13s__anonymous6_autogen___1(((struct __anonymous6 *)(&__x16__CV13s__anonymous6_1))));
-    ((void)___constructor__F_P13s__anonymous7_autogen___1(((struct __anonymous7 *)(&__x17__CV13s__anonymous7_1))));
-    ((void)___constructor__F_P13s__anonymous8_autogen___1(((struct __anonymous8 *)(&__x29__CV13s__anonymous8_1))));
-    ((void)___constructor__F_P13s__anonymous9_autogen___1(((struct __anonymous9 *)(&__x30__CV13s__anonymous9_1))));
-    ((void)___constructor__F_P14s__anonymous10_autogen___1(((struct __anonymous10 *)(&__x31__CV14s__anonymous10_1))));
-    ((void)___constructor__F_P14s__anonymous11_autogen___1(((struct __anonymous11 *)(&__x32__CV14s__anonymous11_1))));
-    ((void)___constructor__F_P14s__anonymous12_autogen___1(((struct __anonymous12 *)(&__x33__CV14s__anonymous12_1))));
-    ((void)___constructor__F_P14s__anonymous13_autogen___1(((struct __anonymous13 *)(&__x34__CV14s__anonymous13_1))));
-    ((void)___constructor__F_P14s__anonymous14_autogen___1(((struct __anonymous14 *)(&__x35__CV14s__anonymous14_1))));
-    ((void)___constructor__F_P14s__anonymous15_autogen___1(((struct __anonymous15 *)(&__x36__CV14s__anonymous15_1))));
-}
-__attribute__ ((destructor(),)) static void _destroy_declarationSpecifier(void){
-    ((void)___destructor__F_P14s__anonymous15_autogen___1(((struct __anonymous15 *)(&__x36__CV14s__anonymous15_1))));
-    ((void)___destructor__F_P14s__anonymous14_autogen___1(((struct __anonymous14 *)(&__x35__CV14s__anonymous14_1))));
-    ((void)___destructor__F_P14s__anonymous13_autogen___1(((struct __anonymous13 *)(&__x34__CV14s__anonymous13_1))));
-    ((void)___destructor__F_P14s__anonymous12_autogen___1(((struct __anonymous12 *)(&__x33__CV14s__anonymous12_1))));
-    ((void)___destructor__F_P14s__anonymous11_autogen___1(((struct __anonymous11 *)(&__x32__CV14s__anonymous11_1))));
-    ((void)___destructor__F_P14s__anonymous10_autogen___1(((struct __anonymous10 *)(&__x31__CV14s__anonymous10_1))));
-    ((void)___destructor__F_P13s__anonymous9_autogen___1(((struct __anonymous9 *)(&__x30__CV13s__anonymous9_1))));
-    ((void)___destructor__F_P13s__anonymous8_autogen___1(((struct __anonymous8 *)(&__x29__CV13s__anonymous8_1))));
-    ((void)___destructor__F_P13s__anonymous7_autogen___1(((struct __anonymous7 *)(&__x17__CV13s__anonymous7_1))));
-    ((void)___destructor__F_P13s__anonymous6_autogen___1(((struct __anonymous6 *)(&__x16__CV13s__anonymous6_1))));
-    ((void)___destructor__F_P13s__anonymous5_autogen___1(((struct __anonymous5 *)(&__x15__CV13s__anonymous5_1))));
-    ((void)___destructor__F_P13s__anonymous4_autogen___1(((struct __anonymous4 *)(&__x14__CV13s__anonymous4_1))));
-    ((void)___destructor__F_P13s__anonymous3_autogen___1(((struct __anonymous3 *)(&__x13__CV13s__anonymous3_1))));
-    ((void)___destructor__F_P13s__anonymous2_autogen___1(((struct __anonymous2 *)(&__x12__CV13s__anonymous2_1))));
-    ((void)___destructor__F_P13s__anonymous1_autogen___1(((struct __anonymous1 *)(&__x11__CV13s__anonymous1_1))));
-    ((void)___destructor__F_P13s__anonymous0_autogen___1(((struct __anonymous0 *)(&__x10__CV13s__anonymous0_1))));
-}

src/tests/.expect/32/extension.txt

@@ -86 +86 @@
         __extension__ int __c__i_2;
     };
-    int __i__i_2;
-    ((void)((*((int *)(&__i__i_2)))=(__extension__ __a__i_1+__extension__ 3)) /* ?{} */);
+    int __i__i_2 = ((int )(__extension__ __a__i_1+__extension__ 3));
     ((void)__extension__ 3);
     ((void)__extension__ __a__i_1);

src/tests/.expect/32/gccExtensions.txt

@@ -76 +76 @@
         ((void)((*((int *)(&(*___dst__P2sS_2).__c__i_2)))=__c__i_2) /* ?{} */);
     }
-    int __i__i_2;
-    ((void)((*((int *)(&__i__i_2)))=__extension__ 3) /* ?{} */);
+    int __i__i_2 = ((int )__extension__ 3);
     __extension__ int __a__i_2;
     __extension__ int __b__i_2;
@@ -133 +132 @@
     }
     struct s3 __x1__3ss3_2;
-    ((void)___constructor__F_P3ss3_autogen___2(((struct s3 *)(&__x1__3ss3_2))));
     struct s3 __y1__3ss3_2;
-    ((void)___constructor__F_P3ss3_autogen___2(((struct s3 *)(&__y1__3ss3_2))));
     struct s4 {
         int __i__i_2;
@@ -141 +138 @@
     inline struct s4 ___operator_assign__F3ss4_P3ss43ss4_autogen___2(struct s4 *___dst__P3ss4_2, struct s4 ___src__3ss4_2){
         ((void)((*___dst__P3ss4_2).__i__i_2=___src__3ss4_2.__i__i_2));
-        ((void)___destructor__F_P3ss3_autogen___2(((struct s3 *)(&__y1__3ss3_2))));
-        ((void)___destructor__F_P3ss3_autogen___2(((struct s3 *)(&__x1__3ss3_2))));
         return ((struct s4 )___src__3ss4_2);
     }
@@ -158 +153 @@
     }
     struct s4 __x2__3ss4_2;
-    ((void)___constructor__F_P3ss4_autogen___2(((struct s4 *)(&__x2__3ss4_2))));
     struct s4 __y2__3ss4_2;
-    ((void)___constructor__F_P3ss4_autogen___2(((struct s4 *)(&__y2__3ss4_2))));
     int __m1__A0i_2[((unsigned int )10)];
     int __m2__A0A0i_2[((unsigned int )10)][((unsigned int )10)];
@@ -166 +159 @@
     int _retVal0 = { 0 };
     ((void)(_retVal0=0) /* ?{} */);
-    ((void)___destructor__F_P3ss4_autogen___2(((struct s4 *)(&__y2__3ss4_2))));
-    ((void)___destructor__F_P3ss4_autogen___2(((struct s4 *)(&__x2__3ss4_2))));
-    ((void)___destructor__F_P3ss3_autogen___2(((struct s3 *)(&__y1__3ss3_2))));
-    ((void)___destructor__F_P3ss3_autogen___2(((struct s3 *)(&__x1__3ss3_2))));
     return ((int )_retVal0);
-    ((void)___destructor__F_P3ss4_autogen___2(((struct s4 *)(&__y2__3ss4_2))));
-    ((void)___destructor__F_P3ss4_autogen___2(((struct s4 *)(&__x2__3ss4_2))));
-    ((void)___destructor__F_P3ss3_autogen___2(((struct s3 *)(&__y1__3ss3_2))));
-    ((void)___destructor__F_P3ss3_autogen___2(((struct s3 *)(&__x1__3ss3_2))));
 }