Changeset d63eeb0 for src/SymTab

Timestamp:

Feb 9, 2016, 3:25:05 PM (9 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

7528ba1

Parents:

771b3c3 (diff), bd85400 (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' into ctor

Conflicts:

src/CodeGen/CodeGenerator.cc
src/GenPoly/Box.cc
src/Makefile.in
src/Parser/ParseNode.h
src/Parser/parser.cc
src/Parser/parser.yy
src/SymTab/Validate.cc
src/SynTree/Initializer.h
src/SynTree/ObjectDecl.cc
src/SynTree/Visitor.h
src/main.cc

Location:

src/SymTab

Files:

• FixFunction.cc (modified) (1 diff)
• IdTable.cc (modified) (4 diffs)
• ImplementationType.cc (modified) (1 diff)
• Indexer.cc (modified) (2 diffs)
• Indexer.h (modified) (1 diff)
• Validate.cc (modified) (9 diffs)

src/SymTab/FixFunction.cc

@@ -18 +18 @@
 #include "SynTree/Type.h"
 #include "SynTree/Expression.h"
-#include "utility.h"
+#include "Common/utility.h"
 
 namespace SymTab {

src/SymTab/IdTable.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 17:04:02 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Wed Oct 07 12:21:13 2015
-// Update Count     : 73
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Fri Jan  8 22:59:23 2016
+// Update Count     : 74
 //
 
@@ -21 +21 @@
 #include "Mangler.h"
 #include "IdTable.h"
-#include "SemanticError.h"
+#include "Common/SemanticError.h"
 
 using std::string;
@@ -54 +54 @@
                         manglename = name;
                 } else if ( LinkageSpec::isOverridable( decl->get_linkage() ) ) {
-                        // mangle the name without including the appropriate suffix
-                        // this will make it so that overridable routines are placed
-                        // into the same "bucket" as their user defined versions.
+                        // mangle the name without including the appropriate suffix, so overridable routines are placed into the
+                        // same "bucket" as their user defined versions.
                         manglename = Mangler::mangle( decl, false );
                 } else {
@@ -71 +70 @@
                         std::stack< DeclEntry >& entry = it->second;
                         if ( ! entry.empty() && entry.top().second == scopeLevel ) {
-                                // if we're giving the same name mangling to things of
-                                //  different types then there is something wrong
+                                // if we're giving the same name mangling to things of different types then there is something wrong
                                 Declaration *old = entry.top().first;
                                 assert( (dynamic_cast<ObjectDecl*>( decl ) && dynamic_cast<ObjectDecl*>( old ) )

src/SymTab/ImplementationType.cc

@@ -19 +19 @@
 #include "SynTree/Visitor.h"
 #include "SymTab/Indexer.h"
-#include "utility.h"
+#include "Common/utility.h"
 
 

src/SymTab/Indexer.cc

@@ -21 +21 @@
 #include "Indexer.h"
 #include <typeinfo>
-#include "utility.h"
+#include "Common/utility.h"
 
 #define debugPrint(x) if ( doDebug ) { std::cout << x; }
@@ -225 +225 @@
                         maybeAccept( alignofExpr->get_expr(), *this );
                 }
+        }
+
+        void Indexer::visit( UntypedOffsetofExpr *offsetofExpr ) {
+                acceptAllNewScope( offsetofExpr->get_results(), *this );
+                maybeAccept( offsetofExpr->get_type(), *this );
+        }
+
+        void Indexer::visit( OffsetofExpr *offsetofExpr ) {
+                acceptAllNewScope( offsetofExpr->get_results(), *this );
+                maybeAccept( offsetofExpr->get_type(), *this );
+                maybeAccept( offsetofExpr->get_member(), *this );
         }
 

src/SymTab/Indexer.h

@@ -55 +55 @@
                 virtual void visit( SizeofExpr *sizeofExpr );
                 virtual void visit( AlignofExpr *alignofExpr );
+                virtual void visit( UntypedOffsetofExpr *offsetofExpr );
+                virtual void visit( OffsetofExpr *offsetofExpr );
                 virtual void visit( AttrExpr *attrExpr );
                 virtual void visit( LogicalExpr *logicalExpr );

src/SymTab/Validate.cc

@@ -10 +10 @@
 // Created On       : Sun May 17 21:50:04 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Thu Jan 07 11:27:49 2016
-// Update Count     : 269
+// Last Modified On : Tue Feb 09 13:21:56 2016
+// Update Count     : 270
 //
 
@@ -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"
@@ -599 +599 @@
         }
 
+        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);
@@ -667 +677 @@
 
                 // 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 );
@@ -675 +687 @@
                 }
 
-                ObjectDecl *returnVal = new ObjectDecl( "", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, cloneWithParams( refType, structParams ), 0 );
+                ObjectDecl *returnVal = new ObjectDecl( "_ret", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, cloneWithParams( refType, structParams ), 0 );
                 assignType->get_returnVals().push_back( returnVal );
 
@@ -705 +717 @@
                                 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
-                assignDecl->get_statements()->get_kids().push_back( new ReturnStmt( noLabels, new VariableExpr( srcParam ) ) );
+                if ( ! isGeneric ) assignDecl->get_statements()->get_kids().push_back( new ReturnStmt( noLabels, new VariableExpr( srcParam ) ) );
 
                 return assignDecl;
@@ -719 +733 @@
 
                 // 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 );
@@ -727 +743 @@
                 }
 
-                ObjectDecl *returnVal = new ObjectDecl( "", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, cloneWithParams( refType, unionParams ), 0 );
+                ObjectDecl *returnVal = new ObjectDecl( "_ret", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, cloneWithParams( refType, unionParams ), 0 );
                 assignType->get_returnVals().push_back( returnVal );
 
@@ -741 +757 @@
                 assignDecl->fixUniqueId();
 
-                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 ) ) );
+                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 ) ) );
 
                 return assignDecl;