Changeset 6b224a52 for src/ResolvExpr/ResolveTypeof.cc

Timestamp:

Aug 25, 2017, 12:11:53 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:

bf7b9da7

Parents:

135b431 (diff), f676b84 (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/ResolveTypeof.cc (modified) (1 diff)

src/ResolvExpr/ResolveTypeof.cc

@@ -65 +65 @@
                         assert( newExpr->has_result() && ! newExpr->get_result()->isVoid() );
                         Type *newType = newExpr->get_result();
+                        newExpr->set_result( nullptr );
                         delete typeofType;
+                        delete newExpr;
                         return newType;
                 } // if