Changeset 28e58fd for src/SymTab/Autogen.cc

Timestamp:

Aug 25, 2017, 10:38:34 AM (7 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

800d275

Parents:

af08051 (diff), 3eab308c (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 plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• src/SymTab/Autogen.cc (modified) (18 diffs)

src/SymTab/Autogen.cc

@@ -13 +13 @@
 // Update Count     : 62
 //
+
 #include "Autogen.h"
 
@@ -24 +25 @@
 #include <vector>                  // for vector
 
-#include "AddVisit.h"             // for addVisit
-#include "Common/ScopedMap.h"     // for ScopedMap
-#include "GenPoly/DeclMutator.h"  // for DeclMutator
-#include "GenPoly/ScopedSet.h"    // for ScopedSet
-#include "Parser/LinkageSpec.h"   // for AutoGen, Intrinsic, Spec
-#include "SymTab/Mangler.h"       // for mangleType
-#include "SynTree/Statement.h"    // for SwitchStmt (ptr only), CompoundStmt
-#include "SynTree/Type.h"         // for Type, ArrayType, Type::StorageClasses
-#include "SynTree/Visitor.h"      // for Visitor
+#include "AddVisit.h"              // for addVisit
+#include "CodeGen/OperatorTable.h" // for isCtorDtor, isCtorDtorAssign
+#include "Common/ScopedMap.h"      // for ScopedMap<>::const_iterator, Scope...
+#include "Common/utility.h"        // for cloneAll, operator+
+#include "GenPoly/DeclMutator.h"   // for DeclMutator
+#include "GenPoly/ScopedSet.h"     // for ScopedSet, ScopedSet<>::iterator
+#include "SymTab/Mangler.h"        // for Mangler
+#include "SynTree/Attribute.h"     // For Attribute
+#include "SynTree/Mutator.h"       // for maybeMutate
+#include "SynTree/Statement.h"     // for CompoundStmt, ReturnStmt, ExprStmt
+#include "SynTree/Type.h"          // for FunctionType, Type, TypeInstType
+#include "SynTree/Visitor.h"       // for maybeAccept, Visitor, acceptAll
+
+class Attribute;
 
 namespace SymTab {
@@ -130 +136 @@
         FunctionType * genDefaultType( Type * paramType ) {
                 FunctionType *ftype = new FunctionType( Type::Qualifiers(), false );
-                ObjectDecl *dstParam = new ObjectDecl( "_dst", Type::StorageClasses(), LinkageSpec::Cforall, nullptr, new PointerType( Type::Qualifiers(), paramType->clone() ), nullptr );
+                ObjectDecl *dstParam = new ObjectDecl( "_dst", Type::StorageClasses(), LinkageSpec::Cforall, nullptr, new ReferenceType( Type::Qualifiers(), paramType->clone() ), nullptr );
                 ftype->get_parameters().push_back( dstParam );
 
@@ -150 +156 @@
                 ftype->get_returnVals().push_back( returnVal );
                 return ftype;
-        }
-
-        /// true if the aggregate's layout is dynamic
-        template< typename AggrDecl >
-        bool hasDynamicLayout( AggrDecl * aggregateDecl ) {
-                for ( TypeDecl * param : aggregateDecl->get_parameters() ) {
-                        if ( param->isComplete() ) return true;
-                }
-                return false;
         }
 
@@ -181 +178 @@
                         FunctionType * ftype = funcDecl->get_functionType();
                         assert( ! ftype->get_parameters().empty() );
-                        Type * t = safe_dynamic_cast< PointerType * >( ftype->get_parameters().front()->get_type() )->get_base();
+                        Type * t = InitTweak::getPointerBase( ftype->get_parameters().front()->get_type() );
+                        assert( t );
                         map.insert( Mangler::mangleType( t ), true );
                 }
@@ -227 +225 @@
                         FunctionType * ftype = data.genType( refType );
 
-                        if(concurrent_type && InitTweak::isDestructor( data.fname )) {
+                        if(concurrent_type && CodeGen::isDestructor( data.fname )) {
                                 ftype->get_parameters().front()->get_type()->set_mutex( true );
                         }
@@ -279 +277 @@
                 FunctionType *copyCtorType = genCopyType( refType->clone() );
 
+                // add unused attribute to parameters of default constructor and destructor
+                ctorType->get_parameters().front()->get_attributes().push_back( new Attribute( "unused" ) );
+                dtorType->get_parameters().front()->get_attributes().push_back( new Attribute( "unused" ) );
+
                 // xxx - should we also generate void ?{}(E *, int) and E ?{}(E *, E)?
                 // right now these cases work, but that might change.
@@ -301 +303 @@
 
         /// generates a single struct member operation (constructor call, destructor call, assignment call)
-        void makeStructMemberOp( ObjectDecl * dstParam, Expression * src, DeclarationWithType * field, FunctionDecl * func, bool isDynamicLayout, bool forward = true ) {
-                ObjectDecl * returnVal = NULL;
-                if ( ! func->get_functionType()->get_returnVals().empty() ) {
-                        returnVal = dynamic_cast<ObjectDecl*>( func->get_functionType()->get_returnVals().front() );
-                }
-
+        void makeStructMemberOp( ObjectDecl * dstParam, Expression * src, DeclarationWithType * field, FunctionDecl * func, bool forward = true ) {
                 InitTweak::InitExpander srcParam( src );
 
-                // assign to destination (and return value if generic)
-                UntypedExpr *derefExpr = UntypedExpr::createDeref( new VariableExpr( dstParam ) );
-                Expression *dstselect = new MemberExpr( field, derefExpr );
+                // assign to destination
+                Expression *dstselect = new MemberExpr( field, new CastExpr( new VariableExpr( dstParam ), safe_dynamic_cast< ReferenceType* >( dstParam->get_type() )->get_base()->clone() ) );
                 genImplicitCall( srcParam, dstselect, func->get_name(), back_inserter( func->get_statements()->get_kids() ), field, forward );
-
-                if ( isDynamicLayout && returnVal ) {
-                        // xxx - there used to be a dereference on returnVal, but this seems to have been wrong?
-                        Expression *retselect = new MemberExpr( field, new VariableExpr( returnVal ) );
-                        genImplicitCall( srcParam, retselect, func->get_name(), back_inserter( func->get_statements()->get_kids() ), field, forward );
-                } // if
         }
 
         /// generates the body of a struct function by iterating the struct members (via parameters) - generates default ctor, copy ctor, assignment, and dtor bodies, but NOT field ctor bodies
         template<typename Iterator>
-        void makeStructFunctionBody( Iterator member, Iterator end, FunctionDecl * func, bool isDynamicLayout, bool forward = true ) {
+        void makeStructFunctionBody( Iterator member, Iterator end, FunctionDecl * func, bool forward = true ) {
                 for ( ; member != end; ++member ) {
                         if ( DeclarationWithType *field = dynamic_cast< DeclarationWithType * >( *member ) ) { // otherwise some form of type declaration, e.g. Aggregate
@@ -359 +349 @@
 
                                 Expression *srcselect = srcParam ? new MemberExpr( field, new VariableExpr( srcParam ) ) : NULL;
-                                makeStructMemberOp( dstParam, srcselect, field, func, isDynamicLayout, forward );
+                                makeStructMemberOp( dstParam, srcselect, field, func, forward );
                         } // if
                 } // for
@@ -367 +357 @@
         /// void ?{}(A *, int) and void?{}(A *, int, int) for a struct A which has two int fields.
         template<typename Iterator>
-        void makeStructFieldCtorBody( Iterator member, Iterator end, FunctionDecl * func, bool isDynamicLayout ) {
+        void makeStructFieldCtorBody( Iterator member, Iterator end, FunctionDecl * func ) {
                 FunctionType * ftype = func->get_functionType();
                 std::list<DeclarationWithType*> & params = ftype->get_parameters();
@@ -393 +383 @@
                                         // matching parameter, initialize field with copy ctor
                                         Expression *srcselect = new VariableExpr(*parameter);
-                                        makeStructMemberOp( dstParam, srcselect, field, func, isDynamicLayout );
+                                        makeStructMemberOp( dstParam, srcselect, field, func );
                                         ++parameter;
                                 } else {
                                         // no matching parameter, initialize field with default ctor
-                                        makeStructMemberOp( dstParam, NULL, field, func, isDynamicLayout );
+                                        makeStructMemberOp( dstParam, NULL, field, func );
                                 }
                         }
@@ -413 +403 @@
                 // Make function polymorphic in same parameters as generic struct, if applicable
                 const std::list< TypeDecl* > & typeParams = aggregateDecl->get_parameters(); // List of type variables to be placed on the generated functions
-                bool isDynamicLayout = hasDynamicLayout( aggregateDecl );  // NOTE this flag is an incredibly ugly kludge; we should fix the assignment signature instead (ditto for union)
 
                 // generate each of the functions based on the supplied FuncData objects
@@ -423 +412 @@
 
                 // field ctors are only generated if default constructor and copy constructor are both generated
-                unsigned numCtors = std::count_if( newFuncs.begin(), newFuncs.end(), [](FunctionDecl * dcl) { return InitTweak::isConstructor( dcl->get_name() ); } );
+                unsigned numCtors = std::count_if( newFuncs.begin(), newFuncs.end(), [](FunctionDecl * dcl) { return CodeGen::isConstructor( dcl->get_name() ); } );
 
                 if ( functionNesting == 0 ) {
@@ -438 +427 @@
                         // generate appropriate calls to member ctor, assignment
                         // destructor needs to do everything in reverse, so pass "forward" based on whether the function is a destructor
-                        if ( ! InitTweak::isDestructor( dcl->get_name() ) ) {
-                                makeStructFunctionBody( aggregateDecl->get_members().begin(), aggregateDecl->get_members().end(), dcl, isDynamicLayout );
+                        if ( ! CodeGen::isDestructor( dcl->get_name() ) ) {
+                                makeStructFunctionBody( aggregateDecl->get_members().begin(), aggregateDecl->get_members().end(), dcl );
                         } else {
-                                makeStructFunctionBody( aggregateDecl->get_members().rbegin(), aggregateDecl->get_members().rend(), dcl, isDynamicLayout, false );
-                        }
-                        if ( InitTweak::isAssignment( dcl->get_name() ) ) {
+                                makeStructFunctionBody( aggregateDecl->get_members().rbegin(), aggregateDecl->get_members().rend(), dcl, false );
+                        }
+                        if ( CodeGen::isAssignment( dcl->get_name() ) ) {
                                 // assignment needs to return a value
                                 FunctionType * assignType = dcl->get_functionType();
@@ -472 +461 @@
                                         // our inheritance model. I think the correct way to handle this is to
                                         // cast the structure to the type of the member and let the resolver
-                                        // figure out whether it's valid and have a pass afterwards that fixes
-                                        // the assignment to use pointer arithmetic with the offset of the
-                                        // member, much like how generic type members are handled.
+                                        // figure out whether it's valid/choose the correct unnamed member
                                         continue;
                                 }
                                 memCtorType->get_parameters().push_back( new ObjectDecl( member->get_name(), Type::StorageClasses(), LinkageSpec::Cforall, 0, member->get_type()->clone(), 0 ) );
                                 FunctionDecl * ctor = genFunc( "?{}", memCtorType->clone(), functionNesting );
-                                makeStructFieldCtorBody( aggregateDecl->get_members().begin(), aggregateDecl->get_members().end(), ctor, isDynamicLayout );
+                                makeStructFieldCtorBody( aggregateDecl->get_members().begin(), aggregateDecl->get_members().end(), ctor );
                                 declsToAdd.push_back( ctor );
                         }
@@ -490 +477 @@
         void makeUnionFieldsAssignment( ObjectDecl * srcParam, ObjectDecl * dstParam, OutputIterator out ) {
                 UntypedExpr *copy = new UntypedExpr( new NameExpr( "__builtin_memcpy" ) );
-                copy->get_args().push_back( new VariableExpr( dstParam ) );
+                copy->get_args().push_back( new AddressExpr( new VariableExpr( dstParam ) ) );
                 copy->get_args().push_back( new AddressExpr( new VariableExpr( srcParam ) ) );
                 copy->get_args().push_back( new SizeofExpr( srcParam->get_type()->clone() ) );
@@ -502 +489 @@
                 ObjectDecl * dstParam = safe_dynamic_cast< ObjectDecl * >( ftype->get_parameters().front() );
                 ObjectDecl * srcParam = safe_dynamic_cast< ObjectDecl * >( ftype->get_parameters().back() );
-                ObjectDecl * returnVal = nullptr;
-                if ( ! ftype->get_returnVals().empty() ) {
-                        returnVal = safe_dynamic_cast< ObjectDecl * >( ftype->get_returnVals().front() );
-                }
 
                 makeUnionFieldsAssignment( srcParam, dstParam, back_inserter( funcDecl->get_statements()->get_kids() ) );
-                if ( returnVal ) {
+                if ( CodeGen::isAssignment( funcDecl->get_name() ) ) {
+                        // also generate return statement in assignment
                         funcDecl->get_statements()->get_kids().push_back( new ReturnStmt( noLabels, new VariableExpr( srcParam ) ) );
                 }
@@ -535 +519 @@
                 cloneAll( typeParams, copyCtorType->get_forall() );
                 cloneAll( typeParams, assignType->get_forall() );
+
+                // add unused attribute to parameters of default constructor and destructor
+                ctorType->get_parameters().front()->get_attributes().push_back( new Attribute( "unused" ) );
+                dtorType->get_parameters().front()->get_attributes().push_back( new Attribute( "unused" ) );
 
                 // Routines at global scope marked "static" to prevent multiple definitions is separate translation units