Changeset 803deb1 for src/GenPoly

Timestamp:

Jan 20, 2016, 12:55:39 PM (9 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, string, with_gc

Children:

00ede9e, 421edab, 771b3c3, 7ee14bb7

Parents:

61f9356

Message:

fix cast to void error

File:

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

src/GenPoly/Specialize.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// Specialize.cc -- 
+// Specialize.cc --
 //
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Tue Sep 22 14:04:13 2015
-// Update Count     : 15
+// Last Modified On : Wed Jan 20 12:40:33 2016
+// Update Count     : 18
 //
 
@@ -140 +140 @@
                 return new AddressExpr( new VariableExpr( thunkFunc ) );
         }
-        
+
         Expression * Specialize::doSpecialization( Type *formalType, Expression *actual, InferredParams *inferParams ) {
+                assert( ! actual->get_results().empty() );
                 if ( needsSpecialization( formalType, actual->get_results().front(), env ) ) {
                         FunctionType *funType;
@@ -198 +199 @@
         Expression * Specialize::mutate( CastExpr *castExpr ) {
                 castExpr->get_arg()->acceptMutator( *this );
+                if ( castExpr->get_results().empty() ) {
+                        // can't specialize if we don't have a return value
+                        return castExpr;
+                }
                 Expression *specialized = doSpecialization( castExpr->get_results().front(), castExpr->get_arg() );
                 if ( specialized != castExpr->get_arg() ) {