Changeset 24e7b47 for src/GenPoly

Timestamp:

Oct 6, 2015, 3:34:01 PM (10 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, stuck-waitfor-destruct, with_gc

Children:

b0be06ac

Parents:

b762122 (diff), 8ee15ffd (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 ctor

File:

• src/GenPoly/Specialize.cc (modified) (4 diffs)

src/GenPoly/Specialize.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Jun 13 15:54:07 2015
-// Update Count     : 6
+// Last Modified By : Rob Schluntz
+// Last Modified On : Tue Sep 22 14:04:13 2015
+// Update Count     : 15
 //
 
@@ -86 +86 @@
 
         Expression * Specialize::doSpecialization( Type *formalType, Expression *actual, InferredParams *inferParams ) {
+                assert( ! actual->get_results().empty() );
                 if ( needsSpecialization( formalType, actual->get_results().front(), env ) ) {
                         PointerType *ptrType;
@@ -167 +168 @@
         Expression * Specialize::mutate( AddressExpr *addrExpr ) {
                 addrExpr->get_arg()->acceptMutator( *this );
+                assert( ! addrExpr->get_results().empty() );
                 addrExpr->set_arg( doSpecialization( addrExpr->get_results().front(), addrExpr->get_arg() ) );
                 return addrExpr;
@@ -173 +175 @@
         Expression * Specialize::mutate( CastExpr *castExpr ) {
                 castExpr->get_arg()->acceptMutator( *this );
-                castExpr->set_arg( doSpecialization( castExpr->get_results().front(), castExpr->get_arg() ) );
+                if ( ! castExpr->get_results().empty() ) {
+                        // this may not be the correct condition, but previously the next statement 
+                        // was happening unchecked, causing a crash on a cast to void
+                        castExpr->set_arg( doSpecialization( castExpr->get_results().front(), castExpr->get_arg() ) );          
+                }
                 return castExpr;
         }