Changeset 6f72453 for src/ResolvExpr/Resolver.cc

Timestamp:

Jul 11, 2016, 5:25:12 PM (8 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

1b8c156, 7d5e243

Parents:

c0588909 (diff), 919d1ba (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/Resolver.cc (modified) (2 diffs)

src/ResolvExpr/Resolver.cc

@@ -550 +550 @@
                         // get Variable <array>, then get the base type of the VariableExpr - this is the type that needs to be fixed
                         Expression * arr = InitTweak::getCallArg( plusExpr, 0 );
-                        assert( dynamic_cast< VariableExpr * >( arr ) );
+                        assert( dynamic_cast< VariableExpr * >( arr ) || dynamic_cast< MemberExpr *>( arr ) );
                         assert( arr && arr->get_results().size() == 1 );
                         type = arr->get_results().front()->clone();
@@ -559 +559 @@
                         assert( constructee->get_results().size() == 1 );
                         AddressExpr * addrExpr = dynamic_cast< AddressExpr * > ( constructee );
-                        assert( addrExpr && addrExpr->get_results().size() == 1);
+                        assert( addrExpr && addrExpr->get_results().size() == 1 );
                         type = addrExpr->get_results().front()->clone();
                 }