Changeset da7fe39 for src/SymTab

Timestamp:

Apr 23, 2018, 12:57:46 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

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, stuck-waitfor-destruct, with_gc

Children:

57acae0

Parents:

ba89e9b7 (diff), c8ad5d9 (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 references

Location:

src/SymTab

Files:

• Indexer.cc (modified) (1 diff)
• Validate.cc (modified) (6 diffs)

src/SymTab/Indexer.cc

@@ -501 +501 @@
 
         bool addedDeclConflicts( AggregateDecl *existing, AggregateDecl *added ) {
-                if ( existing->get_members().empty() ) {
+                if ( ! existing->body ) {
                         return false;
-                } else if ( ! added->get_members().empty() ) {
+                } else if ( added->body ) {
                         SemanticError( added, "redeclaration of " );
                 } // if

src/SymTab/Validate.cc

@@ -148 +148 @@
                 void previsit( ObjectDecl * object );
                 void previsit( FunctionDecl * func );
+                void previsit( FunctionType * ftype );
                 void previsit( StructDecl * aggrDecl );
                 void previsit( UnionDecl * aggrDecl );
@@ -315 +316 @@
 
         void HoistStruct::previsit( EnumInstType * inst ) {
-                if ( inst->baseEnum ) {
+                if ( inst->baseEnum && inst->baseEnum->body ) {
                         declsToAddBefore.push_front( inst->baseEnum );
                 }
@@ -321 +322 @@
 
         void HoistStruct::previsit( StructInstType * inst ) {
-                if ( inst->baseStruct ) {
+                if ( inst->baseStruct && inst->baseStruct->body ) {
                         declsToAddBefore.push_front( inst->baseStruct );
                 }
@@ -327 +328 @@
 
         void HoistStruct::previsit( UnionInstType * inst ) {
-                if ( inst->baseUnion ) {
+                if ( inst->baseUnion && inst->baseUnion->body ) {
                         declsToAddBefore.push_front( inst->baseUnion );
                 }
@@ -633 +634 @@
 
         void ForallPointerDecay::previsit( ObjectDecl *object ) {
-                forallFixer( object->type->forall, object );
-                if ( PointerType *pointer = dynamic_cast< PointerType * >( object->type ) ) {
-                        forallFixer( pointer->base->forall, object );
-                } // if
                 // ensure that operator names only apply to functions or function pointers
                 if ( CodeGen::isOperator( object->name ) && ! dynamic_cast< FunctionType * >( object->type->stripDeclarator() ) ) {
@@ -645 +642 @@
 
         void ForallPointerDecay::previsit( FunctionDecl *func ) {
-                forallFixer( func->type->forall, func );
                 func->fixUniqueId();
+        }
+
+        void ForallPointerDecay::previsit( FunctionType * ftype ) {
+                forallFixer( ftype->forall, ftype );
         }