Changeset 9c791dd

Timestamp:

Jul 13, 2016, 2:25:04 PM (8 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

f1231f2

Parents:

d1b9d78 (diff), 834d4fc (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/ResolvExpr/AdjustExprType.cc (modified) (3 diffs)

src/ResolvExpr/AdjustExprType.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// AdjustExprType.cc -- 
+// AdjustExprType.cc --
 //
 // Author           : Richard C. Bilson
@@ -12 +12 @@
 // Last Modified On : Wed Mar  2 17:34:53 2016
 // Update Count     : 4
-// 
+//
 
 #include "typeops.h"
@@ -65 +65 @@
 
         Type *AdjustExprType::mutate( ArrayType *arrayType ) {
-                PointerType *pointerType = new PointerType( arrayType->get_qualifiers(), arrayType->get_base()->clone() );
+                // need to recursively mutate the base type in order for multi-dimensional arrays to work.
+                PointerType *pointerType = new PointerType( arrayType->get_qualifiers(), arrayType->get_base()->clone()->acceptMutator( *this ) );
                 delete arrayType;
                 return pointerType;