Changeset 954ef5b

Timestamp:

Oct 23, 2017, 5:39:11 PM (7 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, resolv-new, with_gc

Children:

f53836b

Parents:

aeef2bd

git-author:

Rob Schluntz <rschlunt@…> (10/23/17 17:37:05)

git-committer:

Rob Schluntz <rschlunt@…> (10/23/17 17:39:11)

Message:

Fix array-to-pointer decay to only decay one level

Location:

src

Files:

• ResolvExpr/AdjustExprType.cc (modified) (2 diffs)
• ResolvExpr/AlternativeFinder.cc (modified) (2 diffs)
• SymTab/FixFunction.cc (modified) (1 diff)
• SymTab/FixFunction.h (modified) (1 diff)

src/ResolvExpr/AdjustExprType.cc

@@ -28 +28 @@
                 void premutate( BasicType * ) { visit_children = false; }
                 void premutate( PointerType * ) { visit_children = false; }
+                void premutate( ArrayType * ) { visit_children = false; }
                 void premutate( FunctionType * ) { visit_children = false; }
                 void premutate( StructInstType * ) { visit_children = false; }
@@ -59 +60 @@
 
         Type * AdjustExprType::postmutate( ArrayType * arrayType ) {
-                // need to recursively mutate the base type in order for multi-dimensional arrays to work.
                 PointerType *pointerType = new PointerType( arrayType->get_qualifiers(), arrayType->base );
                 arrayType->base = nullptr;

src/ResolvExpr/AlternativeFinder.cc

@@ -180 +180 @@
                         throw SemanticError( "No reasonable alternatives for expression ", expr );
                 }
-                for ( AltList::iterator i = alternatives.begin(); i != alternatives.end(); ++i ) {
-                        if ( adjust ) {
-                                adjustExprType( i->expr->get_result(), i->env, indexer );
-                        }
-                }
                 if ( prune ) {
                         PRINT(
@@ -206 +201 @@
                                 std::cerr << "there are " << alternatives.size() << " alternatives after elimination" << std::endl;
                         )
+                }
+                // adjust types after pruning so that types substituted by pruneAlternatives are correctly adjusted
+                for ( AltList::iterator i = alternatives.begin(); i != alternatives.end(); ++i ) {
+                        if ( adjust ) {
+                                adjustExprType( i->expr->get_result(), i->env, indexer );
+                        }
                 }
 

src/SymTab/FixFunction.cc

@@ -50 +50 @@
 
         void FixFunction::premutate(FunctionDecl *) { visit_children = false; }
+        void FixFunction::premutate(ArrayType *) { visit_children = false; }
         void FixFunction::premutate(BasicType *) { visit_children = false; }
         void FixFunction::premutate(PointerType *) { visit_children = false; }

src/SymTab/FixFunction.h

@@ -31 +31 @@
                 Type * postmutate(ArrayType * arrayType);
 
+                void premutate(ArrayType * arrayType);
                 void premutate(VoidType * voidType);
                 void premutate(BasicType * basicType);