Changes in src/SymTab/Validate.cc [7e08acf:2bfc6b2]

File:

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

src/SymTab/Validate.cc

@@ -75 +75 @@
 #include "SynTree/Visitor.h"           // for Visitor
 #include "Validate/HandleAttributes.h" // for handleAttributes
+#include "Validate/FindSpecialDecls.h" // for FindSpecialDecls
 
 class CompoundStmt;
@@ -287 +288 @@
         };
 
-        FunctionDecl * dereferenceOperator = nullptr;
-        struct FindSpecialDeclarations final {
-                void previsit( FunctionDecl * funcDecl );
-        };
-
         void validate( std::list< Declaration * > &translationUnit, __attribute__((unused)) bool doDebug ) {
                 PassVisitor<EnumAndPointerDecay> epc;
@@ -298 +294 @@
                 PassVisitor<CompoundLiteral> compoundliteral;
                 PassVisitor<ValidateGenericParameters> genericParams;
-                PassVisitor<FindSpecialDeclarations> finder;
                 PassVisitor<LabelAddressFixer> labelAddrFixer;
                 PassVisitor<HoistTypeDecls> hoistDecls;
@@ -325 +320 @@
                 FixObjectType::fix( translationUnit );
                 ArrayLength::computeLength( translationUnit );
-                acceptAll( translationUnit, finder ); // xxx - remove this pass soon
+                Validate::findSpecialDecls( translationUnit );
                 mutateAll( translationUnit, labelAddrFixer );
                 Validate::handleAttributes( translationUnit );
@@ -403 +398 @@
                         assert( aggr ); // TODO: need to handle forward declarations
                         for ( Declaration * member : aggr->members ) {
-                                if ( TypeInstType * inst = dynamic_cast< TypeInstType * >( child ) ) {
+                                if ( StructInstType * inst = dynamic_cast< StructInstType * >( child ) ) {
+                                        if ( StructDecl * aggr = dynamic_cast< StructDecl * >( member ) ) {
+                                                if ( aggr->name == inst->name ) {
+                                                        // TODO: is this case, and other non-TypeInstType cases, necessary?
+                                                        return new StructInstType( qualType->get_qualifiers(), aggr );
+                                                }
+                                        }
+                                } else if ( UnionInstType * inst = dynamic_cast< UnionInstType * >( child ) ) {
+                                        if ( UnionDecl * aggr = dynamic_cast< UnionDecl * > ( member ) ) {
+                                                if ( aggr->name == inst->name ) {
+                                                        return new UnionInstType( qualType->get_qualifiers(), aggr );
+                                                }
+                                        }
+                                } else if ( EnumInstType * inst = dynamic_cast< EnumInstType * >( child ) ) {
+                                        if ( EnumDecl * aggr = dynamic_cast< EnumDecl * > ( member ) ) {
+                                                if ( aggr->name == inst->name ) {
+                                                        return new EnumInstType( qualType->get_qualifiers(), aggr );
+                                                }
+                                        }
+                                } else if ( TypeInstType * inst = dynamic_cast< TypeInstType * >( child ) ) {
                                         // name on the right is a typedef
                                         if ( NamedTypeDecl * aggr = dynamic_cast< NamedTypeDecl * > ( member ) ) {
@@ -410 +424 @@
                                                         Type * ret = aggr->base->clone();
                                                         ret->get_qualifiers() = qualType->get_qualifiers();
-                                                        TypeSubstitution sub = parent->genericSubstitution();
-                                                        sub.apply(ret);
                                                         return ret;
                                                 }
@@ -884 +896 @@
                 if ( eliminator.pass.typedefNames.count( "size_t" ) ) {
                         // grab and remember declaration of size_t
-                        SizeType = eliminator.pass.typedefNames["size_t"].first->base->clone();
+                        Validate::SizeType = eliminator.pass.typedefNames["size_t"].first->base->clone();
                 } else {
                         // xxx - missing global typedef for size_t - default to long unsigned int, even though that may be wrong
                         // eventually should have a warning for this case.
-                        SizeType = new BasicType( Type::Qualifiers(), BasicType::LongUnsignedInt );
+                        Validate::SizeType = new BasicType( Type::Qualifiers(), BasicType::LongUnsignedInt );
                 }
         }
@@ -1276 +1288 @@
                         // need to resolve array dimensions early so that constructor code can correctly determine
                         // if a type is a VLA (and hence whether its elements need to be constructed)
-                        ResolvExpr::findSingleExpression( type->dimension, SymTab::SizeType->clone(), indexer );
+                        ResolvExpr::findSingleExpression( type->dimension, Validate::SizeType->clone(), indexer );
 
                         // must re-evaluate whether a type is a VLA, now that more information is available
@@ -1313 +1325 @@
                 return addrExpr;
         }
-
-        void FindSpecialDeclarations::previsit( FunctionDecl * funcDecl ) {
-                if ( ! dereferenceOperator ) {
-                        if ( funcDecl->get_name() == "*?" && funcDecl->get_linkage() == LinkageSpec::Intrinsic ) {
-                                FunctionType * ftype = funcDecl->get_functionType();
-                                if ( ftype->get_parameters().size() == 1 && ftype->get_parameters().front()->get_type()->get_qualifiers() == Type::Qualifiers() ) {
-                                        dereferenceOperator = funcDecl;
-                                }
-                        }
-                }
-        }
 } // namespace SymTab