Changeset 9738e74

Timestamp:

May 11, 2017, 4:41:56 PM (8 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

64bc131, edbdbe6

Parents:

c2d5e28

Message:

Fix for ubuntu 16.04

File:

• src/InitTweak/FixInit.cc (modified) (1 diff)

src/InitTweak/FixInit.cc

@@ -668 +668 @@
                         stmtsToAdd.splice( stmtsToAdd.end(), fixer.stmtsToAdd );
                         unqMap[unqExpr->get_id()] = unqExpr;
-                        if ( unqCount[ unqExpr->get_id() ] == 0 ) {  // insert destructor after the last use of the unique expression
-                                stmtsToAdd.splice( stmtsToAddAfter.end(), dtors[ unqExpr->get_id() ] );
-                        } else { // remember dtors for last instance of unique expr
-                                dtors[ unqExpr->get_id() ] = fixer.stmtsToAddAfter;
-                        }
                         if ( UntypedExpr * deref = dynamic_cast< UntypedExpr * >( unqExpr->get_expr() ) ) {
+                                if ( unqCount[ unqExpr->get_id() ] == 0 ) {  // insert destructor after the last use of the unique expression
+                                        stmtsToAdd.splice( stmtsToAddAfter.end(), dtors[ unqExpr->get_id() ] );
+                                } else { // remember dtors for last instance of unique expr
+                                        dtors[ unqExpr->get_id() ] = fixer.stmtsToAddAfter;
+                                }
                                 // unique expression is now a dereference, because the inner expression is an lvalue returning function call.
                                 // Normalize the expression by dereferencing the unique expression, rather than the inner expression