Changeset 1136d96

Timestamp:

Jun 3, 2015, 11:21:01 PM (9 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

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

Children:

9a8930f

Parents:

4162aea9 (diff), 30651b0 (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 labels

File:

• src/ResolvExpr/Resolver.cc (modified) (1 diff)

src/ResolvExpr/Resolver.cc

@@ -159 +159 @@
 
                 if ( ArrayType * at = dynamic_cast< ArrayType * >( new_type ) ){
-                        BasicType arrayLenType = BasicType( Type::Qualifiers(), BasicType::LongUnsignedInt );
-                        CastExpr *castExpr = new CastExpr( at->get_dimension(), arrayLenType.clone() );
-                        Expression *newExpr = findSingleExpression( castExpr, *this );
-                        delete at->get_dimension();
-                        at->set_dimension( newExpr );
+                        if ( at->get_dimension() ) {
+                                BasicType arrayLenType = BasicType( Type::Qualifiers(), BasicType::LongUnsignedInt );
+                                CastExpr *castExpr = new CastExpr( at->get_dimension(), arrayLenType.clone() );
+                                Expression *newExpr = findSingleExpression( castExpr, *this );
+                                delete at->get_dimension();
+                                at->set_dimension( newExpr );
+                        }
                 }
         }