Changeset 3bbd012 for src/SymTab/Validate.cc

Timestamp:

Jul 31, 2018, 2:43:04 PM (6 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, no_list, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

642bc83

Parents:

d1e0979 (diff), 04e367c (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 demangler

File:

• src/SymTab/Validate.cc (modified) (6 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
@@ -72 +73 @@
 #include "SynTree/TypeSubstitution.h"  // for TypeSubstitution
 #include "SynTree/Visitor.h"           // for Visitor
+#include "Validate/HandleAttributes.h" // for handleAttributes
 
 class CompoundStmt;
@@ -247 +249 @@
         };
 
-        struct ArrayLength {
+        struct ArrayLength : public WithIndexer {
                 /// 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,
@@ -258 +260 @@
 
                 void previsit( ObjectDecl * objDecl );
+                void previsit( ArrayType * arrayType );
         };
 
@@ -312 +315 @@
                 acceptAll( translationUnit, finder ); // xxx - remove this pass soon
                 mutateAll( translationUnit, labelAddrFixer );
+                Validate::handleAttributes( translationUnit );
         }
 
@@ -1232 +1236 @@
         void ArrayLength::previsit( ObjectDecl * objDecl ) {
                 if ( ArrayType * at = dynamic_cast< ArrayType * >( objDecl->type ) ) {
-                        if ( at->get_dimension() ) return;
+                        if ( at->dimension ) return;
                         if ( ListInit * init = dynamic_cast< ListInit * >( objDecl->init ) ) {
-                                at->set_dimension( new ConstantExpr( Constant::from_ulong( init->initializers.size() ) ) );
-                        }
+                                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 );
                 }
         }