Changeset a64644c for src/Tuples

Timestamp:

Dec 14, 2016, 2:23:11 PM (8 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:

1486116

Parents:

1aa4b71

Message:

ensure that unique address expressions are not exploded twice

File:

• src/Tuples/Explode.cc (modified) (2 diffs)

src/Tuples/Explode.cc

@@ -23 +23 @@
                         Expression * applyAddr( Expression * expr, bool first = true ) {
                                 if ( TupleExpr * tupleExpr = dynamic_cast< TupleExpr * >( expr ) ){
+                                        foundUniqueExpr = true;
                                         std::list< Expression * > exprs;
                                         for ( Expression *& expr : tupleExpr->get_exprs() ) {
@@ -46 +47 @@
                                 // should now be a tuple of addresses rather than the address of a tuple.
                                 // Still, this code is a bit awkward, and could use some improvement.
-                                foundUniqueExpr = true;
+                                if ( dynamic_cast< AddressExpr * > ( uniqueExpr->get_expr() ) ) {
+                                        // this unique expression has already been mutated or otherwise shouldn't be (can't take the address-of an address-of expression)
+                                        return uniqueExpr;
+                                }
                                 UniqueExpr * newUniqueExpr = new UniqueExpr( applyAddr( uniqueExpr->get_expr() ), uniqueExpr->get_id() );
                                 delete uniqueExpr;