Changeset 32cab5b for src/SymTab/Validate.cc

Timestamp:

Apr 17, 2018, 12:01:09 PM (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, with_gc

Children:

3265399

Parents:

b2fe1c9 (diff), 81bb114 (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/Validate.cc (modified) (6 diffs)

src/SymTab/Validate.cc

@@ -89 +89 @@
                 void previsit( StructDecl * aggregateDecl );
                 void previsit( UnionDecl * aggregateDecl );
+                void previsit( StaticAssertDecl * assertDecl );
 
           private:
@@ -147 +148 @@
                 void previsit( ObjectDecl * object );
                 void previsit( FunctionDecl * func );
+                void previsit( FunctionType * ftype );
                 void previsit( StructDecl * aggrDecl );
                 void previsit( UnionDecl * aggrDecl );
@@ -296 +298 @@
         }
 
-        bool isStructOrUnion( Declaration *decl ) {
-                return dynamic_cast< StructDecl * >( decl ) || dynamic_cast< UnionDecl * >( decl );
+        bool shouldHoist( Declaration *decl ) {
+                return dynamic_cast< StructDecl * >( decl ) || dynamic_cast< UnionDecl * >( decl ) || dynamic_cast< StaticAssertDecl * >( decl );
         }
 
@@ -310 +312 @@
                 } // if
                 // Always remove the hoisted aggregate from the inner structure.
-                GuardAction( [aggregateDecl]() { filter( aggregateDecl->members, isStructOrUnion, false ); } );
+                GuardAction( [aggregateDecl]() { filter( aggregateDecl->members, shouldHoist, false ); } );
         }
 
@@ -328 +330 @@
                 if ( inst->baseUnion ) {
                         declsToAddBefore.push_front( inst->baseUnion );
+                }
+        }
+
+        void HoistStruct::previsit( StaticAssertDecl * assertDecl ) {
+                if ( parentAggr ) {
+                        declsToAddBefore.push_back( assertDecl );
                 }
         }
@@ -626 +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() ) ) {
+                        SemanticError( object->location, toCString( "operator ", object->name.c_str(), " is not a function or function pointer." )  );
+                }
                 object->fixUniqueId();
         }
 
         void ForallPointerDecay::previsit( FunctionDecl *func ) {
-                forallFixer( func->type->forall, func );
                 func->fixUniqueId();
+        }
+
+        void ForallPointerDecay::previsit( FunctionType * ftype ) {
+                forallFixer( ftype->forall, ftype );
         }