Changeset 44f6341

Timestamp:

Sep 2, 2016, 1:30:36 PM (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:

85517ddb

Parents:

4d4882a

git-author:

Rob Schluntz <rschlunt@…> (09/01/16 17:14:32)

git-committer:

Rob Schluntz <rschlunt@…> (09/02/16 13:30:36)

Message:

fix implicit member ctor/dtor generation order, fix corresponding test

Location:

src

Files:

• Common/utility.h (modified) (1 diff)
• InitTweak/FixInit.cc (modified) (7 diffs)
• tests/.expect/memberCtors-ERR1.txt (modified) (1 diff)
• tests/.expect/memberCtors.txt (modified) (5 diffs)
• tests/memberCtors.c (modified) (1 diff)

src/Common/utility.h

@@ -260 +260 @@
 };
 
+template< typename T >
+struct ReverseIter {
+        T& ref;
+
+        ReverseIter( T & ref ) : ref(ref) {}
+
+        typedef typename T::reverse_iterator iterator;
+        iterator begin() { return ref.rbegin(); }
+        iterator end() { return ref.rend(); }
+};
+
+template< typename T >
+ReverseIter< T > ReverseIterate( T & ref ) {
+        return ReverseIter< T >( ref );
+}
+
 #endif // _UTILITY_H
 

src/InitTweak/FixInit.cc

@@ -200 +200 @@
                         ObjectDecl * thisParam = 0;
                         bool isCtor = false; // true if current function is a constructor
+                        StructDecl * structDecl = 0;
                 };
 
@@ -744 +745 @@
                         ValueGuard< ObjectDecl * > oldThisParam( thisParam );
                         ValueGuard< bool > oldIsCtor( isCtor );
+                        ValueGuard< StructDecl * > oldStructDecl( structDecl );
 
                         // need to start with fresh sets
@@ -758 +760 @@
                                 StructInstType * structType = dynamic_cast< StructInstType * >( ptrType->get_base() );
                                 if ( structType ) {
-                                        StructDecl * structDecl = structType->get_baseStruct();
+                                        structDecl = structType->get_baseStruct();
                                         for ( Declaration * member : structDecl->get_members() ) {
                                                 if ( ObjectDecl * field = dynamic_cast< ObjectDecl * >( member ) ) {
@@ -775 +777 @@
                         std::set_difference( usedUninit.begin(), usedUninit.end(), unhandled.begin(), unhandled.end(), std::inserter( diff, diff.begin() ) );
                         for ( DeclarationWithType * member : diff ) {
-                                emit( "in ", CodeGen::genType( function->get_functionType(), function->get_name(), false ), ", member ", member->get_name(), " used before being constructed" );
+                                emit( "in ", CodeGen::genType( function->get_functionType(), function->get_name(), false ), ", field ", member->get_name(), " used before being constructed" );
                         }
 
@@ -782 +784 @@
                                 enterScope();
                                 // maybeAccept( function->get_functionType(), *this );
-                                for ( DeclarationWithType * member : unhandled ) {
-                                        // insert and resolve default/copy constructor call for each member that's unhandled
+
+                                // need to iterate through members in reverse in order for
+                                // ctor/dtor statements to come out in the right order
+                                for ( Declaration * member : ReverseIterate( structDecl->get_members() ) ) {
+                                        DeclarationWithType * field = dynamic_cast< DeclarationWithType * >( member );
+                                        // skip non-DWT members
+                                        if ( ! field ) continue;
+                                        // skip handled members
+                                        if ( ! unhandled.count( field ) ) continue;
+
+                                        // insert and resolve default/copy constructor call for each field that's unhandled
                                         std::list< Statement * > stmt;
                                         UntypedExpr * deref = new UntypedExpr( new NameExpr( "*?" ) );
@@ -790 +801 @@
                                         Expression * arg2 = 0;
                                         if ( isCopyConstructor( function ) ) {
-                                                // if copy ctor, need to pass second-param-of-this-function.member
+                                                // if copy ctor, need to pass second-param-of-this-function.field
                                                 std::list< DeclarationWithType * > & params = function->get_functionType()->get_parameters();
                                                 assert( params.size() == 2 );
-                                                arg2 = new MemberExpr( member, new VariableExpr( params.back() ) );
+                                                arg2 = new MemberExpr( field, new VariableExpr( params.back() ) );
                                         }
                                         InitExpander srcParam( arg2 );
-                                        SymTab::genImplicitCall( srcParam, new MemberExpr( member, deref ), function->get_name(), back_inserter( stmt ), member, isCtor );
+                                        SymTab::genImplicitCall( srcParam, new MemberExpr( field, deref ), function->get_name(), back_inserter( stmt ), field, isCtor );
 
                                         assert( stmt.size() <= 1 );
@@ -813 +824 @@
                                                         }
                                                 } catch ( SemanticError & error ) {
-                                                        emit( "in ", CodeGen::genType( function->get_functionType(), function->get_name(), false ), ", member ", member->get_name(), " not explicitly ", isCtor ? "constructed" : "destructed",  " and no ", isCtor ? "default constructor" : "destructor", " found" );
+                                                        emit( "in ", CodeGen::genType( function->get_functionType(), function->get_name(), false ), ", field ", field->get_name(), " not explicitly ", isCtor ? "constructed" : "destructed",  " and no ", isCtor ? "default constructor" : "destructor", " found" );
                                                 }
                                         }

src/tests/.expect/memberCtors-ERR1.txt

@@ -1 +1 @@
 CFA Version 1.0.0 (debug)
-Error: in void ?{}(struct B *b), member a2 used before being constructed
+Error: in void ?{}(struct B *b), field a2 used before being constructed
 make: *** [memberCtors-ERR1] Error 1

src/tests/.expect/memberCtors.txt

@@ +1 @@
+Before declaration of b1
 constructing int
 constructing int
@@ -16 +17 @@
 destructing int: 0
 destructing int: 1001
+Before declaration of b2
 copy constructing int: 0
 copy constructing int: 0
@@ -25 +27 @@
 copy constructing int: 0
 copy constructing int: 0
+End of main
 constructing int
 constructing int
@@ -37 +40 @@
 destructing int: 0
 destructing int: 0
-destructing int: 999
 destructing int: 0
 destructing int: 0
 destructing int: 0
+destructing int: 999
 constructing int
 constructing int
@@ -53 +56 @@
 destructing int: 0
 destructing int: 0
-destructing int: 999
 destructing int: 0
 destructing int: 0
 destructing int: 0
+destructing int: 999

src/tests/memberCtors.c

@@ -59 +59 @@
 
 int main() {
+  printf("Before declaration of b1\n");
   B b1;
+  printf("Before declaration of b2\n");
   B b2 = b1;
+  printf("End of main\n");
 }