Changeset 1ed33fed for src

Timestamp:

May 11, 2017, 2:49:34 PM (8 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:

3476a0d

Parents:

6ac2ada (diff), 6a4f3d4 (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

Files:

• CodeGen/CodeGenerator.cc (modified) (6 diffs)
• CodeGen/CodeGenerator.h (modified) (7 diffs)
• CodeGen/GenType.cc (modified) (8 diffs)
• CodeGen/GenType.h (modified) (1 diff)
• CodeGen/Generate.cc (modified) (3 diffs)
• CodeGen/Generate.h (modified) (1 diff)
• CodeGen/LineStream.cc (deleted)
• CodeGen/LineStream.h (deleted)
• Common/utility.h (modified) (4 diffs)
• GenPoly/Box.cc (modified) (9 diffs)
• InitTweak/FixInit.cc (modified) (5 diffs)
• InitTweak/GenInit.cc (modified) (1 diff)
• main.cc (modified) (7 diffs)
• prelude/Makefile.am (modified) (1 diff)
• prelude/Makefile.in (modified) (1 diff)
• tests/.expect/32/KRfunctions.txt (modified) (1 diff)
• tests/.expect/32/attributes.txt (modified) (7 diffs)
• tests/.expect/32/declarationSpecifier.txt (modified) (24 diffs)
• tests/.expect/32/extension.txt (modified) (2 diffs)
• tests/.expect/32/gccExtensions.txt (modified) (4 diffs)
• tests/.expect/64/KRfunctions.txt (modified) (1 diff)
• tests/.expect/64/attributes.txt (modified) (7 diffs)
• tests/.expect/64/declarationSpecifier.txt (modified) (24 diffs)
• tests/.expect/64/extension.txt (modified) (2 diffs)
• tests/.expect/64/gccExtensions.txt (modified) (4 diffs)
• tests/.expect/genericUnion.txt (added)
• tests/.expect/memberCtors-ERR1.txt (modified) (1 diff)
• tests/.expect/memberCtors.txt (modified) (4 diffs)
• tests/Makefile.am (modified) (3 diffs)
• tests/Makefile.in (modified) (3 diffs)
• tests/genericUnion.c (added)
• tests/memberCtors.c (modified) (1 diff)
• tests/sched-int-wait.c (modified) (10 diffs)
• tests/test.py (modified) (4 diffs)

src/CodeGen/CodeGenerator.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Tus May  9 14:32:00 2017
-// Update Count     : 483
+// Last Modified On : Wed May 10 14:45:00 2017
+// Update Count     : 484
 //
 
@@ -41 +41 @@
 namespace CodeGen {
         int CodeGenerator::tabsize = 4;
-
-        // Pseudo Function: output << lineDirective(*currentNode);
-    struct lineDirective {
-        CodeLocation const & loc;
-                lineDirective(CodeLocation const & location) : loc(location) {}
-                lineDirective(BaseSyntaxNode const * node) : loc(node->location) {}
-        };
-        std::ostream & operator<<(std::ostream & out, lineDirective const & ld) {
-                if (ld.loc.isSet())
-                        return out << "\n# " << ld.loc.linenumber << " \""
-                                << ld.loc.filename << "\"\n";
-                return out << "\n// Unset Location\n";
-        }
 
         // the kinds of statements that would ideally be followed by whitespace
@@ -102 +89 @@
         }
 
-        CodeGenerator::CodeGenerator( std::ostream & os, bool pretty, bool genC ) : indent( *this), cur_indent( 0 ), insideFunction( false ), output( os ), printLabels( *this ), pretty( pretty ), genC( genC ) {}
+        CodeGenerator::LineMarker::LineMarker(
+                        CodeLocation const & loc, bool toPrint) :
+                loc(loc), toPrint(toPrint)
+        {}
+
+        CodeGenerator::LineMarker CodeGenerator::lineDirective(
+                        BaseSyntaxNode const * node) {
+                return LineMarker(node->location, lineMarks);
+        }
+
+        std::ostream & operator<<(std::ostream & out,
+                        CodeGenerator::LineMarker const & marker) {
+                if (marker.toPrint && marker.loc.isSet()) {
+                        return out << "\n# " << marker.loc.linenumber << " \""
+                                << marker.loc.filename << "\"\n";
+                } else if (marker.toPrint) {
+                        return out << "\n/* Missing CodeLocation */\n";
+                } else {
+                return out;
+                }
+        }
+
+        CodeGenerator::CodeGenerator( std::ostream & os, bool pretty, bool genC, bool lineMarks ) : indent( *this), cur_indent( 0 ), insideFunction( false ), output( os ), printLabels( *this ), pretty( pretty ), genC( genC ), lineMarks( lineMarks ) {}
 
         CodeGenerator::CodeGenerator( std::ostream & os, std::string init, int indentation, bool infunp )
@@ -195 +204 @@
                 }
 
-                output << lineDirective( aggDecl ) << kind;
+                output << kind;
                 if ( aggDecl->get_name() != "" )
                         output << aggDecl->get_name();
@@ -700 +709 @@
         void CodeGenerator::visit( UntypedTupleExpr * tupleExpr ) {
                 assertf( ! genC, "UntypedTupleExpr should not reach code generation." );
+                extension( tupleExpr );
                 output << "[";
                 genCommaList( tupleExpr->get_exprs().begin(), tupleExpr->get_exprs().end() );
@@ -707 +717 @@
         void CodeGenerator::visit( TupleExpr * tupleExpr ) {
                 assertf( ! genC, "TupleExpr should not reach code generation." );
+                extension( tupleExpr );
                 output << "[";
                 genCommaList( tupleExpr->get_exprs().begin(), tupleExpr->get_exprs().end() );
                 output << "]";
+        }
+
+        void CodeGenerator::visit( TupleIndexExpr * tupleExpr ) {
+                assertf( ! genC, "TupleIndexExpr should not reach code generation." );
+                extension( tupleExpr );
+                tupleExpr->get_tuple()->accept( *this );
+                output << "." << tupleExpr->get_index();
         }
 

src/CodeGen/CodeGenerator.h

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Mar  1 16:20:04 2017
-// Update Count     : 50
+// Last Modified By : Andrew Beach
+// Last Modified On : Wed May 10 10:57:00 2017
+// Update Count     : 51
 //
 
@@ -25 +25 @@
 #include "SymTab/Indexer.h"
 
+#include "Common/utility.h"
+
 namespace CodeGen {
         class CodeGenerator : public Visitor {
@@ -30 +32 @@
                 static int tabsize;
 
-                CodeGenerator( std::ostream &os, bool pretty = false, bool genC = false );
+                CodeGenerator( std::ostream &os, bool pretty = false, bool genC = false, bool lineMarks = false );
                 CodeGenerator( std::ostream &os, std::string, int indent = 0, bool infun = false );
                 CodeGenerator( std::ostream &os, char *, int indent = 0, bool infun = false );
@@ -74 +76 @@
                 virtual void visit( UntypedTupleExpr *tupleExpr );
                 virtual void visit( TupleExpr *tupleExpr );
+                virtual void visit( TupleIndexExpr * tupleExpr );
                 virtual void visit( TypeExpr *typeExpr );
                 virtual void visit( AsmExpr * );
@@ -110 +113 @@
                 };
 
+                struct LineMarker {
+                        CodeLocation const & loc;
+                        bool toPrint;
+
+                        LineMarker(CodeLocation const & loc, bool toPrint);
+                };
+
+                LineMarker lineDirective(BaseSyntaxNode const * node);
+
                 void asmName( DeclarationWithType *decl );
 
@@ -122 +134 @@
                 bool pretty = false;  // pretty print
                 bool genC = false;    // true if output has to be C code
+                bool lineMarks = false;
 
                 void printDesignators( std::list< Expression * > & );
@@ -149 +162 @@
         /// returns C-compatible name of declaration
         std::string genName( DeclarationWithType * decl );
+
+        std::ostream & operator<<(std::ostream &,
+                CodeGenerator::LineMarker const &);
 } // namespace CodeGen
 

src/CodeGen/GenType.cc

@@ -28 +28 @@
         class GenType : public Visitor {
           public:
-                GenType( const std::string &typeString, bool pretty = false, bool genC = false );
+                GenType( const std::string &typeString, bool pretty = false, bool genC = false, bool lineMarks = false );
                 std::string get_typeString() const { return typeString; }
                 void set_typeString( const std::string &newValue ) { typeString = newValue; }
@@ -54 +54 @@
                 bool pretty = false; // pretty print
                 bool genC = false;   // generating C code?
+                bool lineMarks = false;
         };
 
-        std::string genType( Type *type, const std::string &baseString, bool pretty, bool genC ) {
-                GenType gt( baseString, pretty, genC );
+        std::string genType( Type *type, const std::string &baseString, bool pretty, bool genC , bool lineMarks ) {
+                GenType gt( baseString, pretty, genC, lineMarks );
                 std::ostringstream os;
 
                 if ( ! type->get_attributes().empty() ) {
-                        CodeGenerator cg( os, pretty, genC );
+                        CodeGenerator cg( os, pretty, genC, lineMarks );
                         cg.genAttributes( type->get_attributes() );
                 } // if
@@ -73 +74 @@
   }
 
-        GenType::GenType( const std::string &typeString, bool pretty, bool genC ) : typeString( typeString ), pretty( pretty ), genC( genC ) {}
+        GenType::GenType( const std::string &typeString, bool pretty, bool genC, bool lineMarks ) : typeString( typeString ), pretty( pretty ), genC( genC ), lineMarks( lineMarks ) {}
 
         void GenType::visit( VoidType *voidType ) {
@@ -114 +115 @@
                 } // if
                 if ( dimension != 0 ) {
-                        CodeGenerator cg( os, pretty, genC );
+                        CodeGenerator cg( os, pretty, genC, lineMarks );
                         dimension->accept( cg );
                 } else if ( isVarLen ) {
@@ -168 +169 @@
                         } // if
                 } else {
-                        CodeGenerator cg( os, pretty, genC );
+                        CodeGenerator cg( os, pretty, genC, lineMarks );
                         os << "(" ;
 
@@ -191 +192 @@
                         // assertf( ! genC, "Aggregate type parameters should not reach code generation." );
                         std::ostringstream os;
-                        CodeGenerator cg( os, pretty, genC );
+                        CodeGenerator cg( os, pretty, genC, lineMarks );
                         os << "forall(";
                         cg.genCommaList( funcType->get_forall().begin(), funcType->get_forall().end() );
@@ -202 +203 @@
                 if ( ! refType->get_parameters().empty() ) {
                         std::ostringstream os;
-                        CodeGenerator cg( os, pretty, genC );
+                        CodeGenerator cg( os, pretty, genC, lineMarks );
                         os << "(";
                         cg.genCommaList( refType->get_parameters().begin(), refType->get_parameters().end() );
@@ -242 +243 @@
                 for ( Type * t : *tupleType ) {
                         i++;
-                        os << genType( t, "", pretty, genC ) << (i == tupleType->size() ? "" : ", ");
+                        os << genType( t, "", pretty, genC, lineMarks ) << (i == tupleType->size() ? "" : ", ");
                 }
                 os << "]";

src/CodeGen/GenType.h

@@ -21 +21 @@
 
 namespace CodeGen {
-        std::string genType( Type *type, const std::string &baseString, bool pretty = false, bool genC = false );
+        std::string genType( Type *type, const std::string &baseString, bool pretty = false, bool genC = false, bool lineMarks = false );
   std::string genPrettyType( Type * type, const std::string & baseString );
 } // namespace CodeGen

src/CodeGen/Generate.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Jun  4 14:04:25 2015
-// Update Count     : 5
+// Last Modified By : Andrew Beach
+// Last Modified On : Wed May 19 13:05:00 2017
+// Update Count     : 6
 //
 
@@ -31 +31 @@
 
 namespace CodeGen {
-        void generate( std::list< Declaration* > translationUnit, std::ostream &os, bool doIntrinsics, bool pretty, bool generateC ) {
-                CodeGen::CodeGenerator cgv( os, pretty, generateC );
+        void generate( std::list< Declaration* > translationUnit, std::ostream &os, bool doIntrinsics, bool pretty, bool generateC, bool lineMarks ) {
+                CodeGen::CodeGenerator cgv( os, pretty, generateC, lineMarks );
                 for ( auto & dcl : translationUnit ) {
                         if ( LinkageSpec::isGeneratable( dcl->get_linkage() ) && (doIntrinsics || ! LinkageSpec::isBuiltin( dcl->get_linkage() ) ) ) {
+                                os << cgv.lineDirective(dcl);
                                 dcl->accept(cgv);
                                 if ( doSemicolon( dcl ) ) {
@@ -48 +49 @@
                         os << CodeGen::genPrettyType( type, "" );
                 } else {
-                        CodeGen::CodeGenerator cgv( os, true, false );
+                        CodeGen::CodeGenerator cgv( os, true, false, false );
                         node->accept( cgv );
                 }

src/CodeGen/Generate.h

@@ -24 +24 @@
 namespace CodeGen {
         /// Generates code. doIntrinsics determines if intrinsic functions are printed, pretty formats output nicely (e.g., uses unmangled names, etc.), generateC is true when the output must consist only of C code (allows some assertions, etc.)
-        void generate( std::list< Declaration* > translationUnit, std::ostream &os, bool doIntrinsics, bool pretty, bool generateC = false );
+        void generate( std::list< Declaration* > translationUnit, std::ostream &os, bool doIntrinsics, bool pretty, bool generateC = false , bool lineMarks = false );
 
         /// Generate code for a single node -- helpful for debugging in gdb

src/Common/utility.h

@@ -322 +322 @@
         std::string filename;
 
-    /// Create a new unset CodeLocation.
+        /// Create a new unset CodeLocation.
         CodeLocation()
                 : linenumber( -1 )
@@ -328 +328 @@
         {}
 
-    /// Create a new CodeLocation with the given values.
+        /// Create a new CodeLocation with the given values.
         CodeLocation( const char* filename, int lineno )
                 : linenumber( lineno )
@@ -334 +334 @@
         {}
 
-    bool isSet () const {
-        return -1 != linenumber;
-    }
-
-    bool isUnset () const {
-        return !isSet();
-    }
+        bool isSet () const {
+                return -1 != linenumber;
+        }
+
+        bool isUnset () const {
+                return !isSet();
+        }
 
         void unset () {
@@ -353 +353 @@
         return location.isSet() ? location.filename + ":" + std::to_string(location.linenumber) + " " : "";
 }
+
 #endif // _UTILITY_H
 

src/GenPoly/Box.cc

@@ -765 +765 @@
                                                 arg = new AddressExpr( arg );
                                         }
+                                        if ( ! ResolvExpr::typesCompatible( param, arg->get_result(), SymTab::Indexer() ) ) {
+                                                // silence warnings by casting boxed parameters when the actual type does not match up with the formal type.
+                                                arg = new CastExpr( arg, param->clone() );
+                                        }
                                 } else {
                                         // use type computed in unification to declare boxed variables
@@ -902 +906 @@
                                 } // if
                                 UntypedExpr *assign = new UntypedExpr( new NameExpr( "?=?" ) );
-                                UntypedExpr *deref = new UntypedExpr( new NameExpr( "*?" ) );
-                                deref->get_args().push_back( new CastExpr( new VariableExpr( *param++ ), new PointerType( Type::Qualifiers(), realType->get_returnVals().front()->get_type()->clone() ) ) );
+                                UntypedExpr *deref = UntypedExpr::createDeref( new CastExpr( new VariableExpr( *param++ ), new PointerType( Type::Qualifiers(), realType->get_returnVals().front()->get_type()->clone() ) ) );
                                 assign->get_args().push_back( deref );
                                 addAdapterParams( adapteeApp, arg, param, adapterType->get_parameters().end(), realParam, tyVars );
@@ -1217 +1220 @@
 
                 Statement * Pass1::mutate( ReturnStmt *returnStmt ) {
-                        // maybe need access to the env when mutating the expr
-                        if ( Expression * expr = returnStmt->get_expr() ) {
-                                if ( expr->get_env() ) {
-                                        env = expr->get_env();
-                                }
-                        }
-
                         if ( retval && returnStmt->get_expr() ) {
                                 assert( returnStmt->get_expr()->has_result() && ! returnStmt->get_expr()->get_result()->isVoid() );
@@ -1302 +1298 @@
                         FunctionType * ftype = functionDecl->get_functionType();
                         if ( ! ftype->get_returnVals().empty() && functionDecl->get_statements() ) {
-                                if ( functionDecl->get_name() != "?=?" && ! isPrefix( functionDecl->get_name(), "_thunk" ) && ! isPrefix( functionDecl->get_name(), "_adapter" ) ) { // xxx - remove check for ?=? once reference types are in; remove check for prefix once thunks properly use ctor/dtors
+                                if ( ! isPrefix( functionDecl->get_name(), "_thunk" ) && ! isPrefix( functionDecl->get_name(), "_adapter" ) ) { // xxx - remove check for prefix once thunks properly use ctor/dtors
                                         assert( ftype->get_returnVals().size() == 1 );
                                         DeclarationWithType * retval = ftype->get_returnVals().front();
@@ -1539 +1535 @@
                                         Type *declType = objectDecl->get_type();
                                         std::string bufName = bufNamer.newName();
-                                        ObjectDecl *newBuf = new ObjectDecl( bufName, Type::StorageClasses(), LinkageSpec::C, 0, 
-                                                new ArrayType( Type::Qualifiers(), new BasicType( Type::Qualifiers(), BasicType::Kind::Char), new NameExpr( sizeofName( mangleType(declType) ) ), 
+                                        ObjectDecl *newBuf = new ObjectDecl( bufName, Type::StorageClasses(), LinkageSpec::C, 0,
+                                                new ArrayType( Type::Qualifiers(), new BasicType( Type::Qualifiers(), BasicType::Kind::Char), new NameExpr( sizeofName( mangleType(declType) ) ),
                                                 true, false, std::list<Attribute*>{ new Attribute( std::string{"aligned"}, std::list<Expression*>{ new ConstantExpr( Constant::from_int(8) ) } ) } ), 0 );
                                         stmtsToAdd.push_back( new DeclStmt( noLabels, newBuf ) );
@@ -1578 +1574 @@
                 }
 
-                /// Returns an expression dereferenced n times
-                Expression *makeDerefdVar( Expression *derefdVar, long n ) {
-                        for ( int i = 1; i < n; ++i ) {
-                                UntypedExpr *derefExpr = new UntypedExpr( new NameExpr( "*?" ) );
-                                derefExpr->get_args().push_back( derefdVar );
-                                // xxx - should set results on derefExpr
-                                derefdVar = derefExpr;
-                        }
-                        return derefdVar;
-                }
-
                 Expression *PolyGenericCalculator::mutate( MemberExpr *memberExpr ) {
                         // mutate, exiting early if no longer MemberExpr
@@ -1595 +1580 @@
                         if ( ! memberExpr ) return expr;
 
-                        // get declaration for base struct, exiting early if not found
-                        int varDepth;
-                        VariableExpr *varExpr = getBaseVar( memberExpr->get_aggregate(), &varDepth );
-                        if ( ! varExpr ) return memberExpr;
-                        ObjectDecl *objectDecl = dynamic_cast< ObjectDecl* >( varExpr->get_var() );
-                        if ( ! objectDecl ) return memberExpr;
-
                         // only mutate member expressions for polymorphic types
                         int tyDepth;
-                        Type *objectType = hasPolyBase( objectDecl->get_type(), scopeTyVars, &tyDepth );
+                        Type *objectType = hasPolyBase( memberExpr->get_aggregate()->get_result(), scopeTyVars, &tyDepth );
                         if ( ! objectType ) return memberExpr;
                         findGeneric( objectType ); // ensure layout for this type is available
@@ -1622 +1600 @@
                                 fieldLoc->get_args().push_back( aggr );
                                 fieldLoc->get_args().push_back( makeOffsetIndex( objectType, i ) );
+                                fieldLoc->set_result( memberExpr->get_result()->clone() );
                                 newMemberExpr = fieldLoc;
                         } else if ( dynamic_cast< UnionInstType* >( objectType ) ) {
-                                // union members are all at offset zero, so build appropriately-dereferenced variable
-                                newMemberExpr = makeDerefdVar( varExpr->clone(), varDepth );
+                                // union members are all at offset zero, so just use the aggregate expr
+                                Expression * aggr = memberExpr->get_aggregate()->clone();
+                                delete aggr->get_env(); // xxx - there's a problem with keeping the env for some reason, so for now just get rid of it
+                                aggr->set_env( nullptr );
+                                newMemberExpr = aggr;
+                                newMemberExpr->set_result( memberExpr->get_result()->clone() );
                         } else return memberExpr;
                         assert( newMemberExpr );
@@ -1633 +1616 @@
                                 // Not all members of a polymorphic type are themselves of polymorphic type; in this case the member expression should be wrapped and dereferenced to form an lvalue
                                 CastExpr *ptrCastExpr = new CastExpr( newMemberExpr, new PointerType( Type::Qualifiers(), memberType->clone() ) );
-                                UntypedExpr *derefExpr = new UntypedExpr( new NameExpr( "*?" ) );
-                                derefExpr->get_args().push_back( ptrCastExpr );
+                                UntypedExpr *derefExpr = UntypedExpr::createDeref( ptrCastExpr );
                                 newMemberExpr = derefExpr;
                         }

src/InitTweak/FixInit.cc

@@ -361 +361 @@
                                         FunctionType * ftype = dynamic_cast< FunctionType * >( GenPoly::getFunctionType( funcDecl->get_type() ) );
                                         assert( ftype );
-                                        if ( (isConstructor( funcDecl->get_name() ) || funcDecl->get_name() == "?=?") && ftype->get_parameters().size() == 2 ) {
+                                        if ( isConstructor( funcDecl->get_name() ) && ftype->get_parameters().size() == 2 ) {
                                                 Type * t1 = ftype->get_parameters().front()->get_type();
                                                 Type * t2 = ftype->get_parameters().back()->get_type();
@@ -367 +367 @@
 
                                                 if ( ResolvExpr::typesCompatible( ptrType->get_base(), t2, SymTab::Indexer() ) ) {
-                                                        // optimization: don't need to copy construct in order to call a copy constructor or
-                                                        // assignment operator
+                                                        // optimization: don't need to copy construct in order to call a copy constructor
                                                         return appExpr;
                                                 } // if
@@ -636 +635 @@
                                 assert( ! stmtExpr->get_returnDecls().empty() );
                                 body->get_kids().push_back( new ExprStmt( noLabels, new VariableExpr( stmtExpr->get_returnDecls().front() ) ) );
-                        }
-                        stmtExpr->get_returnDecls().clear();
-                        stmtExpr->get_dtors().clear();
+                                stmtExpr->get_returnDecls().clear();
+                                stmtExpr->get_dtors().clear();
+                        }
+                        assert( stmtExpr->get_returnDecls().empty() );
+                        assert( stmtExpr->get_dtors().empty() );
                         return stmtExpr;
                 }
@@ -667 +668 @@
                         stmtsToAdd.splice( stmtsToAdd.end(), fixer.stmtsToAdd );
                         unqMap[unqExpr->get_id()] = unqExpr;
+                        if ( unqCount[ unqExpr->get_id() ] == 0 ) {  // insert destructor after the last use of the unique expression
+                                stmtsToAdd.splice( stmtsToAddAfter.end(), dtors[ unqExpr->get_id() ] );
+                        } else { // remember dtors for last instance of unique expr
+                                dtors[ unqExpr->get_id() ] = fixer.stmtsToAddAfter;
+                        }
                         if ( UntypedExpr * deref = dynamic_cast< UntypedExpr * >( unqExpr->get_expr() ) ) {
                                 // unique expression is now a dereference, because the inner expression is an lvalue returning function call.
@@ -675 +681 @@
                                 getCallArg( deref, 0 ) = unqExpr;
                                 addDeref.insert( unqExpr->get_id() );
-                                if ( unqCount[ unqExpr->get_id() ] == 0 ) {  // insert destructor after the last use of the unique expression
-                                        stmtsToAdd.splice( stmtsToAddAfter.end(), dtors[ unqExpr->get_id() ] );
-                                } else { // remember dtors for last instance of unique expr
-                                        dtors[ unqExpr->get_id() ] = fixer.stmtsToAddAfter;
-                                }
                                 return deref;
                         }

src/InitTweak/GenInit.cc

@@ -142 +142 @@
                 // hands off if the function returns an lvalue - we don't want to allocate a temporary if a variable's address
                 // is being returned
-                // Note: under the assumption that assignments return *this, checking for ?=? here is an optimization, since it shouldn't be necessary to copy construct `this`. This is a temporary optimization until reference types are added, at which point this should be removed, along with the analogous optimization in copy constructor generation.
-                if ( returnStmt->get_expr() && returnVals.size() == 1 && funcName != "?=?" && ! returnVals.front()->get_type()->get_lvalue() ) {
+                if ( returnStmt->get_expr() && returnVals.size() == 1 && ! returnVals.front()->get_type()->get_lvalue() ) {
                         // explicitly construct the return value using the return expression and the retVal object
                         assertf( returnVals.front()->get_name() != "", "Function %s has unnamed return value\n", funcName.c_str() );

src/main.cc

@@ +1 @@
+
 //
 // Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo
@@ -9 +10 @@
 // Author           : Richard C. Bilson
 // Created On       : Fri May 15 23:12:02 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Dec 14 14:35:54 2016
-// Update Count     : 436
+// Last Modified By : Andrew Beach
+// Last Modified On : Wed May 10 14:45:00 2017
+// Update Count     : 437
 //
 
@@ -79 +80 @@
         errorp = false,
         codegenp = false,
-        prettycodegenp = false;
+        prettycodegenp = false,
+        nolinemarks = false;
 
 static void parse_cmdline( int argc, char *argv[], const char *& filename );
@@ -310 +312 @@
 
                 CodeTools::fillLocations( translationUnit );
-                CodeGen::generate( translationUnit, *output, ! noprotop, prettycodegenp, true );
+                CodeGen::generate( translationUnit, *output, ! noprotop, prettycodegenp, true, ! nolinemarks );
 
                 CodeGen::FixMain::fix( *output, treep ? "../prelude/bootloader.c" : CFA_LIBDIR "/bootloader.c" );
@@ -336 +338 @@
         } catch ( CompilerError &e ) {
                 cerr << "Compiler Error: " << e.get_what() << endl;
-                cerr << "(please report bugs to " << endl;
+                cerr << "(please report bugs to [REDACTED])" << endl;
                 if ( output != &cout ) {
                         delete output;
@@ -375 +377 @@
 
         int c;
-        while ( (c = getopt_long( argc, argv, "abBcdefglmnpqrstTvyzZD:F:", long_opts, &long_index )) != -1 ) {
+        while ( (c = getopt_long( argc, argv, "abBcdefglLmnpqrstTvyzZD:F:", long_opts, &long_index )) != -1 ) {
                 switch ( c ) {
                   case Ast:
@@ -411 +413 @@
                   case 'l':                                                                             // generate libcfa.c
                         libcfap = true;
+                        break;
+                  case 'L':                                                                             // surpress lines marks
+                        nolinemarks = true;
                         break;
                   case Nopreamble:

src/prelude/Makefile.am

@@ -42 +42 @@
 
 bootloader.c : bootloader.cf prelude.cf extras.cf builtins.cf ${abs_top_srcdir}/src/driver/cfa-cpp
-        ${AM_V_GEN}${abs_top_srcdir}/src/driver/cfa-cpp -tpm bootloader.cf $@  # use src/cfa-cpp as not in lib until after install
+        ${AM_V_GEN}${abs_top_srcdir}/src/driver/cfa-cpp -tpmL bootloader.cf $@  # use src/cfa-cpp as not in lib until after install
 
 MAINTAINERCLEANFILES = builtins.c builtins.cf extras.cf bootloader.c ${addprefix ${libdir}/,${cfalib_DATA}} ${addprefix ${libdir}/,${lib_LIBRARIES}}

src/prelude/Makefile.in

@@ -439 +439 @@
 
 bootloader.c : bootloader.cf prelude.cf extras.cf builtins.cf ${abs_top_srcdir}/src/driver/cfa-cpp
-        ${AM_V_GEN}${abs_top_srcdir}/src/driver/cfa-cpp -tpm bootloader.cf $@  # use src/cfa-cpp as not in lib until after install
+        ${AM_V_GEN}${abs_top_srcdir}/src/driver/cfa-cpp -tpmL bootloader.cf $@  # use src/cfa-cpp as not in lib until after install
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.

src/tests/.expect/32/KRfunctions.txt

@@ -31 +31 @@
 }
 static inline struct S ___operator_assign__F2sS_P2sS2sS_autogen___1(struct S *___dst__P2sS_1, struct S ___src__2sS_1){
+    struct S ___ret__2sS_1;
     ((void)((*___dst__P2sS_1).__i__i_1=___src__2sS_1.__i__i_1));
-    return ((struct S )___src__2sS_1);
+    ((void)___constructor__F_P2sS2sS_autogen___1((&___ret__2sS_1), ___src__2sS_1));
+    return ((struct S )___ret__2sS_1);
 }
 static inline void ___constructor__F_P2sSi_autogen___1(struct S *___dst__P2sS_1, int __i__i_1){

src/tests/.expect/32/attributes.txt

@@ -22 +22 @@
 }
 static inline struct __anonymous0 ___operator_assign__F13s__anonymous0_P13s__anonymous013s__anonymous0_autogen___1(struct __anonymous0 *___dst__P13s__anonymous0_1, struct __anonymous0 ___src__13s__anonymous0_1){
-    return ((struct __anonymous0 )___src__13s__anonymous0_1);
+    struct __anonymous0 ___ret__13s__anonymous0_1;
+    ((void)___constructor__F_P13s__anonymous013s__anonymous0_autogen___1((&___ret__13s__anonymous0_1), ___src__13s__anonymous0_1));
+    return ((struct __anonymous0 )___ret__13s__anonymous0_1);
 }
 __attribute__ ((unused)) struct Agn1;
@@ -38 +40 @@
 }
 static inline struct Agn2 ___operator_assign__F5sAgn2_P5sAgn25sAgn2_autogen___1(struct Agn2 *___dst__P5sAgn2_1, struct Agn2 ___src__5sAgn2_1){
-    return ((struct Agn2 )___src__5sAgn2_1);
+    struct Agn2 ___ret__5sAgn2_1;
+    ((void)___constructor__F_P5sAgn25sAgn2_autogen___1((&___ret__5sAgn2_1), ___src__5sAgn2_1));
+    return ((struct Agn2 )___ret__5sAgn2_1);
 }
 enum __attribute__ ((unused)) __anonymous1 {
@@ -99 +103 @@
 }
 static inline struct Fdl ___operator_assign__F4sFdl_P4sFdl4sFdl_autogen___1(struct Fdl *___dst__P4sFdl_1, struct Fdl ___src__4sFdl_1){
+    struct Fdl ___ret__4sFdl_1;
     ((void)((*___dst__P4sFdl_1).__f1__i_1=___src__4sFdl_1.__f1__i_1));
     ((void)((*___dst__P4sFdl_1).__f2__i_1=___src__4sFdl_1.__f2__i_1));
@@ -108 +113 @@
     ((void)((*___dst__P4sFdl_1).__f8__i_1=___src__4sFdl_1.__f8__i_1));
     ((void)((*___dst__P4sFdl_1).__f9__Pi_1=___src__4sFdl_1.__f9__Pi_1));
-    return ((struct Fdl )___src__4sFdl_1);
+    ((void)___constructor__F_P4sFdl4sFdl_autogen___1((&___ret__4sFdl_1), ___src__4sFdl_1));
+    return ((struct Fdl )___ret__4sFdl_1);
 }
 static inline void ___constructor__F_P4sFdli_autogen___1(struct Fdl *___dst__P4sFdl_1, int __f1__i_1){
@@ -292 +298 @@
     }
     inline struct __anonymous4 ___operator_assign__F13s__anonymous4_P13s__anonymous413s__anonymous4_autogen___2(struct __anonymous4 *___dst__P13s__anonymous4_2, struct __anonymous4 ___src__13s__anonymous4_2){
+        struct __anonymous4 ___ret__13s__anonymous4_2;
         ((void)((*___dst__P13s__anonymous4_2).__i__i_2=___src__13s__anonymous4_2.__i__i_2));
-        return ((struct __anonymous4 )___src__13s__anonymous4_2);
+        ((void)___constructor__F_P13s__anonymous413s__anonymous4_autogen___2((&___ret__13s__anonymous4_2), ___src__13s__anonymous4_2));
+        return ((struct __anonymous4 )___ret__13s__anonymous4_2);
     }
     inline void ___constructor__F_P13s__anonymous4i_autogen___2(struct __anonymous4 *___dst__P13s__anonymous4_2, int __i__i_2){
@@ -310 +318 @@
     }
     inline enum __anonymous5 ___operator_assign__F13e__anonymous5_P13e__anonymous513e__anonymous5_intrinsic___2(enum __anonymous5 *___dst__P13e__anonymous5_2, enum __anonymous5 ___src__13e__anonymous5_2){
-        return ((enum __anonymous5 )((*___dst__P13e__anonymous5_2)=___src__13e__anonymous5_2));
+        enum __anonymous5 ___ret__13e__anonymous5_2;
+        ((void)(___ret__13e__anonymous5_2=((*___dst__P13e__anonymous5_2)=___src__13e__anonymous5_2)) /* ?{} */);
+        return ((enum __anonymous5 )___ret__13e__anonymous5_2);
     }
     ((void)sizeof(enum __anonymous5 ));
@@ -338 +348 @@
 }
 static inline struct Vad ___operator_assign__F4sVad_P4sVad4sVad_autogen___1(struct Vad *___dst__P4sVad_1, struct Vad ___src__4sVad_1){
-    return ((struct Vad )___src__4sVad_1);
-}
+    struct Vad ___ret__4sVad_1;
+    ((void)___constructor__F_P4sVad4sVad_autogen___1((&___ret__4sVad_1), ___src__4sVad_1));
+    return ((struct Vad )___ret__4sVad_1);
+}

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

@@ -30 +30 @@
 }
 static inline struct __anonymous0 ___operator_assign__F13s__anonymous0_P13s__anonymous013s__anonymous0_autogen___1(struct __anonymous0 *___dst__P13s__anonymous0_1, struct __anonymous0 ___src__13s__anonymous0_1){
+    struct __anonymous0 ___ret__13s__anonymous0_1;
     ((void)((*___dst__P13s__anonymous0_1).__i__i_1=___src__13s__anonymous0_1.__i__i_1));
-    return ((struct __anonymous0 )___src__13s__anonymous0_1);
+    ((void)___constructor__F_P13s__anonymous013s__anonymous0_autogen___1((&___ret__13s__anonymous0_1), ___src__13s__anonymous0_1));
+    return ((struct __anonymous0 )___ret__13s__anonymous0_1);
 }
 static inline void ___constructor__F_P13s__anonymous0i_autogen___1(struct __anonymous0 *___dst__P13s__anonymous0_1, int __i__i_1){
@@ -54 +56 @@
 }
 static inline struct __anonymous1 ___operator_assign__F13s__anonymous1_P13s__anonymous113s__anonymous1_autogen___1(struct __anonymous1 *___dst__P13s__anonymous1_1, struct __anonymous1 ___src__13s__anonymous1_1){
+    struct __anonymous1 ___ret__13s__anonymous1_1;
     ((void)((*___dst__P13s__anonymous1_1).__i__i_1=___src__13s__anonymous1_1.__i__i_1));
-    return ((struct __anonymous1 )___src__13s__anonymous1_1);
+    ((void)___constructor__F_P13s__anonymous113s__anonymous1_autogen___1((&___ret__13s__anonymous1_1), ___src__13s__anonymous1_1));
+    return ((struct __anonymous1 )___ret__13s__anonymous1_1);
 }
 static inline void ___constructor__F_P13s__anonymous1i_autogen___1(struct __anonymous1 *___dst__P13s__anonymous1_1, int __i__i_1){
@@ -78 +82 @@
 }
 static inline struct __anonymous2 ___operator_assign__F13s__anonymous2_P13s__anonymous213s__anonymous2_autogen___1(struct __anonymous2 *___dst__P13s__anonymous2_1, struct __anonymous2 ___src__13s__anonymous2_1){
+    struct __anonymous2 ___ret__13s__anonymous2_1;
     ((void)((*___dst__P13s__anonymous2_1).__i__i_1=___src__13s__anonymous2_1.__i__i_1));
-    return ((struct __anonymous2 )___src__13s__anonymous2_1);
+    ((void)___constructor__F_P13s__anonymous213s__anonymous2_autogen___1((&___ret__13s__anonymous2_1), ___src__13s__anonymous2_1));
+    return ((struct __anonymous2 )___ret__13s__anonymous2_1);
 }
 static inline void ___constructor__F_P13s__anonymous2i_autogen___1(struct __anonymous2 *___dst__P13s__anonymous2_1, int __i__i_1){
@@ -102 +108 @@
 }
 static inline struct __anonymous3 ___operator_assign__F13s__anonymous3_P13s__anonymous313s__anonymous3_autogen___1(struct __anonymous3 *___dst__P13s__anonymous3_1, struct __anonymous3 ___src__13s__anonymous3_1){
+    struct __anonymous3 ___ret__13s__anonymous3_1;
     ((void)((*___dst__P13s__anonymous3_1).__i__i_1=___src__13s__anonymous3_1.__i__i_1));
-    return ((struct __anonymous3 )___src__13s__anonymous3_1);
+    ((void)___constructor__F_P13s__anonymous313s__anonymous3_autogen___1((&___ret__13s__anonymous3_1), ___src__13s__anonymous3_1));
+    return ((struct __anonymous3 )___ret__13s__anonymous3_1);
 }
 static inline void ___constructor__F_P13s__anonymous3i_autogen___1(struct __anonymous3 *___dst__P13s__anonymous3_1, int __i__i_1){
@@ -126 +134 @@
 }
 static inline struct __anonymous4 ___operator_assign__F13s__anonymous4_P13s__anonymous413s__anonymous4_autogen___1(struct __anonymous4 *___dst__P13s__anonymous4_1, struct __anonymous4 ___src__13s__anonymous4_1){
+    struct __anonymous4 ___ret__13s__anonymous4_1;
     ((void)((*___dst__P13s__anonymous4_1).__i__i_1=___src__13s__anonymous4_1.__i__i_1));
-    return ((struct __anonymous4 )___src__13s__anonymous4_1);
+    ((void)___constructor__F_P13s__anonymous413s__anonymous4_autogen___1((&___ret__13s__anonymous4_1), ___src__13s__anonymous4_1));
+    return ((struct __anonymous4 )___ret__13s__anonymous4_1);
 }
 static inline void ___constructor__F_P13s__anonymous4i_autogen___1(struct __anonymous4 *___dst__P13s__anonymous4_1, int __i__i_1){
@@ -150 +160 @@
 }
 static inline struct __anonymous5 ___operator_assign__F13s__anonymous5_P13s__anonymous513s__anonymous5_autogen___1(struct __anonymous5 *___dst__P13s__anonymous5_1, struct __anonymous5 ___src__13s__anonymous5_1){
+    struct __anonymous5 ___ret__13s__anonymous5_1;
     ((void)((*___dst__P13s__anonymous5_1).__i__i_1=___src__13s__anonymous5_1.__i__i_1));
-    return ((struct __anonymous5 )___src__13s__anonymous5_1);
+    ((void)___constructor__F_P13s__anonymous513s__anonymous5_autogen___1((&___ret__13s__anonymous5_1), ___src__13s__anonymous5_1));
+    return ((struct __anonymous5 )___ret__13s__anonymous5_1);
 }
 static inline void ___constructor__F_P13s__anonymous5i_autogen___1(struct __anonymous5 *___dst__P13s__anonymous5_1, int __i__i_1){
@@ -174 +186 @@
 }
 static inline struct __anonymous6 ___operator_assign__F13s__anonymous6_P13s__anonymous613s__anonymous6_autogen___1(struct __anonymous6 *___dst__P13s__anonymous6_1, struct __anonymous6 ___src__13s__anonymous6_1){
+    struct __anonymous6 ___ret__13s__anonymous6_1;
     ((void)((*___dst__P13s__anonymous6_1).__i__i_1=___src__13s__anonymous6_1.__i__i_1));
-    return ((struct __anonymous6 )___src__13s__anonymous6_1);
+    ((void)___constructor__F_P13s__anonymous613s__anonymous6_autogen___1((&___ret__13s__anonymous6_1), ___src__13s__anonymous6_1));
+    return ((struct __anonymous6 )___ret__13s__anonymous6_1);
 }
 static inline void ___constructor__F_P13s__anonymous6i_autogen___1(struct __anonymous6 *___dst__P13s__anonymous6_1, int __i__i_1){
@@ -198 +212 @@
 }
 static inline struct __anonymous7 ___operator_assign__F13s__anonymous7_P13s__anonymous713s__anonymous7_autogen___1(struct __anonymous7 *___dst__P13s__anonymous7_1, struct __anonymous7 ___src__13s__anonymous7_1){
+    struct __anonymous7 ___ret__13s__anonymous7_1;
     ((void)((*___dst__P13s__anonymous7_1).__i__i_1=___src__13s__anonymous7_1.__i__i_1));
-    return ((struct __anonymous7 )___src__13s__anonymous7_1);
+    ((void)___constructor__F_P13s__anonymous713s__anonymous7_autogen___1((&___ret__13s__anonymous7_1), ___src__13s__anonymous7_1));
+    return ((struct __anonymous7 )___ret__13s__anonymous7_1);
 }
 static inline void ___constructor__F_P13s__anonymous7i_autogen___1(struct __anonymous7 *___dst__P13s__anonymous7_1, int __i__i_1){
@@ -230 +246 @@
 }
 static inline struct __anonymous8 ___operator_assign__F13s__anonymous8_P13s__anonymous813s__anonymous8_autogen___1(struct __anonymous8 *___dst__P13s__anonymous8_1, struct __anonymous8 ___src__13s__anonymous8_1){
+    struct __anonymous8 ___ret__13s__anonymous8_1;
     ((void)((*___dst__P13s__anonymous8_1).__i__s_1=___src__13s__anonymous8_1.__i__s_1));
-    return ((struct __anonymous8 )___src__13s__anonymous8_1);
+    ((void)___constructor__F_P13s__anonymous813s__anonymous8_autogen___1((&___ret__13s__anonymous8_1), ___src__13s__anonymous8_1));
+    return ((struct __anonymous8 )___ret__13s__anonymous8_1);
 }
 static inline void ___constructor__F_P13s__anonymous8s_autogen___1(struct __anonymous8 *___dst__P13s__anonymous8_1, short __i__s_1){
@@ -254 +272 @@
 }
 static inline struct __anonymous9 ___operator_assign__F13s__anonymous9_P13s__anonymous913s__anonymous9_autogen___1(struct __anonymous9 *___dst__P13s__anonymous9_1, struct __anonymous9 ___src__13s__anonymous9_1){
+    struct __anonymous9 ___ret__13s__anonymous9_1;
     ((void)((*___dst__P13s__anonymous9_1).__i__s_1=___src__13s__anonymous9_1.__i__s_1));
-    return ((struct __anonymous9 )___src__13s__anonymous9_1);
+    ((void)___constructor__F_P13s__anonymous913s__anonymous9_autogen___1((&___ret__13s__anonymous9_1), ___src__13s__anonymous9_1));
+    return ((struct __anonymous9 )___ret__13s__anonymous9_1);
 }
 static inline void ___constructor__F_P13s__anonymous9s_autogen___1(struct __anonymous9 *___dst__P13s__anonymous9_1, short __i__s_1){
@@ -278 +298 @@
 }
 static inline struct __anonymous10 ___operator_assign__F14s__anonymous10_P14s__anonymous1014s__anonymous10_autogen___1(struct __anonymous10 *___dst__P14s__anonymous10_1, struct __anonymous10 ___src__14s__anonymous10_1){
+    struct __anonymous10 ___ret__14s__anonymous10_1;
     ((void)((*___dst__P14s__anonymous10_1).__i__s_1=___src__14s__anonymous10_1.__i__s_1));
-    return ((struct __anonymous10 )___src__14s__anonymous10_1);
+    ((void)___constructor__F_P14s__anonymous1014s__anonymous10_autogen___1((&___ret__14s__anonymous10_1), ___src__14s__anonymous10_1));
+    return ((struct __anonymous10 )___ret__14s__anonymous10_1);
 }
 static inline void ___constructor__F_P14s__anonymous10s_autogen___1(struct __anonymous10 *___dst__P14s__anonymous10_1, short __i__s_1){
@@ -302 +324 @@
 }
 static inline struct __anonymous11 ___operator_assign__F14s__anonymous11_P14s__anonymous1114s__anonymous11_autogen___1(struct __anonymous11 *___dst__P14s__anonymous11_1, struct __anonymous11 ___src__14s__anonymous11_1){
+    struct __anonymous11 ___ret__14s__anonymous11_1;
     ((void)((*___dst__P14s__anonymous11_1).__i__s_1=___src__14s__anonymous11_1.__i__s_1));
-    return ((struct __anonymous11 )___src__14s__anonymous11_1);
+    ((void)___constructor__F_P14s__anonymous1114s__anonymous11_autogen___1((&___ret__14s__anonymous11_1), ___src__14s__anonymous11_1));
+    return ((struct __anonymous11 )___ret__14s__anonymous11_1);
 }
 static inline void ___constructor__F_P14s__anonymous11s_autogen___1(struct __anonymous11 *___dst__P14s__anonymous11_1, short __i__s_1){
@@ -326 +350 @@
 }
 static inline struct __anonymous12 ___operator_assign__F14s__anonymous12_P14s__anonymous1214s__anonymous12_autogen___1(struct __anonymous12 *___dst__P14s__anonymous12_1, struct __anonymous12 ___src__14s__anonymous12_1){
+    struct __anonymous12 ___ret__14s__anonymous12_1;
     ((void)((*___dst__P14s__anonymous12_1).__i__s_1=___src__14s__anonymous12_1.__i__s_1));
-    return ((struct __anonymous12 )___src__14s__anonymous12_1);
+    ((void)___constructor__F_P14s__anonymous1214s__anonymous12_autogen___1((&___ret__14s__anonymous12_1), ___src__14s__anonymous12_1));
+    return ((struct __anonymous12 )___ret__14s__anonymous12_1);
 }
 static inline void ___constructor__F_P14s__anonymous12s_autogen___1(struct __anonymous12 *___dst__P14s__anonymous12_1, short __i__s_1){
@@ -350 +376 @@
 }
 static inline struct __anonymous13 ___operator_assign__F14s__anonymous13_P14s__anonymous1314s__anonymous13_autogen___1(struct __anonymous13 *___dst__P14s__anonymous13_1, struct __anonymous13 ___src__14s__anonymous13_1){
+    struct __anonymous13 ___ret__14s__anonymous13_1;
     ((void)((*___dst__P14s__anonymous13_1).__i__s_1=___src__14s__anonymous13_1.__i__s_1));
-    return ((struct __anonymous13 )___src__14s__anonymous13_1);
+    ((void)___constructor__F_P14s__anonymous1314s__anonymous13_autogen___1((&___ret__14s__anonymous13_1), ___src__14s__anonymous13_1));
+    return ((struct __anonymous13 )___ret__14s__anonymous13_1);
 }
 static inline void ___constructor__F_P14s__anonymous13s_autogen___1(struct __anonymous13 *___dst__P14s__anonymous13_1, short __i__s_1){
@@ -374 +402 @@
 }
 static inline struct __anonymous14 ___operator_assign__F14s__anonymous14_P14s__anonymous1414s__anonymous14_autogen___1(struct __anonymous14 *___dst__P14s__anonymous14_1, struct __anonymous14 ___src__14s__anonymous14_1){
+    struct __anonymous14 ___ret__14s__anonymous14_1;
     ((void)((*___dst__P14s__anonymous14_1).__i__s_1=___src__14s__anonymous14_1.__i__s_1));
-    return ((struct __anonymous14 )___src__14s__anonymous14_1);
+    ((void)___constructor__F_P14s__anonymous1414s__anonymous14_autogen___1((&___ret__14s__anonymous14_1), ___src__14s__anonymous14_1));
+    return ((struct __anonymous14 )___ret__14s__anonymous14_1);
 }
 static inline void ___constructor__F_P14s__anonymous14s_autogen___1(struct __anonymous14 *___dst__P14s__anonymous14_1, short __i__s_1){
@@ -398 +428 @@
 }
 static inline struct __anonymous15 ___operator_assign__F14s__anonymous15_P14s__anonymous1514s__anonymous15_autogen___1(struct __anonymous15 *___dst__P14s__anonymous15_1, struct __anonymous15 ___src__14s__anonymous15_1){
+    struct __anonymous15 ___ret__14s__anonymous15_1;
     ((void)((*___dst__P14s__anonymous15_1).__i__s_1=___src__14s__anonymous15_1.__i__s_1));
-    return ((struct __anonymous15 )___src__14s__anonymous15_1);
+    ((void)___constructor__F_P14s__anonymous1514s__anonymous15_autogen___1((&___ret__14s__anonymous15_1), ___src__14s__anonymous15_1));
+    return ((struct __anonymous15 )___ret__14s__anonymous15_1);
 }
 static inline void ___constructor__F_P14s__anonymous15s_autogen___1(struct __anonymous15 *___dst__P14s__anonymous15_1, short __i__s_1){
@@ -438 +470 @@
 }
 static inline struct __anonymous16 ___operator_assign__F14s__anonymous16_P14s__anonymous1614s__anonymous16_autogen___1(struct __anonymous16 *___dst__P14s__anonymous16_1, struct __anonymous16 ___src__14s__anonymous16_1){
+    struct __anonymous16 ___ret__14s__anonymous16_1;
     ((void)((*___dst__P14s__anonymous16_1).__i__i_1=___src__14s__anonymous16_1.__i__i_1));
-    return ((struct __anonymous16 )___src__14s__anonymous16_1);
+    ((void)___constructor__F_P14s__anonymous1614s__anonymous16_autogen___1((&___ret__14s__anonymous16_1), ___src__14s__anonymous16_1));
+    return ((struct __anonymous16 )___ret__14s__anonymous16_1);
 }
 static inline void ___constructor__F_P14s__anonymous16i_autogen___1(struct __anonymous16 *___dst__P14s__anonymous16_1, int __i__i_1){
@@ -462 +496 @@
 }
 static inline struct __anonymous17 ___operator_assign__F14s__anonymous17_P14s__anonymous1714s__anonymous17_autogen___1(struct __anonymous17 *___dst__P14s__anonymous17_1, struct __anonymous17 ___src__14s__anonymous17_1){
+    struct __anonymous17 ___ret__14s__anonymous17_1;
     ((void)((*___dst__P14s__anonymous17_1).__i__i_1=___src__14s__anonymous17_1.__i__i_1));
-    return ((struct __anonymous17 )___src__14s__anonymous17_1);
+    ((void)___constructor__F_P14s__anonymous1714s__anonymous17_autogen___1((&___ret__14s__anonymous17_1), ___src__14s__anonymous17_1));
+    return ((struct __anonymous17 )___ret__14s__anonymous17_1);
 }
 static inline void ___constructor__F_P14s__anonymous17i_autogen___1(struct __anonymous17 *___dst__P14s__anonymous17_1, int __i__i_1){
@@ -486 +522 @@
 }
 static inline struct __anonymous18 ___operator_assign__F14s__anonymous18_P14s__anonymous1814s__anonymous18_autogen___1(struct __anonymous18 *___dst__P14s__anonymous18_1, struct __anonymous18 ___src__14s__anonymous18_1){
+    struct __anonymous18 ___ret__14s__anonymous18_1;
     ((void)((*___dst__P14s__anonymous18_1).__i__i_1=___src__14s__anonymous18_1.__i__i_1));
-    return ((struct __anonymous18 )___src__14s__anonymous18_1);
+    ((void)___constructor__F_P14s__anonymous1814s__anonymous18_autogen___1((&___ret__14s__anonymous18_1), ___src__14s__anonymous18_1));
+    return ((struct __anonymous18 )___ret__14s__anonymous18_1);
 }
 static inline void ___constructor__F_P14s__anonymous18i_autogen___1(struct __anonymous18 *___dst__P14s__anonymous18_1, int __i__i_1){
@@ -510 +548 @@
 }
 static inline struct __anonymous19 ___operator_assign__F14s__anonymous19_P14s__anonymous1914s__anonymous19_autogen___1(struct __anonymous19 *___dst__P14s__anonymous19_1, struct __anonymous19 ___src__14s__anonymous19_1){
+    struct __anonymous19 ___ret__14s__anonymous19_1;
     ((void)((*___dst__P14s__anonymous19_1).__i__i_1=___src__14s__anonymous19_1.__i__i_1));
-    return ((struct __anonymous19 )___src__14s__anonymous19_1);
+    ((void)___constructor__F_P14s__anonymous1914s__anonymous19_autogen___1((&___ret__14s__anonymous19_1), ___src__14s__anonymous19_1));
+    return ((struct __anonymous19 )___ret__14s__anonymous19_1);
 }
 static inline void ___constructor__F_P14s__anonymous19i_autogen___1(struct __anonymous19 *___dst__P14s__anonymous19_1, int __i__i_1){
@@ -534 +574 @@
 }
 static inline struct __anonymous20 ___operator_assign__F14s__anonymous20_P14s__anonymous2014s__anonymous20_autogen___1(struct __anonymous20 *___dst__P14s__anonymous20_1, struct __anonymous20 ___src__14s__anonymous20_1){
+    struct __anonymous20 ___ret__14s__anonymous20_1;
     ((void)((*___dst__P14s__anonymous20_1).__i__i_1=___src__14s__anonymous20_1.__i__i_1));
-    return ((struct __anonymous20 )___src__14s__anonymous20_1);
+    ((void)___constructor__F_P14s__anonymous2014s__anonymous20_autogen___1((&___ret__14s__anonymous20_1), ___src__14s__anonymous20_1));
+    return ((struct __anonymous20 )___ret__14s__anonymous20_1);
 }
 static inline void ___constructor__F_P14s__anonymous20i_autogen___1(struct __anonymous20 *___dst__P14s__anonymous20_1, int __i__i_1){
@@ -558 +600 @@
 }
 static inline struct __anonymous21 ___operator_assign__F14s__anonymous21_P14s__anonymous2114s__anonymous21_autogen___1(struct __anonymous21 *___dst__P14s__anonymous21_1, struct __anonymous21 ___src__14s__anonymous21_1){
+    struct __anonymous21 ___ret__14s__anonymous21_1;
     ((void)((*___dst__P14s__anonymous21_1).__i__i_1=___src__14s__anonymous21_1.__i__i_1));
-    return ((struct __anonymous21 )___src__14s__anonymous21_1);
+    ((void)___constructor__F_P14s__anonymous2114s__anonymous21_autogen___1((&___ret__14s__anonymous21_1), ___src__14s__anonymous21_1));
+    return ((struct __anonymous21 )___ret__14s__anonymous21_1);
 }
 static inline void ___constructor__F_P14s__anonymous21i_autogen___1(struct __anonymous21 *___dst__P14s__anonymous21_1, int __i__i_1){
@@ -582 +626 @@
 }
 static inline struct __anonymous22 ___operator_assign__F14s__anonymous22_P14s__anonymous2214s__anonymous22_autogen___1(struct __anonymous22 *___dst__P14s__anonymous22_1, struct __anonymous22 ___src__14s__anonymous22_1){
+    struct __anonymous22 ___ret__14s__anonymous22_1;
     ((void)((*___dst__P14s__anonymous22_1).__i__i_1=___src__14s__anonymous22_1.__i__i_1));
-    return ((struct __anonymous22 )___src__14s__anonymous22_1);
+    ((void)___constructor__F_P14s__anonymous2214s__anonymous22_autogen___1((&___ret__14s__anonymous22_1), ___src__14s__anonymous22_1));
+    return ((struct __anonymous22 )___ret__14s__anonymous22_1);
 }
 static inline void ___constructor__F_P14s__anonymous22i_autogen___1(struct __anonymous22 *___dst__P14s__anonymous22_1, int __i__i_1){
@@ -606 +652 @@
 }
 static inline struct __anonymous23 ___operator_assign__F14s__anonymous23_P14s__anonymous2314s__anonymous23_autogen___1(struct __anonymous23 *___dst__P14s__anonymous23_1, struct __anonymous23 ___src__14s__anonymous23_1){
+    struct __anonymous23 ___ret__14s__anonymous23_1;
     ((void)((*___dst__P14s__anonymous23_1).__i__i_1=___src__14s__anonymous23_1.__i__i_1));
-    return ((struct __anonymous23 )___src__14s__anonymous23_1);
+    ((void)___constructor__F_P14s__anonymous2314s__anonymous23_autogen___1((&___ret__14s__anonymous23_1), ___src__14s__anonymous23_1));
+    return ((struct __anonymous23 )___ret__14s__anonymous23_1);
 }
 static inline void ___constructor__F_P14s__anonymous23i_autogen___1(struct __anonymous23 *___dst__P14s__anonymous23_1, int __i__i_1){

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

@@ -33 +33 @@
 }
 static inline struct S ___operator_assign__F2sS_P2sS2sS_autogen___1(struct S *___dst__P2sS_1, struct S ___src__2sS_1){
+    struct S ___ret__2sS_1;
     ((void)((*___dst__P2sS_1).__a__i_1=___src__2sS_1.__a__i_1));
     ((void)((*___dst__P2sS_1).__b__i_1=___src__2sS_1.__b__i_1));
     ((void)((*___dst__P2sS_1).__c__i_1=___src__2sS_1.__c__i_1));
-    return ((struct S )___src__2sS_1);
+    ((void)___constructor__F_P2sS2sS_autogen___1((&___ret__2sS_1), ___src__2sS_1));
+    return ((struct S )___ret__2sS_1);
 }
 static inline void ___constructor__F_P2sSi_autogen___1(struct S *___dst__P2sS_1, int __a__i_1){
@@ -66 +68 @@
 }
 static inline union U ___operator_assign__F2uU_P2uU2uU_autogen___1(union U *___dst__P2uU_1, union U ___src__2uU_1){
+    union U ___ret__2uU_1;
     ((void)__builtin_memcpy(((void *)___dst__P2uU_1), ((const void *)(&___src__2uU_1)), sizeof(union U )));
-    return ((union U )___src__2uU_1);
+    ((void)___constructor__F_P2uU2uU_autogen___1((&___ret__2uU_1), ___src__2uU_1));
+    return ((union U )___ret__2uU_1);
 }
 static inline void ___constructor__F_P2uUi_autogen___1(union U *___dst__P2uU_1, int __src__i_1){

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

@@ -59 +59 @@
     }
     inline struct S ___operator_assign__F2sS_P2sS2sS_autogen___2(struct S *___dst__P2sS_2, struct S ___src__2sS_2){
+        struct S ___ret__2sS_2;
         ((void)((*___dst__P2sS_2).__a__i_2=___src__2sS_2.__a__i_2));
         ((void)((*___dst__P2sS_2).__b__i_2=___src__2sS_2.__b__i_2));
         ((void)((*___dst__P2sS_2).__c__i_2=___src__2sS_2.__c__i_2));
-        return ((struct S )___src__2sS_2);
+        ((void)___constructor__F_P2sS2sS_autogen___2((&___ret__2sS_2), ___src__2sS_2));
+        return ((struct S )___ret__2sS_2);
     }
     inline void ___constructor__F_P2sSi_autogen___2(struct S *___dst__P2sS_2, int __a__i_2){
@@ -109 +111 @@
     }
     inline struct s2 ___operator_assign__F3ss2_P3ss23ss2_autogen___2(struct s2 *___dst__P3ss2_2, struct s2 ___src__3ss2_2){
+        struct s2 ___ret__3ss2_2;
         ((void)((*___dst__P3ss2_2).__i__i_2=___src__3ss2_2.__i__i_2));
-        return ((struct s2 )___src__3ss2_2);
+        ((void)___constructor__F_P3ss23ss2_autogen___2((&___ret__3ss2_2), ___src__3ss2_2));
+        return ((struct s2 )___ret__3ss2_2);
     }
     inline void ___constructor__F_P3ss2i_autogen___2(struct s2 *___dst__P3ss2_2, int __i__i_2){
@@ -128 +132 @@
     }
     inline struct s3 ___operator_assign__F3ss3_P3ss33ss3_autogen___2(struct s3 *___dst__P3ss3_2, struct s3 ___src__3ss3_2){
+        struct s3 ___ret__3ss3_2;
         ((void)((*___dst__P3ss3_2).__i__i_2=___src__3ss3_2.__i__i_2));
-        return ((struct s3 )___src__3ss3_2);
+        ((void)___constructor__F_P3ss33ss3_autogen___2((&___ret__3ss3_2), ___src__3ss3_2));
+        return ((struct s3 )___ret__3ss3_2);
     }
     inline void ___constructor__F_P3ss3i_autogen___2(struct s3 *___dst__P3ss3_2, int __i__i_2){
@@ -149 +155 @@
     }
     inline struct s4 ___operator_assign__F3ss4_P3ss43ss4_autogen___2(struct s4 *___dst__P3ss4_2, struct s4 ___src__3ss4_2){
+        struct s4 ___ret__3ss4_2;
         ((void)((*___dst__P3ss4_2).__i__i_2=___src__3ss4_2.__i__i_2));
-        return ((struct s4 )___src__3ss4_2);
+        ((void)___constructor__F_P3ss43ss4_autogen___2((&___ret__3ss4_2), ___src__3ss4_2));
+        return ((struct s4 )___ret__3ss4_2);
     }
     inline void ___constructor__F_P3ss4i_autogen___2(struct s4 *___dst__P3ss4_2, int __i__i_2){

src/tests/.expect/64/KRfunctions.txt

@@ -31 +31 @@
 }
 static inline struct S ___operator_assign__F2sS_P2sS2sS_autogen___1(struct S *___dst__P2sS_1, struct S ___src__2sS_1){
+    struct S ___ret__2sS_1;
     ((void)((*___dst__P2sS_1).__i__i_1=___src__2sS_1.__i__i_1));
-    return ((struct S )___src__2sS_1);
+    ((void)___constructor__F_P2sS2sS_autogen___1((&___ret__2sS_1), ___src__2sS_1));
+    return ((struct S )___ret__2sS_1);
 }
 static inline void ___constructor__F_P2sSi_autogen___1(struct S *___dst__P2sS_1, int __i__i_1){

src/tests/.expect/64/attributes.txt

@@ -22 +22 @@
 }
 static inline struct __anonymous0 ___operator_assign__F13s__anonymous0_P13s__anonymous013s__anonymous0_autogen___1(struct __anonymous0 *___dst__P13s__anonymous0_1, struct __anonymous0 ___src__13s__anonymous0_1){
-    return ((struct __anonymous0 )___src__13s__anonymous0_1);
+    struct __anonymous0 ___ret__13s__anonymous0_1;
+    ((void)___constructor__F_P13s__anonymous013s__anonymous0_autogen___1((&___ret__13s__anonymous0_1), ___src__13s__anonymous0_1));
+    return ((struct __anonymous0 )___ret__13s__anonymous0_1);
 }
 __attribute__ ((unused)) struct Agn1;
@@ -38 +40 @@
 }
 static inline struct Agn2 ___operator_assign__F5sAgn2_P5sAgn25sAgn2_autogen___1(struct Agn2 *___dst__P5sAgn2_1, struct Agn2 ___src__5sAgn2_1){
-    return ((struct Agn2 )___src__5sAgn2_1);
+    struct Agn2 ___ret__5sAgn2_1;
+    ((void)___constructor__F_P5sAgn25sAgn2_autogen___1((&___ret__5sAgn2_1), ___src__5sAgn2_1));
+    return ((struct Agn2 )___ret__5sAgn2_1);
 }
 enum __attribute__ ((unused)) __anonymous1 {
@@ -99 +103 @@
 }
 static inline struct Fdl ___operator_assign__F4sFdl_P4sFdl4sFdl_autogen___1(struct Fdl *___dst__P4sFdl_1, struct Fdl ___src__4sFdl_1){
+    struct Fdl ___ret__4sFdl_1;
     ((void)((*___dst__P4sFdl_1).__f1__i_1=___src__4sFdl_1.__f1__i_1));
     ((void)((*___dst__P4sFdl_1).__f2__i_1=___src__4sFdl_1.__f2__i_1));
@@ -108 +113 @@
     ((void)((*___dst__P4sFdl_1).__f8__i_1=___src__4sFdl_1.__f8__i_1));
     ((void)((*___dst__P4sFdl_1).__f9__Pi_1=___src__4sFdl_1.__f9__Pi_1));
-    return ((struct Fdl )___src__4sFdl_1);
+    ((void)___constructor__F_P4sFdl4sFdl_autogen___1((&___ret__4sFdl_1), ___src__4sFdl_1));
+    return ((struct Fdl )___ret__4sFdl_1);
 }
 static inline void ___constructor__F_P4sFdli_autogen___1(struct Fdl *___dst__P4sFdl_1, int __f1__i_1){
@@ -292 +298 @@
     }
     inline struct __anonymous4 ___operator_assign__F13s__anonymous4_P13s__anonymous413s__anonymous4_autogen___2(struct __anonymous4 *___dst__P13s__anonymous4_2, struct __anonymous4 ___src__13s__anonymous4_2){
+        struct __anonymous4 ___ret__13s__anonymous4_2;
         ((void)((*___dst__P13s__anonymous4_2).__i__i_2=___src__13s__anonymous4_2.__i__i_2));
-        return ((struct __anonymous4 )___src__13s__anonymous4_2);
+        ((void)___constructor__F_P13s__anonymous413s__anonymous4_autogen___2((&___ret__13s__anonymous4_2), ___src__13s__anonymous4_2));
+        return ((struct __anonymous4 )___ret__13s__anonymous4_2);
     }
     inline void ___constructor__F_P13s__anonymous4i_autogen___2(struct __anonymous4 *___dst__P13s__anonymous4_2, int __i__i_2){
@@ -310 +318 @@
     }
     inline enum __anonymous5 ___operator_assign__F13e__anonymous5_P13e__anonymous513e__anonymous5_intrinsic___2(enum __anonymous5 *___dst__P13e__anonymous5_2, enum __anonymous5 ___src__13e__anonymous5_2){
-        return ((enum __anonymous5 )((*___dst__P13e__anonymous5_2)=___src__13e__anonymous5_2));
+        enum __anonymous5 ___ret__13e__anonymous5_2;
+        ((void)(___ret__13e__anonymous5_2=((*___dst__P13e__anonymous5_2)=___src__13e__anonymous5_2)) /* ?{} */);
+        return ((enum __anonymous5 )___ret__13e__anonymous5_2);
     }
     ((void)sizeof(enum __anonymous5 ));
@@ -338 +348 @@
 }
 static inline struct Vad ___operator_assign__F4sVad_P4sVad4sVad_autogen___1(struct Vad *___dst__P4sVad_1, struct Vad ___src__4sVad_1){
-    return ((struct Vad )___src__4sVad_1);
-}
+    struct Vad ___ret__4sVad_1;
+    ((void)___constructor__F_P4sVad4sVad_autogen___1((&___ret__4sVad_1), ___src__4sVad_1));
+    return ((struct Vad )___ret__4sVad_1);
+}

src/tests/.expect/64/declarationSpecifier.txt

@@ -30 +30 @@
 }
 static inline struct __anonymous0 ___operator_assign__F13s__anonymous0_P13s__anonymous013s__anonymous0_autogen___1(struct __anonymous0 *___dst__P13s__anonymous0_1, struct __anonymous0 ___src__13s__anonymous0_1){
+    struct __anonymous0 ___ret__13s__anonymous0_1;
     ((void)((*___dst__P13s__anonymous0_1).__i__i_1=___src__13s__anonymous0_1.__i__i_1));
-    return ((struct __anonymous0 )___src__13s__anonymous0_1);
+    ((void)___constructor__F_P13s__anonymous013s__anonymous0_autogen___1((&___ret__13s__anonymous0_1), ___src__13s__anonymous0_1));
+    return ((struct __anonymous0 )___ret__13s__anonymous0_1);
 }
 static inline void ___constructor__F_P13s__anonymous0i_autogen___1(struct __anonymous0 *___dst__P13s__anonymous0_1, int __i__i_1){
@@ -54 +56 @@
 }
 static inline struct __anonymous1 ___operator_assign__F13s__anonymous1_P13s__anonymous113s__anonymous1_autogen___1(struct __anonymous1 *___dst__P13s__anonymous1_1, struct __anonymous1 ___src__13s__anonymous1_1){
+    struct __anonymous1 ___ret__13s__anonymous1_1;
     ((void)((*___dst__P13s__anonymous1_1).__i__i_1=___src__13s__anonymous1_1.__i__i_1));
-    return ((struct __anonymous1 )___src__13s__anonymous1_1);
+    ((void)___constructor__F_P13s__anonymous113s__anonymous1_autogen___1((&___ret__13s__anonymous1_1), ___src__13s__anonymous1_1));
+    return ((struct __anonymous1 )___ret__13s__anonymous1_1);
 }
 static inline void ___constructor__F_P13s__anonymous1i_autogen___1(struct __anonymous1 *___dst__P13s__anonymous1_1, int __i__i_1){
@@ -78 +82 @@
 }
 static inline struct __anonymous2 ___operator_assign__F13s__anonymous2_P13s__anonymous213s__anonymous2_autogen___1(struct __anonymous2 *___dst__P13s__anonymous2_1, struct __anonymous2 ___src__13s__anonymous2_1){
+    struct __anonymous2 ___ret__13s__anonymous2_1;
     ((void)((*___dst__P13s__anonymous2_1).__i__i_1=___src__13s__anonymous2_1.__i__i_1));
-    return ((struct __anonymous2 )___src__13s__anonymous2_1);
+    ((void)___constructor__F_P13s__anonymous213s__anonymous2_autogen___1((&___ret__13s__anonymous2_1), ___src__13s__anonymous2_1));
+    return ((struct __anonymous2 )___ret__13s__anonymous2_1);
 }
 static inline void ___constructor__F_P13s__anonymous2i_autogen___1(struct __anonymous2 *___dst__P13s__anonymous2_1, int __i__i_1){
@@ -102 +108 @@
 }
 static inline struct __anonymous3 ___operator_assign__F13s__anonymous3_P13s__anonymous313s__anonymous3_autogen___1(struct __anonymous3 *___dst__P13s__anonymous3_1, struct __anonymous3 ___src__13s__anonymous3_1){
+    struct __anonymous3 ___ret__13s__anonymous3_1;
     ((void)((*___dst__P13s__anonymous3_1).__i__i_1=___src__13s__anonymous3_1.__i__i_1));
-    return ((struct __anonymous3 )___src__13s__anonymous3_1);
+    ((void)___constructor__F_P13s__anonymous313s__anonymous3_autogen___1((&___ret__13s__anonymous3_1), ___src__13s__anonymous3_1));
+    return ((struct __anonymous3 )___ret__13s__anonymous3_1);
 }
 static inline void ___constructor__F_P13s__anonymous3i_autogen___1(struct __anonymous3 *___dst__P13s__anonymous3_1, int __i__i_1){
@@ -126 +134 @@
 }
 static inline struct __anonymous4 ___operator_assign__F13s__anonymous4_P13s__anonymous413s__anonymous4_autogen___1(struct __anonymous4 *___dst__P13s__anonymous4_1, struct __anonymous4 ___src__13s__anonymous4_1){
+    struct __anonymous4 ___ret__13s__anonymous4_1;
     ((void)((*___dst__P13s__anonymous4_1).__i__i_1=___src__13s__anonymous4_1.__i__i_1));
-    return ((struct __anonymous4 )___src__13s__anonymous4_1);
+    ((void)___constructor__F_P13s__anonymous413s__anonymous4_autogen___1((&___ret__13s__anonymous4_1), ___src__13s__anonymous4_1));
+    return ((struct __anonymous4 )___ret__13s__anonymous4_1);
 }
 static inline void ___constructor__F_P13s__anonymous4i_autogen___1(struct __anonymous4 *___dst__P13s__anonymous4_1, int __i__i_1){
@@ -150 +160 @@
 }
 static inline struct __anonymous5 ___operator_assign__F13s__anonymous5_P13s__anonymous513s__anonymous5_autogen___1(struct __anonymous5 *___dst__P13s__anonymous5_1, struct __anonymous5 ___src__13s__anonymous5_1){
+    struct __anonymous5 ___ret__13s__anonymous5_1;
     ((void)((*___dst__P13s__anonymous5_1).__i__i_1=___src__13s__anonymous5_1.__i__i_1));
-    return ((struct __anonymous5 )___src__13s__anonymous5_1);
+    ((void)___constructor__F_P13s__anonymous513s__anonymous5_autogen___1((&___ret__13s__anonymous5_1), ___src__13s__anonymous5_1));
+    return ((struct __anonymous5 )___ret__13s__anonymous5_1);
 }
 static inline void ___constructor__F_P13s__anonymous5i_autogen___1(struct __anonymous5 *___dst__P13s__anonymous5_1, int __i__i_1){
@@ -174 +186 @@
 }
 static inline struct __anonymous6 ___operator_assign__F13s__anonymous6_P13s__anonymous613s__anonymous6_autogen___1(struct __anonymous6 *___dst__P13s__anonymous6_1, struct __anonymous6 ___src__13s__anonymous6_1){
+    struct __anonymous6 ___ret__13s__anonymous6_1;
     ((void)((*___dst__P13s__anonymous6_1).__i__i_1=___src__13s__anonymous6_1.__i__i_1));
-    return ((struct __anonymous6 )___src__13s__anonymous6_1);
+    ((void)___constructor__F_P13s__anonymous613s__anonymous6_autogen___1((&___ret__13s__anonymous6_1), ___src__13s__anonymous6_1));
+    return ((struct __anonymous6 )___ret__13s__anonymous6_1);
 }
 static inline void ___constructor__F_P13s__anonymous6i_autogen___1(struct __anonymous6 *___dst__P13s__anonymous6_1, int __i__i_1){
@@ -198 +212 @@
 }
 static inline struct __anonymous7 ___operator_assign__F13s__anonymous7_P13s__anonymous713s__anonymous7_autogen___1(struct __anonymous7 *___dst__P13s__anonymous7_1, struct __anonymous7 ___src__13s__anonymous7_1){
+    struct __anonymous7 ___ret__13s__anonymous7_1;
     ((void)((*___dst__P13s__anonymous7_1).__i__i_1=___src__13s__anonymous7_1.__i__i_1));
-    return ((struct __anonymous7 )___src__13s__anonymous7_1);
+    ((void)___constructor__F_P13s__anonymous713s__anonymous7_autogen___1((&___ret__13s__anonymous7_1), ___src__13s__anonymous7_1));
+    return ((struct __anonymous7 )___ret__13s__anonymous7_1);
 }
 static inline void ___constructor__F_P13s__anonymous7i_autogen___1(struct __anonymous7 *___dst__P13s__anonymous7_1, int __i__i_1){
@@ -230 +246 @@
 }
 static inline struct __anonymous8 ___operator_assign__F13s__anonymous8_P13s__anonymous813s__anonymous8_autogen___1(struct __anonymous8 *___dst__P13s__anonymous8_1, struct __anonymous8 ___src__13s__anonymous8_1){
+    struct __anonymous8 ___ret__13s__anonymous8_1;
     ((void)((*___dst__P13s__anonymous8_1).__i__s_1=___src__13s__anonymous8_1.__i__s_1));
-    return ((struct __anonymous8 )___src__13s__anonymous8_1);
+    ((void)___constructor__F_P13s__anonymous813s__anonymous8_autogen___1((&___ret__13s__anonymous8_1), ___src__13s__anonymous8_1));
+    return ((struct __anonymous8 )___ret__13s__anonymous8_1);
 }
 static inline void ___constructor__F_P13s__anonymous8s_autogen___1(struct __anonymous8 *___dst__P13s__anonymous8_1, short __i__s_1){
@@ -254 +272 @@
 }
 static inline struct __anonymous9 ___operator_assign__F13s__anonymous9_P13s__anonymous913s__anonymous9_autogen___1(struct __anonymous9 *___dst__P13s__anonymous9_1, struct __anonymous9 ___src__13s__anonymous9_1){
+    struct __anonymous9 ___ret__13s__anonymous9_1;
     ((void)((*___dst__P13s__anonymous9_1).__i__s_1=___src__13s__anonymous9_1.__i__s_1));
-    return ((struct __anonymous9 )___src__13s__anonymous9_1);
+    ((void)___constructor__F_P13s__anonymous913s__anonymous9_autogen___1((&___ret__13s__anonymous9_1), ___src__13s__anonymous9_1));
+    return ((struct __anonymous9 )___ret__13s__anonymous9_1);
 }
 static inline void ___constructor__F_P13s__anonymous9s_autogen___1(struct __anonymous9 *___dst__P13s__anonymous9_1, short __i__s_1){
@@ -278 +298 @@
 }
 static inline struct __anonymous10 ___operator_assign__F14s__anonymous10_P14s__anonymous1014s__anonymous10_autogen___1(struct __anonymous10 *___dst__P14s__anonymous10_1, struct __anonymous10 ___src__14s__anonymous10_1){
+    struct __anonymous10 ___ret__14s__anonymous10_1;
     ((void)((*___dst__P14s__anonymous10_1).__i__s_1=___src__14s__anonymous10_1.__i__s_1));
-    return ((struct __anonymous10 )___src__14s__anonymous10_1);
+    ((void)___constructor__F_P14s__anonymous1014s__anonymous10_autogen___1((&___ret__14s__anonymous10_1), ___src__14s__anonymous10_1));
+    return ((struct __anonymous10 )___ret__14s__anonymous10_1);
 }
 static inline void ___constructor__F_P14s__anonymous10s_autogen___1(struct __anonymous10 *___dst__P14s__anonymous10_1, short __i__s_1){
@@ -302 +324 @@
 }
 static inline struct __anonymous11 ___operator_assign__F14s__anonymous11_P14s__anonymous1114s__anonymous11_autogen___1(struct __anonymous11 *___dst__P14s__anonymous11_1, struct __anonymous11 ___src__14s__anonymous11_1){
+    struct __anonymous11 ___ret__14s__anonymous11_1;
     ((void)((*___dst__P14s__anonymous11_1).__i__s_1=___src__14s__anonymous11_1.__i__s_1));
-    return ((struct __anonymous11 )___src__14s__anonymous11_1);
+    ((void)___constructor__F_P14s__anonymous1114s__anonymous11_autogen___1((&___ret__14s__anonymous11_1), ___src__14s__anonymous11_1));
+    return ((struct __anonymous11 )___ret__14s__anonymous11_1);
 }
 static inline void ___constructor__F_P14s__anonymous11s_autogen___1(struct __anonymous11 *___dst__P14s__anonymous11_1, short __i__s_1){
@@ -326 +350 @@
 }
 static inline struct __anonymous12 ___operator_assign__F14s__anonymous12_P14s__anonymous1214s__anonymous12_autogen___1(struct __anonymous12 *___dst__P14s__anonymous12_1, struct __anonymous12 ___src__14s__anonymous12_1){
+    struct __anonymous12 ___ret__14s__anonymous12_1;
     ((void)((*___dst__P14s__anonymous12_1).__i__s_1=___src__14s__anonymous12_1.__i__s_1));
-    return ((struct __anonymous12 )___src__14s__anonymous12_1);
+    ((void)___constructor__F_P14s__anonymous1214s__anonymous12_autogen___1((&___ret__14s__anonymous12_1), ___src__14s__anonymous12_1));
+    return ((struct __anonymous12 )___ret__14s__anonymous12_1);
 }
 static inline void ___constructor__F_P14s__anonymous12s_autogen___1(struct __anonymous12 *___dst__P14s__anonymous12_1, short __i__s_1){
@@ -350 +376 @@
 }
 static inline struct __anonymous13 ___operator_assign__F14s__anonymous13_P14s__anonymous1314s__anonymous13_autogen___1(struct __anonymous13 *___dst__P14s__anonymous13_1, struct __anonymous13 ___src__14s__anonymous13_1){
+    struct __anonymous13 ___ret__14s__anonymous13_1;
     ((void)((*___dst__P14s__anonymous13_1).__i__s_1=___src__14s__anonymous13_1.__i__s_1));
-    return ((struct __anonymous13 )___src__14s__anonymous13_1);
+    ((void)___constructor__F_P14s__anonymous1314s__anonymous13_autogen___1((&___ret__14s__anonymous13_1), ___src__14s__anonymous13_1));
+    return ((struct __anonymous13 )___ret__14s__anonymous13_1);
 }
 static inline void ___constructor__F_P14s__anonymous13s_autogen___1(struct __anonymous13 *___dst__P14s__anonymous13_1, short __i__s_1){
@@ -374 +402 @@
 }
 static inline struct __anonymous14 ___operator_assign__F14s__anonymous14_P14s__anonymous1414s__anonymous14_autogen___1(struct __anonymous14 *___dst__P14s__anonymous14_1, struct __anonymous14 ___src__14s__anonymous14_1){
+    struct __anonymous14 ___ret__14s__anonymous14_1;
     ((void)((*___dst__P14s__anonymous14_1).__i__s_1=___src__14s__anonymous14_1.__i__s_1));
-    return ((struct __anonymous14 )___src__14s__anonymous14_1);
+    ((void)___constructor__F_P14s__anonymous1414s__anonymous14_autogen___1((&___ret__14s__anonymous14_1), ___src__14s__anonymous14_1));
+    return ((struct __anonymous14 )___ret__14s__anonymous14_1);
 }
 static inline void ___constructor__F_P14s__anonymous14s_autogen___1(struct __anonymous14 *___dst__P14s__anonymous14_1, short __i__s_1){
@@ -398 +428 @@
 }
 static inline struct __anonymous15 ___operator_assign__F14s__anonymous15_P14s__anonymous1514s__anonymous15_autogen___1(struct __anonymous15 *___dst__P14s__anonymous15_1, struct __anonymous15 ___src__14s__anonymous15_1){
+    struct __anonymous15 ___ret__14s__anonymous15_1;
     ((void)((*___dst__P14s__anonymous15_1).__i__s_1=___src__14s__anonymous15_1.__i__s_1));
-    return ((struct __anonymous15 )___src__14s__anonymous15_1);
+    ((void)___constructor__F_P14s__anonymous1514s__anonymous15_autogen___1((&___ret__14s__anonymous15_1), ___src__14s__anonymous15_1));
+    return ((struct __anonymous15 )___ret__14s__anonymous15_1);
 }
 static inline void ___constructor__F_P14s__anonymous15s_autogen___1(struct __anonymous15 *___dst__P14s__anonymous15_1, short __i__s_1){
@@ -438 +470 @@
 }
 static inline struct __anonymous16 ___operator_assign__F14s__anonymous16_P14s__anonymous1614s__anonymous16_autogen___1(struct __anonymous16 *___dst__P14s__anonymous16_1, struct __anonymous16 ___src__14s__anonymous16_1){
+    struct __anonymous16 ___ret__14s__anonymous16_1;
     ((void)((*___dst__P14s__anonymous16_1).__i__i_1=___src__14s__anonymous16_1.__i__i_1));
-    return ((struct __anonymous16 )___src__14s__anonymous16_1);
+    ((void)___constructor__F_P14s__anonymous1614s__anonymous16_autogen___1((&___ret__14s__anonymous16_1), ___src__14s__anonymous16_1));
+    return ((struct __anonymous16 )___ret__14s__anonymous16_1);
 }
 static inline void ___constructor__F_P14s__anonymous16i_autogen___1(struct __anonymous16 *___dst__P14s__anonymous16_1, int __i__i_1){
@@ -462 +496 @@
 }
 static inline struct __anonymous17 ___operator_assign__F14s__anonymous17_P14s__anonymous1714s__anonymous17_autogen___1(struct __anonymous17 *___dst__P14s__anonymous17_1, struct __anonymous17 ___src__14s__anonymous17_1){
+    struct __anonymous17 ___ret__14s__anonymous17_1;
     ((void)((*___dst__P14s__anonymous17_1).__i__i_1=___src__14s__anonymous17_1.__i__i_1));
-    return ((struct __anonymous17 )___src__14s__anonymous17_1);
+    ((void)___constructor__F_P14s__anonymous1714s__anonymous17_autogen___1((&___ret__14s__anonymous17_1), ___src__14s__anonymous17_1));
+    return ((struct __anonymous17 )___ret__14s__anonymous17_1);
 }
 static inline void ___constructor__F_P14s__anonymous17i_autogen___1(struct __anonymous17 *___dst__P14s__anonymous17_1, int __i__i_1){
@@ -486 +522 @@
 }
 static inline struct __anonymous18 ___operator_assign__F14s__anonymous18_P14s__anonymous1814s__anonymous18_autogen___1(struct __anonymous18 *___dst__P14s__anonymous18_1, struct __anonymous18 ___src__14s__anonymous18_1){
+    struct __anonymous18 ___ret__14s__anonymous18_1;
     ((void)((*___dst__P14s__anonymous18_1).__i__i_1=___src__14s__anonymous18_1.__i__i_1));
-    return ((struct __anonymous18 )___src__14s__anonymous18_1);
+    ((void)___constructor__F_P14s__anonymous1814s__anonymous18_autogen___1((&___ret__14s__anonymous18_1), ___src__14s__anonymous18_1));
+    return ((struct __anonymous18 )___ret__14s__anonymous18_1);
 }
 static inline void ___constructor__F_P14s__anonymous18i_autogen___1(struct __anonymous18 *___dst__P14s__anonymous18_1, int __i__i_1){
@@ -510 +548 @@
 }
 static inline struct __anonymous19 ___operator_assign__F14s__anonymous19_P14s__anonymous1914s__anonymous19_autogen___1(struct __anonymous19 *___dst__P14s__anonymous19_1, struct __anonymous19 ___src__14s__anonymous19_1){
+    struct __anonymous19 ___ret__14s__anonymous19_1;
     ((void)((*___dst__P14s__anonymous19_1).__i__i_1=___src__14s__anonymous19_1.__i__i_1));
-    return ((struct __anonymous19 )___src__14s__anonymous19_1);
+    ((void)___constructor__F_P14s__anonymous1914s__anonymous19_autogen___1((&___ret__14s__anonymous19_1), ___src__14s__anonymous19_1));
+    return ((struct __anonymous19 )___ret__14s__anonymous19_1);
 }
 static inline void ___constructor__F_P14s__anonymous19i_autogen___1(struct __anonymous19 *___dst__P14s__anonymous19_1, int __i__i_1){
@@ -534 +574 @@
 }
 static inline struct __anonymous20 ___operator_assign__F14s__anonymous20_P14s__anonymous2014s__anonymous20_autogen___1(struct __anonymous20 *___dst__P14s__anonymous20_1, struct __anonymous20 ___src__14s__anonymous20_1){
+    struct __anonymous20 ___ret__14s__anonymous20_1;
     ((void)((*___dst__P14s__anonymous20_1).__i__i_1=___src__14s__anonymous20_1.__i__i_1));
-    return ((struct __anonymous20 )___src__14s__anonymous20_1);
+    ((void)___constructor__F_P14s__anonymous2014s__anonymous20_autogen___1((&___ret__14s__anonymous20_1), ___src__14s__anonymous20_1));
+    return ((struct __anonymous20 )___ret__14s__anonymous20_1);
 }
 static inline void ___constructor__F_P14s__anonymous20i_autogen___1(struct __anonymous20 *___dst__P14s__anonymous20_1, int __i__i_1){
@@ -558 +600 @@
 }
 static inline struct __anonymous21 ___operator_assign__F14s__anonymous21_P14s__anonymous2114s__anonymous21_autogen___1(struct __anonymous21 *___dst__P14s__anonymous21_1, struct __anonymous21 ___src__14s__anonymous21_1){
+    struct __anonymous21 ___ret__14s__anonymous21_1;
     ((void)((*___dst__P14s__anonymous21_1).__i__i_1=___src__14s__anonymous21_1.__i__i_1));
-    return ((struct __anonymous21 )___src__14s__anonymous21_1);
+    ((void)___constructor__F_P14s__anonymous2114s__anonymous21_autogen___1((&___ret__14s__anonymous21_1), ___src__14s__anonymous21_1));
+    return ((struct __anonymous21 )___ret__14s__anonymous21_1);
 }
 static inline void ___constructor__F_P14s__anonymous21i_autogen___1(struct __anonymous21 *___dst__P14s__anonymous21_1, int __i__i_1){
@@ -582 +626 @@
 }
 static inline struct __anonymous22 ___operator_assign__F14s__anonymous22_P14s__anonymous2214s__anonymous22_autogen___1(struct __anonymous22 *___dst__P14s__anonymous22_1, struct __anonymous22 ___src__14s__anonymous22_1){
+    struct __anonymous22 ___ret__14s__anonymous22_1;
     ((void)((*___dst__P14s__anonymous22_1).__i__i_1=___src__14s__anonymous22_1.__i__i_1));
-    return ((struct __anonymous22 )___src__14s__anonymous22_1);
+    ((void)___constructor__F_P14s__anonymous2214s__anonymous22_autogen___1((&___ret__14s__anonymous22_1), ___src__14s__anonymous22_1));
+    return ((struct __anonymous22 )___ret__14s__anonymous22_1);
 }
 static inline void ___constructor__F_P14s__anonymous22i_autogen___1(struct __anonymous22 *___dst__P14s__anonymous22_1, int __i__i_1){
@@ -606 +652 @@
 }
 static inline struct __anonymous23 ___operator_assign__F14s__anonymous23_P14s__anonymous2314s__anonymous23_autogen___1(struct __anonymous23 *___dst__P14s__anonymous23_1, struct __anonymous23 ___src__14s__anonymous23_1){
+    struct __anonymous23 ___ret__14s__anonymous23_1;
     ((void)((*___dst__P14s__anonymous23_1).__i__i_1=___src__14s__anonymous23_1.__i__i_1));
-    return ((struct __anonymous23 )___src__14s__anonymous23_1);
+    ((void)___constructor__F_P14s__anonymous2314s__anonymous23_autogen___1((&___ret__14s__anonymous23_1), ___src__14s__anonymous23_1));
+    return ((struct __anonymous23 )___ret__14s__anonymous23_1);
 }
 static inline void ___constructor__F_P14s__anonymous23i_autogen___1(struct __anonymous23 *___dst__P14s__anonymous23_1, int __i__i_1){

src/tests/.expect/64/extension.txt

@@ -33 +33 @@
 }
 static inline struct S ___operator_assign__F2sS_P2sS2sS_autogen___1(struct S *___dst__P2sS_1, struct S ___src__2sS_1){
+    struct S ___ret__2sS_1;
     ((void)((*___dst__P2sS_1).__a__i_1=___src__2sS_1.__a__i_1));
     ((void)((*___dst__P2sS_1).__b__i_1=___src__2sS_1.__b__i_1));
     ((void)((*___dst__P2sS_1).__c__i_1=___src__2sS_1.__c__i_1));
-    return ((struct S )___src__2sS_1);
+    ((void)___constructor__F_P2sS2sS_autogen___1((&___ret__2sS_1), ___src__2sS_1));
+    return ((struct S )___ret__2sS_1);
 }
 static inline void ___constructor__F_P2sSi_autogen___1(struct S *___dst__P2sS_1, int __a__i_1){
@@ -66 +68 @@
 }
 static inline union U ___operator_assign__F2uU_P2uU2uU_autogen___1(union U *___dst__P2uU_1, union U ___src__2uU_1){
+    union U ___ret__2uU_1;
     ((void)__builtin_memcpy(((void *)___dst__P2uU_1), ((const void *)(&___src__2uU_1)), sizeof(union U )));
-    return ((union U )___src__2uU_1);
+    ((void)___constructor__F_P2uU2uU_autogen___1((&___ret__2uU_1), ___src__2uU_1));
+    return ((union U )___ret__2uU_1);
 }
 static inline void ___constructor__F_P2uUi_autogen___1(union U *___dst__P2uU_1, int __src__i_1){

src/tests/.expect/64/gccExtensions.txt

@@ -59 +59 @@
     }
     inline struct S ___operator_assign__F2sS_P2sS2sS_autogen___2(struct S *___dst__P2sS_2, struct S ___src__2sS_2){
+        struct S ___ret__2sS_2;
         ((void)((*___dst__P2sS_2).__a__i_2=___src__2sS_2.__a__i_2));
         ((void)((*___dst__P2sS_2).__b__i_2=___src__2sS_2.__b__i_2));
         ((void)((*___dst__P2sS_2).__c__i_2=___src__2sS_2.__c__i_2));
-        return ((struct S )___src__2sS_2);
+        ((void)___constructor__F_P2sS2sS_autogen___2((&___ret__2sS_2), ___src__2sS_2));
+        return ((struct S )___ret__2sS_2);
     }
     inline void ___constructor__F_P2sSi_autogen___2(struct S *___dst__P2sS_2, int __a__i_2){
@@ -109 +111 @@
     }
     inline struct s2 ___operator_assign__F3ss2_P3ss23ss2_autogen___2(struct s2 *___dst__P3ss2_2, struct s2 ___src__3ss2_2){
+        struct s2 ___ret__3ss2_2;
         ((void)((*___dst__P3ss2_2).__i__i_2=___src__3ss2_2.__i__i_2));
-        return ((struct s2 )___src__3ss2_2);
+        ((void)___constructor__F_P3ss23ss2_autogen___2((&___ret__3ss2_2), ___src__3ss2_2));
+        return ((struct s2 )___ret__3ss2_2);
     }
     inline void ___constructor__F_P3ss2i_autogen___2(struct s2 *___dst__P3ss2_2, int __i__i_2){
@@ -128 +132 @@
     }
     inline struct s3 ___operator_assign__F3ss3_P3ss33ss3_autogen___2(struct s3 *___dst__P3ss3_2, struct s3 ___src__3ss3_2){
+        struct s3 ___ret__3ss3_2;
         ((void)((*___dst__P3ss3_2).__i__i_2=___src__3ss3_2.__i__i_2));
-        return ((struct s3 )___src__3ss3_2);
+        ((void)___constructor__F_P3ss33ss3_autogen___2((&___ret__3ss3_2), ___src__3ss3_2));
+        return ((struct s3 )___ret__3ss3_2);
     }
     inline void ___constructor__F_P3ss3i_autogen___2(struct s3 *___dst__P3ss3_2, int __i__i_2){
@@ -149 +155 @@
     }
     inline struct s4 ___operator_assign__F3ss4_P3ss43ss4_autogen___2(struct s4 *___dst__P3ss4_2, struct s4 ___src__3ss4_2){
+        struct s4 ___ret__3ss4_2;
         ((void)((*___dst__P3ss4_2).__i__i_2=___src__3ss4_2.__i__i_2));
-        return ((struct s4 )___src__3ss4_2);
+        ((void)___constructor__F_P3ss43ss4_autogen___2((&___ret__3ss4_2), ___src__3ss4_2));
+        return ((struct s4 )___ret__3ss4_2);
     }
     inline void ___constructor__F_P3ss4i_autogen___2(struct s4 *___dst__P3ss4_2, int __i__i_2){

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

@@ -1 @@
-memberCtors.c:62 error: in void ?{}(B *b), field a2 used before being constructed
+memberCtors.c:71 error: in void ?{}(B *b), field a2 used before being constructed

src/tests/.expect/memberCtors.txt

@@ -16 +16 @@
 assigning int: 0 0
 end construct A
+copy constructing int: 0
+copy constructing int: 0
+begin copy construct A
+copy construct this->x
+copy constructing int: 1001
+assign this->y
+copy constructing int: 0
+destructing int: 0
+destructing int: 0
+end copy construct A
+begin ?=? A
+copy constructing int: 1001
+destructing int: 1001
+destructing int: 1001
+copy constructing int: 0
+destructing int: 0
+destructing int: 0
+copy constructing int: 0
+destructing int: 0
+destructing int: 0
+end ?=? A
+copy constructing int: 0
+copy constructing int: 0
+begin copy construct A
+copy construct this->x
+copy constructing int: 1001
+assign this->y
+copy constructing int: 0
+destructing int: 0
+destructing int: 0
+end copy construct A
+destructing int: 0
+destructing int: 0
+destructing int: 1001
+destructing int: 0
+destructing int: 0
+destructing int: 1001
 construct b->a1
 constructing int
@@ -36 +73 @@
 copy constructing int: 1000
 assign this->y
-end copy construct A
-copy constructing int: 0
-copy constructing int: 0
-begin copy construct A
-copy construct this->x
-copy constructing int: 1001
-assign this->y
-end copy construct A
-copy constructing int: 0
-copy constructing int: 0
-begin copy construct A
-copy construct this->x
-copy constructing int: 0
-assign this->y
+copy constructing int: 0
+destructing int: 0
+destructing int: 0
+end copy construct A
+copy constructing int: 0
+copy constructing int: 0
+begin copy construct A
+copy construct this->x
+copy constructing int: 1001
+assign this->y
+copy constructing int: 0
+destructing int: 0
+destructing int: 0
+end copy construct A
+copy constructing int: 0
+copy constructing int: 0
+begin copy construct A
+copy construct this->x
+copy constructing int: 0
+assign this->y
+copy constructing int: 0
+destructing int: 0
+destructing int: 0
 end copy construct A
 End of main
@@ -60 +106 @@
 assigning int: 0 0
 end construct A
+copy constructing int: 0
+copy constructing int: 0
+begin copy construct A
+copy construct this->x
+copy constructing int: 999
+assign this->y
+copy constructing int: 0
+destructing int: 0
+destructing int: 0
+end copy construct A
+begin ?=? A
+copy constructing int: 999
+destructing int: 999
+destructing int: 999
+copy constructing int: 0
+destructing int: 0
+destructing int: 0
+copy constructing int: 0
+destructing int: 0
+destructing int: 0
+end ?=? A
+copy constructing int: 0
+copy constructing int: 0
+begin copy construct A
+copy construct this->x
+copy constructing int: 999
+assign this->y
+copy constructing int: 0
+destructing int: 0
+destructing int: 0
+end copy construct A
+destructing int: 0
+destructing int: 0
+destructing int: 999
+destructing int: 0
+destructing int: 0
+destructing int: 999
 destructing int: 0
 destructing int: 0
@@ -80 +163 @@
 assigning int: 0 0
 end construct A
+copy constructing int: 0
+copy constructing int: 0
+begin copy construct A
+copy construct this->x
+copy constructing int: 999
+assign this->y
+copy constructing int: 0
+destructing int: 0
+destructing int: 0
+end copy construct A
+begin ?=? A
+copy constructing int: 999
+destructing int: 999
+destructing int: 999
+copy constructing int: 0
+destructing int: 0
+destructing int: 0
+copy constructing int: 0
+destructing int: 0
+destructing int: 0
+end ?=? A
+copy constructing int: 0
+copy constructing int: 0
+begin copy construct A
+copy construct this->x
+copy constructing int: 999
+assign this->y
+copy constructing int: 0
+destructing int: 0
+destructing int: 0
+end copy construct A
+destructing int: 0
+destructing int: 0
+destructing int: 999
+destructing int: 0
+destructing int: 0
+destructing int: 999
 destructing int: 0
 destructing int: 0

src/tests/Makefile.am

@@ -17 +17 @@
 debug=yes
 
-quick_test=vector_test avl_test operators numericConstants expression enum array typeof cast dtor-early-exit init_once
+quick_test=vector_test avl_test operators numericConstants expression enum array typeof cast dtor-early-exit init_once attributes
 
 if BUILD_CONCURRENCY
@@ -30 +30 @@
 # applies to both programs
 EXTRA_FLAGS =
-BUILD_FLAGS = -g -Wall -Wno-unused-function @CFA_FLAGS@ ${EXTRA_FLAGS}
+BUILD_FLAGS = -g -Wall -Wno-unused-function -quiet @CFA_FLAGS@ ${EXTRA_FLAGS}
 TEST_FLAGS = $(if $(test), 2> .err/${@}.log, )
 CFLAGS = ${TEST_FLAGS} ${BUILD_FLAGS}
@@ -76 +76 @@
 
 declarationSpecifier: declarationSpecifier.c
-        ${CC} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
+        ${CC} ${CFLAGS} -CFA -XCFA -p -XCFA -L ${<} -o ${@}
 
 gccExtensions : gccExtensions.c
-        ${CC} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
+        ${CC} ${CFLAGS} -CFA -XCFA -p -XCFA -L ${<} -o ${@}
 
 extension : extension.c
-        ${CC} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
+        ${CC} ${CFLAGS} -CFA -XCFA -p -XCFA -L ${<} -o ${@}
 
 attributes : attributes.c
-        ${CC} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
+        ${CC} ${CFLAGS} -CFA -XCFA -p -XCFA -L ${<} -o ${@}
 
 KRfunctions : KRfunctions.c
-        ${CC} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
+        ${CC} ${CFLAGS} -CFA -XCFA -p -XCFA -L ${<} -o ${@}
 
 memberCtors-ERR1: memberCtors.c

src/tests/Makefile.in

@@ -226 +226 @@
 quick_test = vector_test avl_test operators numericConstants \
         expression enum array typeof cast dtor-early-exit init_once \
-        $(am__append_1)
+        attributes $(am__append_1)
 @BUILD_CONCURRENCY_FALSE@concurrent = no
 @BUILD_CONCURRENCY_TRUE@concurrent = yes
@@ -234 +234 @@
 # applies to both programs
 EXTRA_FLAGS = 
-BUILD_FLAGS = -g -Wall -Wno-unused-function @CFA_FLAGS@ ${EXTRA_FLAGS}
+BUILD_FLAGS = -g -Wall -Wno-unused-function -quiet @CFA_FLAGS@ ${EXTRA_FLAGS}
 TEST_FLAGS = $(if $(test), 2> .err/${@}.log, )
 fstream_test_SOURCES = fstream_test.c
@@ -695 +695 @@
 
 declarationSpecifier: declarationSpecifier.c
-        ${CC} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
+        ${CC} ${CFLAGS} -CFA -XCFA -p -XCFA -L ${<} -o ${@}
 
 gccExtensions : gccExtensions.c
-        ${CC} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
+        ${CC} ${CFLAGS} -CFA -XCFA -p -XCFA -L ${<} -o ${@}
 
 extension : extension.c
-        ${CC} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
+        ${CC} ${CFLAGS} -CFA -XCFA -p -XCFA -L ${<} -o ${@}
 
 attributes : attributes.c
-        ${CC} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
+        ${CC} ${CFLAGS} -CFA -XCFA -p -XCFA -L ${<} -o ${@}
 
 KRfunctions : KRfunctions.c
-        ${CC} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
+        ${CC} ${CFLAGS} -CFA -XCFA -p -XCFA -L ${<} -o ${@}
 
 memberCtors-ERR1: memberCtors.c

src/tests/memberCtors.c

@@ -53 +53 @@
 } // z never constructed - will be automatically copy constructed
 
+A ?=?(A * this, A other) {
+  printf("begin ?=? A\n");
+  this->x = other.x;
+  this->y = other.y;
+  this->z = other.z;
+  printf("end ?=? A\n");
+  return *this;
+}
+
 struct B {
   A a1, a2, a3;

src/tests/sched-int-wait.c

@@ -4 +4 @@
 #include <stdlib>
 #include <thread>
+
+static const int N = 10_000;
 
 monitor global_t {};
@@ -13 +15 @@
 condition condAB, condAC, condBC, condABC;
 
-thread Signaler {
-        int signals[4];
-};
-
-void ?{}( Signaler * this ){
-        this->signals[0] = 0;
-        this->signals[1] = 0;
-        this->signals[2] = 0;
-        this->signals[3] = 0;
-}
-
+thread Signaler {};
 thread WaiterAB {};
 thread WaiterAC {};
@@ -29 +21 @@
 thread WaiterABC{};
 
-volatile bool done;
+volatile int waiter_left;
 
 //----------------------------------------------------------------------------------------------------
@@ -53 +45 @@
 void main( Signaler* this ) {
 
-        while( true ) {
-                int action = (unsigned)rand48() % 4;
-                bool finished = true;
-
-                for(int i = 0; i < 4; i++) {
-                        if( this->signals[action] < 10_000 ) {
-                                finished = false;
-                                break;
-                        }
-                        else {
-                                action = (action + 1) % 4;
-                        }
-                }
-
-                this->signals[action]++;
-                if( finished ) break;
-
-                //sout | action | this->signals[0] | this->signals[1] | this->signals[2] | this->signals[3] | endl;
-
+        while( waiter_left != 0 ) {
+                unsigned action = (unsigned)rand48() % 4;
                 switch( action ) {
                         case 0: 
@@ -89 +64 @@
                                 abort();
                 }
+                yield();
         }       
 }
@@ -95 +71 @@
 // Waiter ABC
 void main( WaiterABC* this ) {
-        while( !done ) {
+        for( int i = 0; i < N; i++ ) {
                 wait( &condABC, &globalA, &globalB, &globalC );
         }
+
+        __sync_fetch_and_sub_4( &waiter_left, 1);
 }
 
@@ -103 +81 @@
 // Waiter AB
 void main( WaiterAB* this ) {
-        while( !done ) {
+        for( int i = 0; i < N; i++ ) {
                 wait( &condAB , &globalA, &globalB );
         }
+
+        __sync_fetch_and_sub_4( &waiter_left, 1);
 }
 
@@ -111 +91 @@
 // Waiter AC
 void main( WaiterAC* this ) {
-        while( !done ) {
+        for( int i = 0; i < N; i++ ) {
                 wait( &condAC , &globalA, &globalC );
         }
+
+        __sync_fetch_and_sub_4( &waiter_left, 1);
 }
 
@@ -119 +101 @@
 // Waiter BC
 void main( WaiterBC* this ) {
-        while( !done ) {
+        for( int i = 0; i < N; i++ ) {
                 wait( &condBC , &globalB, &globalC );
         }
+
+        __sync_fetch_and_sub_4( &waiter_left, 1);
 }
 
@@ -127 +111 @@
 // Main
 int main(int argc, char* argv[]) {
-        done = false;
+        waiter_left = 4;
         processor p;
         {
-                WaiterABC a;
-                WaiterAB  b;
-                WaiterBC  c;
-                WaiterAC  d;
+                Signaler  e;
                 {
-                        Signaler  e;
+                        WaiterABC a;
+                        WaiterAB  b;
+                        WaiterBC  c;
+                        WaiterAC  d;
                 }
-                done = true;
-                signal( &condABC, &globalA, &globalB, &globalC );
-                signal( &condAB , &globalA, &globalB );
-                signal( &condBC , &globalB, &globalC );
-                signal( &condAC , &globalA, &globalC );
         }
 }

src/tests/test.py

@@ -28 +28 @@
         sh('echo "void ?{}(int*a,int b){}int main(){return 0;}" > .dummy.c')
         ret, out = sh("make .dummy -s", print2stdout=True)
-        
+
         if ret != 0:
                 print("Failed to identify architecture:")
@@ -161 +161 @@
 
         # build, skipping to next test on error
-        make_ret, _ = sh("""%s test=yes EXTRA_FLAGS="-quiet %s" %s 2> %s 1> /dev/null""" % (make_cmd, options, test.name, out_file), dry_run)
+        make_ret, _ = sh("""%s test=yes EXTRA_FLAGS="%s" %s 2> %s 1> /dev/null""" % (make_cmd, options, test.name, out_file), dry_run)
 
         # if the make command succeds continue otherwise skip to diff
@@ -192 +192 @@
                 # fetch return code and error from the diff command
                 retcode, error = diff(".expect/%s.txt" % test.path, ".out/%s.log" % test.name, dry_run)
-        
+
         # clean the executable
         sh("rm -f %s > /dev/null 2>&1" % test.name, dry_run)
@@ -269 +269 @@
 if __name__ == "__main__":
         #always run from same folder
-        chdir() 
-        
+        chdir()
+
         # parse the command line arguments
         options = getOptions()