Changes in src/SymTab/Validate.cc [ac3362c:8a3ecb9]

File:

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

src/SymTab/Validate.cc

@@ -61 +61 @@
 #include "Parser/LinkageSpec.h"        // for C
 #include "ResolvExpr/typeops.h"        // for typesCompatible
-#include "ResolvExpr/Resolver.h"       // for findSingleExpression
 #include "SymTab/Autogen.h"            // for SizeType
 #include "SynTree/Attribute.h"         // for noAttributes, Attribute
@@ -73 +72 @@
 #include "SynTree/TypeSubstitution.h"  // for TypeSubstitution
 #include "SynTree/Visitor.h"           // for Visitor
-#include "Validate/HandleAttributes.h" // for handleAttributes
 
 class CompoundStmt;
@@ -87 +85 @@
                 void previsit( AlignofExpr * );
                 void previsit( UntypedOffsetofExpr * );
-                void previsit( CompoundLiteralExpr * );
                 void handleType( Type * );
         };
@@ -249 +246 @@
         };
 
-        struct ArrayLength : public WithIndexer {
+        struct ArrayLength {
                 /// for array types without an explicit length, compute the length and store it so that it
                 /// is known to the rest of the phases. For example,
@@ -260 +257 @@
 
                 void previsit( ObjectDecl * objDecl );
-                void previsit( ArrayType * arrayType );
         };
 
@@ -315 +311 @@
                 acceptAll( translationUnit, finder ); // xxx - remove this pass soon
                 mutateAll( translationUnit, labelAddrFixer );
-                Validate::handleAttributes( translationUnit );
         }
 
@@ -353 +348 @@
         void HoistTypeDecls::previsit( UntypedOffsetofExpr * expr ) {
                 handleType( expr->type );
-        }
-
-        void HoistTypeDecls::previsit( CompoundLiteralExpr * expr ) {
-                handleType( expr->result );
         }
 
@@ -738 +729 @@
                                 forwardEnums.erase( fwds );
                         } // if
-
-                        for ( Declaration * member : enumDecl->members ) {
-                                ObjectDecl * field = strict_dynamic_cast<ObjectDecl *>( member );
-                                if ( field->init ) {
-                                        // need to resolve enumerator initializers early so that other passes that determine if an expression is constexpr have the appropriate information.
-                                        SingleInit * init = strict_dynamic_cast<SingleInit *>( field->init );
-                                        ResolvExpr::findSingleExpression( init->value, new BasicType( Type::Qualifiers(), BasicType::SignedInt ), indexer );
-                                }
-                        }
                 } // if
         }
@@ -1245 +1227 @@
         void ArrayLength::previsit( ObjectDecl * objDecl ) {
                 if ( ArrayType * at = dynamic_cast< ArrayType * >( objDecl->type ) ) {
-                        if ( at->dimension ) return;
+                        if ( at->get_dimension() ) return;
                         if ( ListInit * init = dynamic_cast< ListInit * >( objDecl->init ) ) {
-                                at->dimension = new ConstantExpr( Constant::from_ulong( init->initializers.size() ) );
-                        }
-                }
-        }
-
-        void ArrayLength::previsit( ArrayType * type ) {
-                if ( type->dimension ) {
-                        // 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 );
-
-                        // must re-evaluate whether a type is a VLA, now that more information is available
-                        // (e.g. the dimension may have been an enumerator, which was unknown prior to this step)
-                        type->isVarLen = ! InitTweak::isConstExpr( type->dimension );
+                                at->set_dimension( new ConstantExpr( Constant::from_ulong( init->initializers.size() ) ) );
+                        }
                 }
         }