Changes in src/SymTab/Validate.cc [4ef7506:d3b7937]

File:

• src/SymTab/Validate.cc (modified) (9 diffs)

src/SymTab/Validate.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 21:50:04 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Fri Dec 18 15:34:05 2015
-// Update Count     : 218
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Wed Jan 27 22:03:12 2016
+// Update Count     : 225
 //
 
@@ -49 +49 @@
 #include "FixFunction.h"
 // #include "ImplementationType.h"
-#include "utility.h"
-#include "UniqueName.h"
+#include "Common/utility.h"
+#include "Common/UniqueName.h"
 #include "AddVisit.h"
 #include "MakeLibCfa.h"
@@ -585 +585 @@
         }
 
-        template< typename OutputIterator >
-        void makeUnionFieldsAssignment( ObjectDecl *srcParam, ObjectDecl *dstParam, UnionInstType *unionType, 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( srcParam ) ) );
-                copy->get_args().push_back( new SizeofExpr( unionType ) );
-
-                *out++ = new ExprStmt( noLabels, copy );
-        }
-
         //E ?=?(E volatile*, int),
         //  ?=?(E _Atomic volatile*, int);
@@ -663 +653 @@
 
                 // Make function polymorphic in same parameters as generic struct, if applicable
-                bool isGeneric = false;  // NOTE this flag is an incredibly ugly kludge; we should fix the assignment signature instead (ditto for union)
                 std::list< TypeDecl* >& genericParams = aggregateDecl->get_parameters();
                 std::list< Expression* > structParams;  // List of matching parameters to put on types
                 for ( std::list< TypeDecl* >::const_iterator param = genericParams.begin(); param != genericParams.end(); ++param ) {
-                        isGeneric = true;
                         TypeDecl *typeParam = (*param)->clone();
                         assignType->get_forall().push_back( typeParam );
@@ -673 +661 @@
                 }
 
-                ObjectDecl *returnVal = new ObjectDecl( "_ret", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, cloneWithParams( refType, structParams ), 0 );
+                ObjectDecl *returnVal = new ObjectDecl( "", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, cloneWithParams( refType, structParams ), 0 );
                 assignType->get_returnVals().push_back( returnVal );
 
@@ -703 +691 @@
                                 if ( ArrayType *array = dynamic_cast< ArrayType * >( dwt->get_type() ) ) {
                                         makeArrayAssignment( srcParam, dstParam, dwt, array, back_inserter( assignDecl->get_statements()->get_kids() ) );
-                                        if ( isGeneric ) makeArrayAssignment( srcParam, returnVal, dwt, array, back_inserter( assignDecl->get_statements()->get_kids() ) );
                                 } else {
                                         makeScalarAssignment( srcParam, dstParam, dwt, back_inserter( assignDecl->get_statements()->get_kids() ) );
-                                        if ( isGeneric ) makeScalarAssignment( srcParam, returnVal, dwt, back_inserter( assignDecl->get_statements()->get_kids() ) );
                                 } // if
                         } // if
                 } // for
-                if ( ! isGeneric ) assignDecl->get_statements()->get_kids().push_back( new ReturnStmt( noLabels, new VariableExpr( srcParam ) ) );
+                assignDecl->get_statements()->get_kids().push_back( new ReturnStmt( noLabels, new VariableExpr( srcParam ) ) );
 
                 return assignDecl;
@@ -719 +705 @@
 
                 // Make function polymorphic in same parameters as generic union, if applicable
-                bool isGeneric = false;  // NOTE this flag is an incredibly ugly kludge; we should fix the assignment signature instead (ditto for struct)
                 std::list< TypeDecl* >& genericParams = aggregateDecl->get_parameters();
                 std::list< Expression* > unionParams;  // List of matching parameters to put on types
                 for ( std::list< TypeDecl* >::const_iterator param = genericParams.begin(); param != genericParams.end(); ++param ) {
-                        isGeneric = true;
                         TypeDecl *typeParam = (*param)->clone();
                         assignType->get_forall().push_back( typeParam );
@@ -729 +713 @@
                 }
 
-                ObjectDecl *returnVal = new ObjectDecl( "_ret", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, cloneWithParams( refType, unionParams ), 0 );
+                ObjectDecl *returnVal = new ObjectDecl( "", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, cloneWithParams( refType, unionParams ), 0 );
                 assignType->get_returnVals().push_back( returnVal );
 
@@ -743 +727 @@
                 assignDecl->fixUniqueId();
 
-                makeUnionFieldsAssignment( srcParam, dstParam, cloneWithParams( refType, unionParams ), back_inserter( assignDecl->get_statements()->get_kids() ) );
-                if ( isGeneric ) makeUnionFieldsAssignment( srcParam, returnVal, cloneWithParams( refType, unionParams ), back_inserter( assignDecl->get_statements()->get_kids() ) );
-                
-                if ( ! isGeneric ) assignDecl->get_statements()->get_kids().push_back( new ReturnStmt( noLabels, new VariableExpr( srcParam ) ) );
+                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( srcParam ) ) );
+                copy->get_args().push_back( new SizeofExpr( cloneWithParams( refType, unionParams ) ) );
+
+                assignDecl->get_statements()->get_kids().push_back( new ExprStmt( noLabels, copy ) );
+                assignDecl->get_statements()->get_kids().push_back( new ReturnStmt( noLabels, new VariableExpr( srcParam ) ) );
 
                 return assignDecl;